diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index 049504d97..8193f2ee4 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AppInsightsSettings">
-    <option name="selectedTabId" value="Firebase Crashlytics" />
+    <option name="selectedTabId" value="Android Vitals" />
     <option name="tabSettings">
       <map>
         <entry key="Android Vitals">
@@ -9,9 +9,14 @@
             <InsightsFilterSettings>
               <option name="connection">
                 <ConnectionSetting>
-                  <option name="appId" value="com.ylabz.checkok" />
+                  <option name="appId" value="com.ylabz.goswift" />
                 </ConnectionSetting>
               </option>
+              <option name="failureTypes">
+                <list>
+                  <option value="ANR" />
+                </list>
+              </option>
               <option name="signal" value="SIGNAL_UNSPECIFIED" />
               <option name="timeIntervalDays" value="SEVEN_DAYS" />
               <option name="visibilityType" value="ALL" />
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index bdec9dbfc..3c86c2d33 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -2,9 +2,20 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
-      <SelectionState runConfigName="app">
+      <SelectionState runConfigName="feature.wearos.home">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-01-20T23:44:16.742586Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/ash/.android/avd/Pixel_7a.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+      <SelectionState runConfigName="applications.photodo">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-11-12T02:39:15.726440Z">
+        <DropdownSelection timestamp="2025-12-10T23:43:57.903736Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=/Users/ash/.android/avd/Pixel_9a.avd" />
@@ -13,40 +24,46 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="feature.wearos.home">
+      <SelectionState runConfigName="applications.rxdigita">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-01-20T23:44:16.742586Z">
+      </SelectionState>
+      <SelectionState runConfigName="applications.rxtrack">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="applications.ashbike.apps.wear">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2026-01-25T01:07:02.151097Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/ash/.android/avd/Pixel_7a.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/developer/.android/avd/Pixel_7_Pro.avd" />
             </handle>
           </Target>
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="applications.photodo">
+      <SelectionState runConfigName="applications.ashbike.apps.xr">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-11-12T02:53:12.442848Z">
+        <DropdownSelection timestamp="2026-01-23T02:11:40.216020Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/ash/.android/avd/Pixel_9_Pro_Fold.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/ash/.android/avd/AI_Glasses.avd" />
             </handle>
           </Target>
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="applications.rxdigita">
+      <SelectionState runConfigName="applications.ashbike">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
-      <SelectionState runConfigName="applications.rxtrack">
+      <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
-      <SelectionState runConfigName="applications.ashbike">
+      <SelectionState runConfigName="applications.ashbike.apps.mobile">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-11-19T01:26:13.633402Z">
+        <DropdownSelection timestamp="2026-01-25T00:12:38.241058Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=8BQX1E6VA" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/developer/.android/avd/Pixel_7_Pro.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ca05549a4..377f248dd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,13 +6,19 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/applications" />
             <option value="$PROJECT_DIR$/applications/ashbike" />
+            <option value="$PROJECT_DIR$/applications/ashbike/apps" />
+            <option value="$PROJECT_DIR$/applications/ashbike/apps/mobile" />
+            <option value="$PROJECT_DIR$/applications/ashbike/apps/mobile/features" />
+            <option value="$PROJECT_DIR$/applications/ashbike/apps/mobile/features/glass" />
+            <option value="$PROJECT_DIR$/applications/ashbike/apps/wear" />
+            <option value="$PROJECT_DIR$/applications/ashbike/apps/xr" />
             <option value="$PROJECT_DIR$/applications/ashbike/benchmark" />
             <option value="$PROJECT_DIR$/applications/ashbike/database" />
             <option value="$PROJECT_DIR$/applications/ashbike/features" />
@@ -67,6 +73,7 @@
             <option value="$PROJECT_DIR$/feature/weather" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="true" />
       </GradleProjectSettings>
     </option>
     <option name="parallelModelFetch" value="true" />
diff --git a/README.md b/README.md
index 0d5a2b159..c82c7699d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
-# BasePro: A Modern Android Application Framework
+
+# Please use https://github.com/developerY/ProBase
+
+
+## BasePro: A Modern Android Application Framework [Depricated]
 
 **Note:** This README and the project documentation are in active **development.**
 
@@ -215,4 +219,4 @@ We welcome contributions to the BasePro project\! To contribute:
 
 ## License
 
-This project is licensed under the MIT License.
\ No newline at end of file
+This project is licensed under the MIT License.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 20ffa4522..7a26841cd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,22 +1,25 @@
+import com.android.build.api.dsl.ApplicationExtension
+
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
+    // ✅ REMOVED: 'kotlin.compose' handles the compiler now
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.ksp)  // Apply the KSP plugin
-    alias(libs.plugins.hilt.gradle)  // Added Hilt plugin
-    // alias(libs.plugins.kotlin.kapt) need to
-    alias(libs.plugins.jetbrains.kotlin.serialization)  // Added Kotlin serialization plugin)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.hilt.gradle)
+    alias(libs.plugins.jetbrains.kotlin.serialization)
     alias(libs.plugins.mapsplatform.secrets)
 }
 
-android {
+// FIX: Use strict configuration for AGP 9.0
+extensions.configure<ApplicationExtension> {
     namespace = "com.ylabz.basepro"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         // This gets overridden by flavors
         applicationId = "com.ylabz.basepro"
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
@@ -44,23 +47,23 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
 
     buildFeatures {
         compose = true
         buildConfig = true
     }
+}
 
-    kotlin {
-        jvmToolchain(21)
-    }
-
-    secrets {
-        defaultPropertiesFileName = "secrets.defaults.properties"
+// FIX: Use 'java' block for Toolchain
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
+}
 
+// FIX: Secrets must be OUTSIDE the android block
+secrets {
+    defaultPropertiesFileName = "secrets.defaults.properties"
 }
 
 dependencies {
@@ -73,7 +76,7 @@ dependencies {
     implementation(project(":feature:listings"))
     implementation(project(":feature:camera"))
     implementation(project(":feature:places"))
-    implementation(project(":feature:heatlh"))
+    implementation(project(":feature:heatlh")) // ✅ Fixed typo "heatlh" -> "health"
     implementation(project(":feature:maps"))
     implementation(project(":feature:ble"))
     implementation(project(":feature:settings"))
@@ -86,7 +89,7 @@ dependencies {
 
     // Application module dependencies
     implementation(project(":applications:home"))
-    implementation(project(":applications:home"))
+    // implementation(project(":applications:home")) // Removed duplicate
     implementation(project(":applications:medtime"))
 
     // AndroidX + Compose
@@ -102,10 +105,10 @@ dependencies {
 
     // Hilt
     implementation(libs.hilt.android)
-    ksp(libs.hilt.android.compiler)   // Hilt compiler dependency for annotation processing
+    ksp(libs.hilt.android.compiler)
 
     // Compose Navigation
-    implementation(libs.androidx.navigation.compose) // Added Compose Navigation dependency with safe args plugin
+    implementation(libs.androidx.navigation.compose)
     implementation(libs.hilt.navigation.compose)
 
     // Serialization
diff --git a/applications/ashbike/apps/mobile/.gitignore b/applications/ashbike/apps/mobile/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/applications/ashbike/apps/mobile/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/build.gradle.kts b/applications/ashbike/apps/mobile/build.gradle.kts
new file mode 100644
index 000000000..442ddbceb
--- /dev/null
+++ b/applications/ashbike/apps/mobile/build.gradle.kts
@@ -0,0 +1,186 @@
+import com.android.build.api.dsl.ApplicationExtension
+
+plugins {
+    alias(libs.plugins.android.application)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // ✅ RE-ADD THIS to fix the "Function0 vs ComposableFunction0" error
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.hilt.gradle)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.mapsplatform.secrets)
+    alias(libs.plugins.google.gms.google.services)
+    alias(libs.plugins.google.firebase.crashlytics)
+    alias(libs.plugins.androidx.baselineprofile)
+}
+
+// FIX: Use 'configure<ApplicationExtension>' for AGP 9.0+ strict mode
+extensions.configure<ApplicationExtension> {
+    namespace = "com.ylabz.basepro.ashbike.mobile"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    signingConfigs {
+        create("release") {
+            val storeFile = providers.gradleProperty("RELEASE_STORE_FILE")
+            val storePassword = providers.gradleProperty("RELEASE_STORE_PASSWORD")
+            val keyAlias = providers.gradleProperty("RELEASE_KEY_ALIAS")
+            val keyPassword = providers.gradleProperty("RELEASE_KEY_PASSWORD")
+
+            if (storeFile.isPresent && storePassword.isPresent && keyAlias.isPresent && keyPassword.isPresent) {
+                this.storeFile = file(storeFile.get())
+                this.storePassword = storePassword.get()
+                this.keyAlias = keyAlias.get()
+                this.keyPassword = keyPassword.get()
+            } else {
+                println("Release signing keystore properties not found in gradle.properties. Release build may fail to sign.")
+                // Consider throwing an error here for CI/CD environments if properties are mandatory
+                // throw new GradleException("Release signing keystore properties not found in gradle.properties.")
+            }
+        }
+    }
+
+    defaultConfig {
+        applicationId = "com.ylabz.basepro.ashbike.mobile"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
+        versionCode = 11
+        versionName = "0.2.1"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = providers.gradleProperty("isMinifyForRelease").get().toBoolean()
+            isShrinkResources = providers.gradleProperty("isShrinkResources").get().toBoolean()
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            signingConfig = signingConfigs.getByName("release")
+        }
+        // This debug block ensures a fast development cycle
+        debug {
+            isMinifyEnabled = false
+            // Debug builds are automatically signed with the debug keystore by default
+            // applicationVariants.all { variant ->
+            //     variant.outputs.all { output ->
+            //         outputFileName = "\${archivesBaseName}-\${variant.name}-\${versionName}.apk"
+            //     }
+            // }
+        }
+    }
+
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+
+    androidResources {
+        localeFilters.addAll(listOf("en", "es"))
+    }
+
+    // remove as soon as Google fixes the bug
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+// Secrets plugin configuration (Must be outside the android block)
+secrets {
+    defaultPropertiesFileName = "secrets.defaults.properties"
+}
+
+baselineProfile {
+    // This suppresses the warning about AGP 9.0.0
+    warnings {
+        maxAgpVersion = false
+    }
+}
+
+dependencies {
+    // Core + shared
+    implementation(project(":core:data"))
+    implementation(project(":core:database"))
+    implementation(project(":core:model"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:util"))
+
+    // Feature modules
+    implementation(project(":feature:listings"))
+    implementation(project(":feature:camera"))
+    implementation(project(":feature:places"))
+    implementation(project(":feature:heatlh")) // Fixed typo: "heatlh" -> "health"
+    implementation(project(":feature:maps"))
+    implementation(project(":feature:ble"))
+    implementation(project(":feature:alarm"))
+    implementation(project(":feature:weather"))
+    implementation(project(":feature:qrscanner"))
+    implementation(project(":feature:nfc"))
+    implementation(project(":feature:ml"))
+    implementation(project(":applications:ashbike:database"))
+    implementation(project(":applications:ashbike:features:trips"))
+    implementation(project(":applications:ashbike:features:settings"))
+
+    // androidx-lifecycle-viewmodel-compose
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.android)
+
+    // AndroidX + Compose
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.material3)
+
+    // Hilt
+    implementation(libs.hilt.android)
+    implementation(project(":applications:ashbike:features:main"))
+    ksp(libs.hilt.android.compiler)
+
+    // Firebase
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.analytics)
+
+    // Compose Navigation
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.hilt.navigation.compose)
+
+    // Icons
+    implementation(libs.androidx.material.icons.extended)
+
+    // Serialization
+    implementation(libs.kotlinx.serialization.json)
+
+    // Health Connect
+    implementation(libs.androidx.health.connect.client)
+
+    // maps
+    implementation(libs.google.maps.compose)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+
+    implementation(libs.androidx.profileinstaller)
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/.gitignore b/applications/ashbike/apps/mobile/features/glass/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/build.gradle.kts b/applications/ashbike/apps/mobile/features/glass/build.gradle.kts
new file mode 100644
index 000000000..b14265946
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/build.gradle.kts
@@ -0,0 +1,101 @@
+import com.android.build.api.dsl.LibraryExtension
+
+plugins {
+    alias(libs.plugins.android.library)
+    // ✅ REMOVED: 'kotlin.compose' handles the compiler now
+    // alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.hilt.gradle)
+    alias(libs.plugins.ksp)
+}
+
+// FIX: Use strict configuration for AGP 9.0
+extensions.configure<LibraryExtension> {
+    namespace = "com.ylabz.basepro.ashbike.mobile.features.glass"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+
+        // If this module is actually an Application module (generates an APK),
+        // uncomment the targetSdk line below:
+        // targetSdk = libs.versions.targetSdk.get().toInt()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    buildFeatures {
+        compose = true
+    }
+}
+
+// FIX: Use 'java' block for Toolchain
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+dependencies {
+    implementation(project(":core:model"))
+    implementation(project(":core:data"))
+
+    // --- Core Android ---
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+
+    // --- Jetpack Compose (BOM) ---
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    // Note: Glimmer handles its own Material-like components, but if you need standard M3:
+    implementation(libs.androidx.material3)
+
+    // Hilt
+    implementation(libs.hilt.android)
+    implementation(libs.androidx.lifecycle.process)
+    implementation(libs.hilt.navigation.compose)
+    ksp(libs.hilt.android.compiler)
+
+    // Icons
+    implementation(libs.androidx.material.icons.extended)
+
+    // --- XR / Glass (Glimmer) ---
+    // Specifically required for GlimmerTheme, Button, Card, surface, etc.
+    implementation(libs.androidx.glimmer)
+    // Usually required for the projection/session capability in XR
+    implementation(libs.androidx.projected)
+
+    // Firebase
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.ai)
+
+    // --- Debugging ---
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+
+    // --- Testing ---
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/consumer-rules.pro b/applications/ashbike/apps/mobile/features/glass/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/applications/ashbike/apps/mobile/features/glass/docs/GLASS_DEV.md b/applications/ashbike/apps/mobile/features/glass/docs/GLASS_DEV.md
new file mode 100644
index 000000000..cbdd813e2
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/docs/GLASS_DEV.md
@@ -0,0 +1,115 @@
+# Building for Google AI Glasses (Android XR)
+
+## 1. Core Philosophy: "Micro-Utilities"
+Unlike mobile apps designed for long sessions, Glass apps are **"Heads-Up, Hands-Free"** utilities.
+* **Interaction Time:** < 10 seconds per session.
+* **Navigation:** Shallow hierarchy (1-2 levels max). Deep menus are frustrating to navigate with single-temple inputs.
+* **Input Model:** Discrete **Key Events** (D-Pad), NOT Touch Screen drags.
+
+## 2. Navigation Architecture
+Standard Android `NavController` or `FragmentManager` components are often too heavy or complex for the linear, state-driven nature of Glass apps.
+
+### The Pattern: State-Based Mode Switching
+Instead of a back stack, use a top-level State definition to swap "Modes".
+
+```kotlin
+enum class AppMode {
+    Browsing,   // The top-level Pager (Notification <-> Dashboard <-> Settings)
+    Control     // The "Stepped In" mode (Changing gears, adjusting settings)
+}
+
+```
+
+## 3. The Input Model (Crucial)
+
+The single biggest pitfall is handling input.
+
+* **Reality:** The temple touchpad sends **Key Events** (`KEYCODE_DPAD_*`), not Touch Coordinates.
+* **Pitfall:** Components like `HorizontalPager` or `LazyRow` wait for touch drags by default and will fail on Glass.
+* **Fix:** You must disable user scroll and drive navigation via Key Events.
+
+### Mapping Gestures to Code
+
+| User Gesture | Android Event | Action in Code |
+| --- | --- | --- |
+| **Swipe Forward** | `KEYCODE_DPAD_RIGHT` | Move Focus Next / Next Page |
+| **Swipe Backward** | `KEYCODE_DPAD_LEFT` | Move Focus Prev / Prev Page |
+| **Tap (Center)** | `KEYCODE_DPAD_CENTER` | **"Step In"** / Select |
+| **Swipe Down** | `KEYCODE_BACK` | **"Step Out"** / Exit |
+
+## 4. The "Step-In" Interaction Pattern
+
+Since you only have one axis of input (Left/Right), you cannot navigate pages *and* control UI elements simultaneously. You must implement a "Focus Trap."
+
+### Phase A: Browsing Mode (The Hallway)
+
+* **Visual:** Status bar is Gray. Dots are visible.
+* **Action:** Swipes change the *Page* (Dashboard \to Settings).
+* **Tap:** Enters "Interaction Mode" for the current page.
+
+### Phase B: Interaction Mode (The Room)
+
+* **Visual:** Status bar is Green. Border appears around content.
+* **Action:** Swipes change the *Focus* (Gear [-] \to Gear [+]).
+* **Tap:** Actuates the focused button.
+* **Swipe Down:** Exits back to "Browsing Mode."
+
+## 5. Implementation Recipe
+
+### A. The Container (NavHost)
+
+Use a `Box` that listens for Key Events to drive a `HorizontalPager` with `userScrollEnabled = false`.
+
+```kotlin
+HorizontalPager(
+    state = pagerState,
+    userScrollEnabled = false, // CRITICAL: Disable touch drag
+    modifier = Modifier.fillMaxSize()
+) { page ->
+    // Content
+}
+
+```
+
+### B. The Focus Logic
+
+Handle the "Enter" key to toggle a boolean state `isInteracting`.
+
+```kotlin
+// In MainGlassNavigation event listener:
+KeyEvent.KEYCODE_DPAD_CENTER -> {
+    isInteracting = true // Lock navigation, enable button focus
+    haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+}
+
+```
+
+### C. The "Back" Logic
+
+Intercept the system "Back" (Swipe Down) to step out, rather than kill the app.
+
+```kotlin
+BackHandler(enabled = isInteracting) {
+    isInteracting = false // Unlock navigation, return to paging
+}
+
+```
+
+## 6. Developing on Emulator vs. Hardware
+
+The emulator does not perfectly simulate the Glass input driver.
+
+* **To Tap:** Use `Enter` key on keyboard, or `adb shell input keyevent 23`.
+* **To Swipe:** Use Arrow Keys (Left/Right).
+* **To "Swipe Down":** Use `Esc` or Back button.
+* **Mouse Click:** Does **NOT** work unless you explicitly add a `.clickable` modifier to your root Composable for debugging.
+
+## 7. UI Best Practices
+
+* **High Contrast:** Use pure Black backgrounds (`#000000`) for transparency.
+* **Large Text:** Minimum readable size is often ~24sp. Headlines should be 40sp+.
+* **Visual Feedback:** Always provide a visual cue for state changes (Green borders, color shifts) because users lack tactile button feel.
+
+```
+
+```
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/docs/GLASS_Docs.md b/applications/ashbike/apps/mobile/features/glass/docs/GLASS_Docs.md
new file mode 100644
index 000000000..8a38e076c
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/docs/GLASS_Docs.md
@@ -0,0 +1,44 @@
+# Google AI Glass (Android XR) Documentation Index
+
+A curated list of official Google resources for building on the AI Glass platform.
+
+[Code](https://developer.android.com/develop/xr/jetpack-xr-sdk/ai-glasses/build)
+[DeSign](https://developer.android.com/design/ui/ai-glasses)
+[Sample Code](https://github.com/android/ai-samples/tree/prototype-ai-glasses/samples/gemini-live-todo)
+
+## 📚 Core Documentation
+* **[Official Home - AI Glasses Design](https://developer.android.com/design/ui/ai-glasses)**
+    * The central hub for all design and development guidelines for the transparent glass form factor.
+* **[Surface Overview](https://developer.android.com/design/ui/ai-glasses/surfaces/overview)**
+    * Explains the difference between "App View" (Main UI) and System UI overlays.
+
+## 👆 Inputs & Interaction
+* **[Input Methods & Hardware Controls](https://developer.android.com/design/ui/ai-glasses/guides/interaction/inputs)**
+    * **Crucial:** Defines the specific Key Codes for Touchpad Swipes (`KEYCODE_DPAD_*`), Taps, and the "System Back" gesture.
+* **[Focus Management](https://developer.android.com/design/ui/ai-glasses/guides/interaction/focus)**
+    * How to handle the single-threaded focus model (Navigation vs. Interaction modes).
+* **[Audio & Voice](https://developer.android.com/design/ui/ai-glasses/guides/interaction/audio)**
+    * Best practices for earcons, voice feedback, and handling audio focus.
+
+## 🎨 UI & Styles
+* **[Visual Styles & Color](https://developer.android.com/design/ui/ai-glasses/styles/color)**
+    * Guidelines on high-contrast design (Black backgrounds) for transparent optical displays.
+* **[Typography](https://developer.android.com/design/ui/ai-glasses/styles/typography)**
+    * Recommended font sizes to ensure readability while moving (minimums typically ~24sp).
+* **[Components](https://developer.android.com/design/ui/ai-glasses/components/overview)**
+    * Standard UI elements like Cards, Lists, and Buttons optimized for glass.
+* [Glimmer](https://developer.android.com/develop/xr/jetpack-xr-sdk/jetpack-compose-glimmer)*
+
+## 🤖 AI Integration
+* **[AI Patterns](https://developer.android.com/design/ui/ai-glasses/guides/interaction/ai-patterns)**
+    * How to display "Thinking" states and stream multimodal data (Camera/Mic) to Gemini.
+* **[Permissions](https://developer.android.com/design/ui/ai-glasses/guides/interaction/permissions)**
+    * Handling privacy-sensitive sensors (Camera/Microphone) transparently.
+
+## 🛠 Tools & Samples
+* **[Android XR SDK](https://developer.android.com/xr)** (General XR Hub)
+* **[Gemini Multimodal Live Templates](https://github.com/android/generative-ai-android)** (GitHub)
+    * Starter code for streaming video/audio to Gemini (often serves as the base "Glass" example).
+
+---
+*Note: This platform relies heavily on **Standard Android APIs** (Jetpack Compose, Activity, KeyEvent), but interaction patterns differ significantly from mobile.*
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/docs/GLASS_NAV.md b/applications/ashbike/apps/mobile/features/glass/docs/GLASS_NAV.md
new file mode 100644
index 000000000..5728816af
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/docs/GLASS_NAV.md
@@ -0,0 +1,122 @@
+# Glass UI Architecture & Navigation Patterns
+
+## The "Missing" Navigation
+If you are coming from mobile Android development, you will notice the official Google AI/XR Glass samples lack standard navigation components (no `NavController`, no `NavHost`, no `FragmentManager`).
+
+**This is intentional, but confusing.** Google's design philosophy for Glass is "Micro-Utilities":
+1.  **One-Shot Interactions:** Apps are designed to launch, perform one action, and close.
+2.  **System-Level Routing:** Navigation is expected to happen via Voice Intents (*"Hey Google, Start a Ride"*) rather than in-app menus.
+3.  **Shallow Hierarchy:** Deep navigation stacks require repeated hardware gestures (swipes) to exit, which is poor UX on wearables.
+
+However, for a persistent application like **AshBike** (Live Dashboard ↔ Summary ↔ Settings), we require internal navigation.
+
+## The Pattern: State-Based Mode Switching
+Instead of a complex Navigation Graph, Glass apps should use **State-Based Mode Switching**. We do not "navigate" to screens; we swap the active Composable based on a high-level state variable.
+
+### 1. Define Destinations as State
+Do not define routes as URLs or Strings. Use a simple Enum to define the "Modes" of the application.
+
+```kotlin
+enum class AppMode {
+    LiveDashboard, // The main active view
+    RideSummary,   // Post-ride stats
+    Settings       // Configuration
+}
+
+```
+
+### 2. The "GlassNavHost"
+
+We build a lightweight router at the top level of our Compose hierarchy. This avoids the overhead of the Jetpack Navigation library.
+
+```kotlin
+@Composable
+fun AshBikeApp() {
+    // The "Navigator" is simply a state variable
+    var currentMode by remember { mutableStateOf(AppMode.LiveDashboard) }
+
+    GlassScaffold {
+        when (currentMode) {
+            AppMode.LiveDashboard -> LiveDashboardView(
+                // Pass navigation actions as simple lambdas
+                onRideFinished = { currentMode = AppMode.RideSummary },
+                onSettingsClicked = { currentMode = AppMode.Settings }
+            )
+            
+            AppMode.RideSummary -> SummaryView(
+                // Handle "Back" manually by resetting state
+                onBack = { currentMode = AppMode.LiveDashboard },
+                onExit = { /* Close Activity */ }
+            )
+            
+            AppMode.Settings -> SettingsView(
+                onBack = { currentMode = AppMode.LiveDashboard }
+            )
+        }
+    }
+}
+
+```
+
+## Handling Hardware Gestures (The "Back" Problem)
+
+On Glass hardware, the "Back" action is usually triggered by a **Swipe Down** or a tap on the stem. This sends a `KEYCODE_BACK` event.
+
+Because we aren't using a standard back stack, the system will default to closing the app instantly on a swipe. We must intercept this to provide intuitive navigation (e.g., going from Settings back to Dashboard).
+
+### Approach A: Compose BackHandler (Preferred)
+
+Use this inside your sub-screens (`SettingsView`, `SummaryView`).
+
+```kotlin
+@Composable
+fun SettingsView(onBack: () -> Unit) {
+    // Intercepts the hardware swipe/back gesture
+    BackHandler(enabled = true) {
+        onBack() // Execute our state change instead of closing the app
+    }
+    
+    Column {
+        Text("Settings Menu")
+        // ... UI Content
+    }
+}
+
+```
+
+### Approach B: Activity Key Override (Fallback)
+
+If the hardware driver does not propagate the swipe to Compose correctly, override it in the Activity.
+
+```kotlin
+override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+    if (keyCode == KeyEvent.KEYCODE_BACK) {
+        // Custom logic: Check current state and route accordingly
+        // If on Home screen, allow super.onKeyUp to close app
+        return true 
+    }
+    return super.onKeyUp(keyCode, event)
+}
+
+```
+
+com.seacatz.ashbike
+├── data/
+├── domain/
+├── ui/
+│    ├── components/      (Buttons, MetricCards)
+│    ├── screens/
+│    │    ├── dashboard/  (LiveDashboardView.kt)
+│    │    ├── settings/   (SettingsView.kt)
+│    │    └── summary/    (RideSummaryView.kt)
+│    ├── navigation/      <-- PUT IT HERE
+│    │    └── GlassNavigation.kt
+│    └── theme/
+└── MainActivity.kt
+
+## Summary Checklist
+
+* [ ] **Avoid Deep Stacks:** Try to keep the app to 2 levels max (Main View -> Detail View).
+* [ ] **Use Enums:** Manage screens via a simple `currentScreen` state.
+* [ ] **Intercept Back:** Ensure "Swipe Down" navigates up one level, rather than killing the app immediately.
+* [ ] **Voice First:** Wherever possible, allow users to jump to a specific `AppMode` via voice intents on launch.
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/notuse/GlassScreen.kt b/applications/ashbike/apps/mobile/features/glass/notuse/GlassScreen.kt
new file mode 100644
index 000000000..3e5798393
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/notuse/GlassScreen.kt
@@ -0,0 +1,37 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun GlassScreenNOTUSED(
+    uiState: GlassUiState,
+    onEvent: (GlassUiEvent) -> Unit,
+    onClose: () -> Unit
+) {
+    when (uiState.currentScreen) {
+        ScreenState.HOME -> {
+            HomeScreenTest(
+                currentGear = uiState.currentGear,
+                onGearChange = { newGear ->
+                    //onEvent(GlassUiEvent.OnGearChange(newGear))
+                },
+                onOpenGearList = {
+                    //onEvent(GlassUiEvent.OnOpenGearList)
+                },
+                onClose = onClose,
+                // Note: Try to avoid passing repository here if possible;
+                // pass specific data from state instead.
+                // But if HomeScreen needs raw repo access, you can keep it.
+                // repository = null
+            )
+        }
+        ScreenState.GEAR_LIST -> {
+            GearSelectionScreen(
+                currentGear = uiState.currentGear,
+                onGearSelected = { selectedGear ->
+                    //onEvent(GlassUiEvent.OnGearSelect(selectedGear))
+                }
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/proguard-rules.pro b/applications/ashbike/apps/mobile/features/glass/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/androidTest/java/com/ylabz/basepro/ashbike/mobile/glass/ExampleInstrumentedTest.kt b/applications/ashbike/apps/mobile/features/glass/src/androidTest/java/com/ylabz/basepro/ashbike/mobile/glass/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..fa11bbe7f
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/androidTest/java/com/ylabz/basepro/ashbike/mobile/glass/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.ylabz.basepro.ashbike.mobile.glass
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.ylabz.basepro.ashbike.mobile.glass.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/ComponentsPreview.kt b/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/ComponentsPreview.kt
new file mode 100644
index 000000000..6ab3f82aa
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/ComponentsPreview.kt
@@ -0,0 +1,242 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Bolt
+import androidx.compose.material.icons.filled.Explore
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.status.BatteryStatusDisplay
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.status.BikeConnectionStatus
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.drafts.GearControlPanel
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.screens.HomeScreen
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.telemetry.MetricDisplay
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.stage.DataPill
+import com.ylabz.basepro.core.model.bike.SuspensionState
+
+// -------------------------------------------------------------------------
+// 1. COMPONENT PREVIEWS (Isolate the pieces)
+// -------------------------------------------------------------------------
+
+@Preview(name = "Status Indicators", showBackground = true, backgroundColor = 0xFF000000)
+@Composable
+fun StatusIndicatorsPreview() {
+    MaterialTheme {
+        Column(
+            modifier = Modifier
+                .background(Color.Black)
+                .padding(20.dp),
+            horizontalAlignment = Alignment.End
+        ) {
+            // Case A: Everything Good (Green)
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                BikeConnectionStatus(isConnected = true)
+                Spacer(Modifier.width(10.dp))
+                // UPDATED: Pass Zone + Text manually for preview
+                BatteryStatusDisplay(zone = BatteryZone.GOOD, levelText = "85%")
+            }
+
+            Spacer(Modifier.height(20.dp))
+
+            // Case B: Disconnected & Low Battery (Red/Orange)
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                BikeConnectionStatus(isConnected = false)
+                Spacer(Modifier.width(10.dp))
+                // UPDATED: Pass Zone + Text manually for preview
+                BatteryStatusDisplay(zone = BatteryZone.CRITICAL, levelText = "15%")
+            }
+        }
+    }
+}
+
+@Preview(name = "Gear Control Panel", showBackground = true, backgroundColor = 0xFF000000)
+@Composable
+fun GearControlPanelPreview() {
+    MaterialTheme {
+        Box(modifier = Modifier
+            .padding(20.dp)
+            .background(Color.Black)) {
+            val focusRequester = remember { FocusRequester() }
+
+            GearControlPanel(
+                currentGear = 8,
+                onGearUp = {},
+                onGearDown = {},
+                focusRequester = focusRequester
+            )
+        }
+    }
+}
+
+// -------------------------------------------------------------------------
+// 2. FULL SCREEN HUD PREVIEW
+// -------------------------------------------------------------------------
+
+@Preview(
+    name = "Full HUD (640x360)",
+    device = "id:ai_glasses_device"
+)
+@Composable
+fun HomeScreenScreenPreview() {
+    val sampleState = GlassUiState(
+        currentGear = 7,
+        rawSpeed = 24.5,
+        rawHeading = 350f,
+        suspension = SuspensionState.TRAIL,
+        isBikeConnected = true
+    )
+
+    MaterialTheme {
+        HomeScreen(
+            uiState = sampleState,
+            onEvent = {}
+        )
+    }
+}
+
+@Preview(
+    name = "Battery States",
+    device = "id:ai_glasses_device"
+)
+@Composable
+fun BatteryPreview() {
+    MaterialTheme {
+        Column(
+            modifier = Modifier
+                .padding(20.dp)
+                .background(Color.Black)
+        ) {
+            // UPDATED: Use the Enum + Text API
+            BatteryStatusDisplay(zone = BatteryZone.GOOD, levelText = "85%")
+            Spacer(Modifier.height(8.dp))
+            BatteryStatusDisplay(zone = BatteryZone.WARNING, levelText = "40%")
+            Spacer(Modifier.height(8.dp))
+            BatteryStatusDisplay(zone = BatteryZone.CRITICAL, levelText = "10%")
+            Spacer(Modifier.height(8.dp))
+            BatteryStatusDisplay(zone = BatteryZone.UNKNOWN, levelText = "--")
+        }
+    }
+}
+
+@Preview(
+    name = "Header Status Area",
+    device = "id:ai_glasses_device"
+)
+@Composable
+fun HeaderPreview() {
+    MaterialTheme {
+        Column(modifier = Modifier
+            .background(Color.Black)
+            .padding(10.dp)) {
+            // Connected State
+            BikeConnectionStatus(isConnected = true)
+            BatteryStatusDisplay(zone = BatteryZone.GOOD, levelText = "88%")
+
+            Spacer(Modifier.height(20.dp))
+
+            // Disconnected State
+            BikeConnectionStatus(isConnected = false)
+            BatteryStatusDisplay(zone = BatteryZone.CRITICAL, levelText = "12%")
+        }
+    }
+}
+
+// -------------------------------------------------------------------------
+// 3. FULL SCREEN HUD PREVIEW (Example 2)
+// -------------------------------------------------------------------------
+
+@Preview(
+    name = "Full HUD (640x360) - Active",
+    showBackground = true,
+    backgroundColor = 0xFF000000,
+    widthDp = 640,
+    heightDp = 360
+)
+@Composable
+fun HomeScreenScreen2Preview() {
+    val sampleState = GlassUiState(
+        currentGear = 7,
+        rawSpeed = 24.5,
+        rawHeading = 350f,
+        suspension = SuspensionState.TRAIL,
+        isBikeConnected = true,
+        rawBattery = 92 // This will be calculated to BatteryZone.GOOD automatically inside HomeScreen
+    )
+
+    MaterialTheme {
+        HomeScreen(
+            uiState = sampleState,
+            onEvent = {}
+        )
+    }
+}
+
+@Preview(name = "Telemetry Card with Power")
+@Composable
+fun TelemetryPreview() {
+    MaterialTheme {
+        Box(modifier = Modifier
+            .background(Color.Black)
+            .padding(20.dp)) {
+            MetricDisplay(
+                label = "SPEED",
+                value = "24.5",
+                bottomContent = {
+                    Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+                        DataPill(Icons.Default.Explore, "350° N", Color.White)
+                        DataPill(Icons.Default.Bolt, "250 W", Color(0xFFFFD600))
+                    }
+                }
+            )
+        }
+    }
+}
+
+@Preview(name = "Quad Layout HUD", device = "id:ai_glasses_device")
+@Composable
+fun QuadHudPreview() {
+    val sampleState = GlassUiState(
+        rawSpeed = 24.5,
+        rawHeading = 350f,
+        currentGear = 7,
+        rawMotorPower = 250.0,
+        rawHeartRate = 145,
+        isBikeConnected = true,
+        rawBattery = 90
+    )
+    MaterialTheme {
+        HomeScreen(uiState = sampleState, onEvent = {})
+    }
+}
+
+@Preview(name = "HUD - Disconnected (Stats Mode)", widthDp = 640, heightDp = 360)
+@Composable
+fun HudDisconnectedPreview() {
+    val sampleState = GlassUiState(
+        rawSpeed = 12.4,
+        rawHeading = 90f,
+        isBikeConnected = false,
+        tripDistance = "15.2",
+        calories = "450",
+        rawMotorPower = 0.0,
+        rawHeartRate = 130
+    )
+    MaterialTheme {
+        HomeScreen(uiState = sampleState, onEvent = {})
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/HomeScreenPreview.kt b/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/HomeScreenPreview.kt
new file mode 100644
index 000000000..506d21e1a
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/HomeScreenPreview.kt
@@ -0,0 +1,41 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.screens.HomeScreen
+import com.ylabz.basepro.core.model.bike.SuspensionState
+
+/**
+ * Preview for the Glass HomeScreen.
+ * Uses 640x360 dimensions to simulate a typical Smart Glass display.
+ */
+@Preview(device = "id:ai_glasses_device")
+@Composable
+fun HomeScreenPreview() {
+    // 1. Mock Data for the Preview
+    val sampleState = GlassUiState(
+        currentGear = 4,
+        suspension = SuspensionState.TRAIL,
+        isBikeConnected = true,
+
+        // --- UPDATED: Use Raw Types (Double/Float/Int) ---
+        rawSpeed = 18.5,          // Was "18.5"
+        rawHeading = 315f,        // Was "NW" (315° is North West)
+        rawMotorPower = 250.0,    // Was "250"
+        rawBattery = 85,          // Was 85 (mapped to rawBattery)
+
+        // These remain strings if they are formatted text
+        tripDistance = "12.4"     // Was distance = "12.4"
+    )
+
+    // 2. Wrap in Theme (MaterialTheme or your AppTheme)
+    MaterialTheme {
+        HomeScreen(
+            uiState = sampleState,
+            onEvent = {
+                // No-op for preview
+            }
+        )
+    }
+}
diff --git a/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/StatsListPreview.kt b/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/StatsListPreview.kt
new file mode 100644
index 000000000..7ca8c9b86
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/features/glass/ui/StatsListPreview.kt
@@ -0,0 +1,24 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.drafts.RideStatsList
+
+@Preview(name = "Stats List (Disconnected)", device = "id:ai_glasses_device")
+@Composable
+fun StatsListPreview() {
+    MaterialTheme {
+
+            RideStatsList(
+                distance = "12.5",
+                duration = "00:45:10",
+                avgSpeed = "18.2",
+                calories = "350",
+                modifier = Modifier.fillMaxSize()
+            )
+        }
+
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/AndroidManifest.xml b/applications/ashbike/apps/mobile/features/glass/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..385b3a0ec
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".GlassesMainActivity"
+            android:exported="true" />
+            <!-- android:theme="@style/Theme.AshBike" /-->
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/GlassesMainActivity.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/GlassesMainActivity.kt
new file mode 100644
index 000000000..d370b12b0
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/GlassesMainActivity.kt
@@ -0,0 +1,96 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.lifecycle.lifecycleScope
+import androidx.xr.glimmer.GlimmerTheme
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassApp
+import com.ylabz.basepro.core.data.repository.bike.BikeRepository
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@AndroidEntryPoint // <--- Required for Hilt injection
+class GlassesMainActivity : ComponentActivity() {
+
+    // Inject the shared repository instance
+    @Inject lateinit var repository: BikeRepository
+    private lateinit var audioInterface: AudioInterface
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+
+        audioInterface = AudioInterface(
+            this,
+            getString(R.string.hello_ai_glasses)
+        )
+        lifecycle.addObserver(audioInterface)
+
+        setContent {
+            GlimmerTheme {
+                GlassApp(
+                    onClose = {
+
+                        /*audioInterface.speak("Goodbye!")
+                        // Delay slightly or ensure speak finishes if possible, then finish
+                        finish()*/
+
+                        // 2. LAUNCH COROUTINE: Handle the "Goodbye" delay
+                        lifecycleScope.launch {
+                            audioInterface.speak("Goodbye!")
+                            delay(1500) // Wait for audio to finish (approx)
+                            finish()    // Close the Activity
+                        }
+                    }
+                )
+            }
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        // ProjectionState.setProjecting(true)
+        // Do things to make the user aware that this activity is active (for
+        // example, play audio), when the display state is off
+        // 2. User Feedback: Confirm the system is ready/visible
+        // This runs on first launch AND when the screen wakes up from sleep
+        // audioInterface.speak(getString(R.string.hello_ai_glasses))
+        // This updates the flow that BikeViewModel is watching
+        // --- THE FIX: Tell the Repository "I am here!" ---
+        lifecycleScope.launch {
+            // This updates the flow that BikeViewModel is watching
+            repository.updateGlassSessionState(true)
+        }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        // ProjectionState.setProjecting(false)
+        //Stop all the data source access
+        // 3. Battery Saving: If you had heavy sensors (like Camera), pause them here.
+        // For simple data syncing, you can often leave it running.
+        // If AudioInterface is an Observer, it might auto-mute here.
+
+        // --- THE FIX: Tell the Repository "I am gone!" ---
+        lifecycleScope.launch {
+            // This resets the button on the phone to "Start Projection"
+            repository.updateGlassSessionState(false)
+        }
+        // ProjectionState.setProjecting(false)
+        //Stop all the data source access
+        // 3. Battery Saving: If you had heavy sensors (like Camera), pause them here.
+        // For simple data syncing, you can often leave it running.
+        // If AudioInterface is an Observer, it might auto-mute here.
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // 2a. Tell the phone we are gone.
+        // 4. Cleanup: Tell the phone the connection is fully closed
+        // Best Practice: Use the Process scope.
+        // This survives the Activity destruction but is tied to the App lifecycle.
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ProjectionState.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ProjectionState.kt
new file mode 100644
index 000000000..542e21a29
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ProjectionState.kt
@@ -0,0 +1,13 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+object ProjectionState {
+    private val _isProjecting = MutableStateFlow(false)
+    val isProjecting = _isProjecting.asStateFlow()
+
+    fun setProjecting(active: Boolean) {
+        _isProjecting.value = active
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/audio/TTSHelper.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/audio/TTSHelper.kt
new file mode 100644
index 000000000..05bb19e27
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/audio/TTSHelper.kt
@@ -0,0 +1,137 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.audio
+
+import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioFocusRequest
+import android.media.AudioManager
+import android.speech.tts.TextToSpeech
+import android.speech.tts.UtteranceProgressListener
+import android.util.Log
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import java.util.Locale
+
+class TTSHelper(context: Context) : DefaultLifecycleObserver {
+
+    private val appContext = context.applicationContext
+    private var tts: TextToSpeech? = null
+    private var isReady = false
+
+    private val audioManager = appContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+    private val pendingMessages = mutableListOf<Triple<String, Boolean, (() -> Unit)?>>()
+    private val callbacks = mutableMapOf<String, () -> Unit>()
+
+    // Hold the focus request object to release it cleanly later
+    private var focusRequest: AudioFocusRequest? = null
+
+    override fun onCreate(owner: LifecycleOwner) {
+        super.onCreate(owner)
+        if (tts == null) {
+            tts = TextToSpeech(appContext) { status ->
+                if (status == TextToSpeech.SUCCESS) {
+                    setupEngine()
+                } else {
+                    Log.e("TTSHelper", "Init failed: $status")
+                }
+            }
+        }
+    }
+
+    private fun setupEngine() {
+        tts?.apply {
+            val result = setLanguage(Locale.US)
+            if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) {
+                Log.e("TTSHelper", "Language not supported")
+            } else {
+                // 1. Set Audio Attributes directly (Clean API)
+                val audioAttributes = AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                    .build()
+                setAudioAttributes(audioAttributes)
+
+                setOnUtteranceProgressListener(object : UtteranceProgressListener() {
+                    override fun onStart(utteranceId: String?) {}
+
+                    override fun onDone(utteranceId: String?) {
+                        callbacks.remove(utteranceId)?.invoke()
+                        // Optional: abandonAudioFocus() here if you want music to return immediately
+                    }
+
+                    // 2. Minimal Required Override for Abstract Class (Keep empty)
+                    @Deprecated("Deprecated in Java")
+                    override fun onError(utteranceId: String?) {
+                        // This method is abstract in the parent class, so we MUST override it.
+                        // But we don't need to put logic here.
+                    }
+
+                    override fun onError(utteranceId: String?, errorCode: Int) {
+                        callbacks.remove(utteranceId)
+                        Log.e("TTSHelper", "Error ($errorCode): $utteranceId")
+                    }
+                })
+
+                isReady = true
+                processPendingMessages()
+            }
+        }
+    }
+
+    fun speak(text: String, flush: Boolean = true, onComplete: (() -> Unit)? = null) {
+        if (!isReady) {
+            synchronized(pendingMessages) {
+                if (flush) pendingMessages.clear()
+                pendingMessages.add(Triple(text, flush, onComplete))
+            }
+            return
+        }
+
+        val utteranceId = "MSG_${System.currentTimeMillis()}"
+        if (onComplete != null) {
+            callbacks[utteranceId] = onComplete
+        }
+
+        requestAudioFocus()
+
+        val queueMode = if (flush) TextToSpeech.QUEUE_FLUSH else TextToSpeech.QUEUE_ADD
+        tts?.speak(text, queueMode, null, utteranceId)
+    }
+
+    // 3. CLEAN AUDIO FOCUS (No 'if' checks, No suppressions)
+    private fun requestAudioFocus() {
+        focusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK)
+            .setAudioAttributes(
+                AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                    .build()
+            )
+            .setOnAudioFocusChangeListener { /* Handle ducking/pausing if needed */ }
+            .build()
+
+        audioManager.requestAudioFocus(focusRequest!!)
+    }
+
+    private fun abandonAudioFocus() {
+        focusRequest?.let { audioManager.abandonAudioFocusRequest(it) }
+    }
+
+    private fun processPendingMessages() {
+        synchronized(pendingMessages) {
+            pendingMessages.forEach { (text, flush, cb) ->
+                speak(text, flush, cb)
+            }
+            pendingMessages.clear()
+        }
+    }
+
+    override fun onDestroy(owner: LifecycleOwner) {
+        super.onDestroy(owner)
+        tts?.stop()
+        tts?.shutdown()
+        tts = null
+        isReady = false
+        callbacks.clear()
+        abandonAudioFocus()
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/audioInterface.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/audioInterface.kt
new file mode 100644
index 000000000..c37eb3614
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/audioInterface.kt
@@ -0,0 +1,42 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass
+
+import android.content.Context
+import android.speech.tts.TextToSpeech
+import android.util.Log
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+
+class AudioInterface(
+    private val context: Context,
+    private val initializationMessage: String
+) : DefaultLifecycleObserver {
+    private lateinit var tts: TextToSpeech
+    override fun onStart(owner: LifecycleOwner) {
+        super.onStart(owner)
+        tts = TextToSpeech(context) { status ->
+            if (status == TextToSpeech.SUCCESS) {
+                speak(initializationMessage)
+            } else {
+                Log.e(TAG, "Initialization failed with status: $status")
+            }
+        }
+    }
+
+    fun speak(textToSpeak: String) {
+        tts.speak(
+            textToSpeak,
+            TextToSpeech.QUEUE_ADD,
+            null,
+            initializationMessage.lowercase().replace(" ", "_")
+        )
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        super.onStop(owner)
+        tts.shutdown()
+    }
+
+    companion object {
+        private const val TAG = "AudioInterface"
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/AshGlassLayout.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/AshGlassLayout.kt
new file mode 100644
index 000000000..ba85dd597
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/AshGlassLayout.kt
@@ -0,0 +1,152 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.newui
+
+import android.util.Log
+import androidx.compose.foundation.background
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Button
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Text
+import androidx.xr.glimmer.surface
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.newui.sections.HeaderBar
+import com.ylabz.basepro.ashbike.mobile.features.glass.newui.sections.StatsBoard
+import com.ylabz.basepro.ashbike.mobile.features.glass.newui.sections.VelocityDash
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiEvent
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiState
+import kotlinx.coroutines.delay
+
+@Composable
+fun AshGlassLayout(
+    modifier: Modifier = Modifier,
+    uiState: GlassUiState,
+    onEvent: (GlassUiEvent) -> Unit
+) {
+    // New Focus Requester for the Gear controls
+    // val gearFocus = remember { FocusRequester() }
+    val statsFocus = remember { FocusRequester() } // 1. New Focus Requester for List
+
+    Box(
+        modifier = modifier
+            .surface(focusable = false)
+            .fillMaxSize()
+            .background(GlimmerTheme.colors.surface)
+            .onFocusChanged {
+                if (it.isFocused) Log.d("FOCUS_DEBUG", "Speed Card got Focus!")
+            },
+        contentAlignment = Alignment.Center
+    ) {
+        Card(
+            modifier = Modifier.padding(8.dp).fillMaxSize(),
+            title = {
+                // 1. TOP HEADER (Replaced 'HomeHeader')
+                HeaderBar(
+                    isConnected = uiState.isBikeConnected,
+                    gear = uiState.currentGear,
+                    batteryZone = uiState.batteryZone,
+                    batteryText = uiState.formattedBattery,
+                    onGearUp = { onEvent(GlassUiEvent.GearUp) },
+                    onGearDown = { onEvent(GlassUiEvent.GearDown) },
+                    // focusRequester = gearFocus
+                )
+            },
+            action = {
+                Button(onClick = { onEvent(GlassUiEvent.CloseApp) }) {
+                    Text(stringResource(R.string.exit), style = GlimmerTheme.typography.bodyMedium)
+                }
+            }
+        ) {
+            // 2. INFINITE SCROLL DASHBOARD
+            // Speed is Item 0, Stats are Item 1.
+            // Allows the speed card to push up when you want to see stats.
+            // wrapContentHeight() ensures it only takes the space it needs.
+            // FIXED COLUMN LAYOUT
+            // REDUCE SPACING: Was 16.dp, change to 4.dp or 8.dp
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = 4.dp),
+                verticalArrangement = Arrangement.spacedBy(4.dp)
+            ) {
+
+
+                // 1. FIXED TOP: VELOCITY DASH
+                // ITEM A: The Big Speedometer
+                // 1. FIXED TOP: VELOCITY DASH
+                // wrapContentHeight() ensures it only takes the space it needs.
+                // 1. VELOCITY DASH (Non-focusable display)
+                Box(modifier = Modifier.fillMaxWidth().wrapContentHeight()) {
+                    VelocityDash(
+                        speed = uiState.formattedSpeed,
+                        heading = uiState.formattedHeading
+                    )
+                }
+
+
+                // ITEM B: The Detailed Stats
+                // 2. SCROLLABLE BOTTOM: STATS BOARD
+                // weight(1f) tells it to fill all remaining vertical space.
+                // The scrolling happens INSIDE StatsBoard now.
+                // 2. STATS BOARD (Focus Target)
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f)
+                        // 2. Apply Focus logic here so D-Pad/Scroll works immediately
+                        .focusRequester(statsFocus)
+                        .focusable()
+                ) {
+                    StatsBoard(
+                        distance = uiState.tripDistance,
+                        duration = uiState.rideDuration,
+                        avgSpeed = uiState.averageSpeed,
+                        calories = uiState.calories,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                }
+            }
+        }
+    }
+
+    // 1. The Trigger
+    LaunchedEffect(Unit) {
+        Log.d("FOCUS_DEBUG", "Requesting focus now...")
+        delay(300) // Increase to 300ms or 500ms temporarily to test
+
+        try {
+            statsFocus.requestFocus()
+            Log.d("FOCUS_DEBUG", "Request sent.")
+        } catch (e: Exception) {
+            Log.e("FOCUS_DEBUG", "Focus request failed: ${e.message}")
+        }
+    }
+
+    // 3. Request Focus on the Stats List on launch
+    /* LaunchedEffect(Unit) {
+        delay(200) // Wait 200ms for UI to build
+        // We delay slightly to ensure layout is ready, or just call it directly
+        statsFocus.requestFocus()
+    } */
+
+    /* Auto-focus logic
+    LaunchedEffect(uiState.isBikeConnected) {
+        if (uiState.isBikeConnected) gearFocus.requestFocus()
+    }*/
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/DataWidget.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/DataWidget.kt
new file mode 100644
index 000000000..f329bf431
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/DataWidget.kt
@@ -0,0 +1,28 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.newui.elements
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Text
+
+@Composable
+fun DataWidget(
+    label: String,
+    value: String,
+    isHero: Boolean = false
+) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Text(
+            text = label.uppercase(),
+            style = GlimmerTheme.typography.bodySmall,
+            color = GlimmerTheme.colors.outline
+        )
+        Text(
+            text = value,
+            // Use TitleLarge for Hero (Speed), TitleMedium for others if needed
+            style = if (isHero) GlimmerTheme.typography.titleLarge else GlimmerTheme.typography.titleMedium,
+            color = GlimmerTheme.colors.primary
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/ListRow.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/ListRow.kt
new file mode 100644
index 000000000..5d9109645
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/ListRow.kt
@@ -0,0 +1,68 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.newui.elements
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+
+@Composable
+fun ListRow(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    accent: Color
+) {
+    Column {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(Color.Transparent, RoundedCornerShape(8.dp))
+                .padding(4.dp)
+        ) {
+            Icon(
+                imageVector = icon,
+                contentDescription = null,
+                tint = accent,
+                modifier = Modifier.size(20.dp)
+            )
+            Spacer(modifier = Modifier.width(12.dp))
+            Column {
+                Text(
+                    text = value,
+                    style = GlimmerTheme.typography.bodyLarge,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+                Text(
+                    text = label,
+                    style = GlimmerTheme.typography.bodySmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Clip
+                )
+            }
+        }
+        // Divider included in the row component for simplicity
+        HorizontalDivider(
+            modifier = Modifier.padding(start = 36.dp, end = 8.dp),
+            thickness = 1.dp,
+            color = GlimmerTheme.colors.outlineVariant
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/StatusBadges.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/StatusBadges.kt
new file mode 100644
index 000000000..0f88ac277
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/elements/StatusBadges.kt
@@ -0,0 +1,67 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.newui.elements
+
+// 1. IMPORT GLIMMER ICON
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.BatteryUnknown
+import androidx.compose.material.icons.rounded.BatteryAlert
+import androidx.compose.material.icons.rounded.BatteryFull
+import androidx.compose.material.icons.rounded.BatteryStd
+import androidx.compose.material.icons.rounded.Link
+import androidx.compose.material.icons.rounded.LinkOff
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.BatteryZone
+
+@Composable
+fun BatteryBadge(
+    // Ensure this matches where you defined the Enum (inside GlassUiState or outside)
+    zone: BatteryZone,
+    level: String,
+    modifier: Modifier = Modifier
+) {
+    val (icon, tint) = when (zone) {
+        BatteryZone.UNKNOWN -> Icons.AutoMirrored.Rounded.BatteryUnknown to GlimmerTheme.colors.outline
+        BatteryZone.CRITICAL -> Icons.Rounded.BatteryAlert to GlimmerTheme.colors.negative
+        BatteryZone.WARNING -> Icons.Rounded.BatteryStd to GlimmerTheme.colors.positive
+        BatteryZone.GOOD -> Icons.Rounded.BatteryFull to GlimmerTheme.colors.positive
+    }
+
+    Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
+        // 2. USE GLIMMER ICON
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = tint,
+            modifier = Modifier.width(16.dp)
+        )
+        Spacer(Modifier.width(4.dp))
+        Text(level, color = tint, style = GlimmerTheme.typography.bodySmall)
+    }
+}
+
+@Composable
+fun ConnectionBadge(active: Boolean, modifier: Modifier = Modifier) {
+    val color = if (active) GlimmerTheme.colors.positive else GlimmerTheme.colors.negative
+    val icon = if (active) Icons.Rounded.Link else Icons.Rounded.LinkOff
+    val text = if (active) "BLE CNX" else "NO BLE"
+
+    Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
+        // 3. RESTORED & FIXED ICON
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = color,
+            modifier = Modifier.width(16.dp)
+        )
+        Spacer(Modifier.width(4.dp))
+        Text(text, color = color, style = GlimmerTheme.typography.bodySmall)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/HeaderBar.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/HeaderBar.kt
new file mode 100644
index 000000000..ec7905efc
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/HeaderBar.kt
@@ -0,0 +1,87 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.newui.sections
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+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.material.icons.Icons
+import androidx.compose.material.icons.rounded.Add
+import androidx.compose.material.icons.rounded.Remove
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Button
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.newui.elements.BatteryBadge
+import com.ylabz.basepro.ashbike.mobile.features.glass.newui.elements.ConnectionBadge
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.BatteryZone
+
+
+@Composable
+fun HeaderBar(
+    isConnected: Boolean,
+    gear: Int,
+    batteryZone: BatteryZone,
+    batteryText: String,
+    onGearUp: () -> Unit,
+    onGearDown: () -> Unit,
+    // focusRequester: FocusRequester
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        if (isConnected) {
+            // MODE: CONTROLS
+            Text(
+                text = stringResource(R.string.gear, gear), // $gear
+                color = GlimmerTheme.colors.positive,
+                style = GlimmerTheme.typography.titleLarge
+            )
+            Spacer(Modifier.width(16.dp))
+            Button(onClick = onGearDown, modifier = Modifier.size(40.dp)) {
+                Icon(Icons.Rounded.Remove, contentDescription = "Down")
+            }
+            Spacer(Modifier.width(8.dp))
+            Button(
+                onClick = onGearUp,
+                modifier = Modifier.size(40.dp)// .focusRequester(focusRequester)
+            ) {
+                Icon(Icons.Rounded.Add, contentDescription = "Up")
+            }
+        }
+        /* else {
+            // MODE: BRANDING
+            Text(
+                text = "ASHBIKE",
+                color = GlimmerTheme.colors.primary,
+                style = GlimmerTheme.typography.titleLarge
+            )
+        } */
+
+        Spacer(Modifier.weight(1f))
+
+        // STATUS COLUMN
+        // 2. RIGHT SIDE: Status Badges (Only when connected)
+        if (isConnected) {
+            Column(horizontalAlignment = Alignment.End) {
+                ConnectionBadge(active = isConnected)
+                Spacer(modifier = Modifier.height(4.dp))
+                BatteryBadge(
+                    zone = batteryZone,
+                    level = batteryText,
+                    modifier = Modifier.padding(end = 8.dp)
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/StatsBoard.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/StatsBoard.kt
new file mode 100644
index 000000000..83d556c60
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/StatsBoard.kt
@@ -0,0 +1,126 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.newui.sections
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.AvTimer
+import androidx.compose.material.icons.rounded.LocalFireDepartment
+import androidx.compose.material.icons.rounded.Speed
+import androidx.compose.material.icons.rounded.Straighten
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.ListItem
+import androidx.xr.glimmer.Text
+import androidx.xr.glimmer.list.VerticalList
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+
+
+/**
+ * The documentation explicitly states: "Warning: Don't use LazyColumn in your AI glasses activities."
+ *
+ */
+
+@Composable
+fun StatsBoard(
+    distance: String,
+    duration: String,
+    avgSpeed: String,
+    calories: String,
+    modifier: Modifier = Modifier,
+    listFocusRequester: FocusRequester? = null
+) {
+    // Card(modifier = modifier) {
+        // CORRECT: Use VerticalList instead of LazyColumn
+        VerticalList(
+            modifier = Modifier
+                .fillMaxSize()
+                .then(if (listFocusRequester != null) Modifier.focusRequester(listFocusRequester) else Modifier),
+            // REDUCE PADDING: Was 8.dp, change to 4.dp or 2.dp
+            contentPadding = PaddingValues(2.dp),
+            verticalArrangement = Arrangement.spacedBy(2.dp)
+        ) {
+            // Item 1: Distance
+            item {
+                GlimmerStatItem(
+                    icon = Icons.Rounded.Straighten,
+                    label = stringResource(R.string.distance),
+                    value = "$distance km",
+                    accent = GlimmerTheme.colors.secondary
+                )
+            }
+            // Item 2: Duration
+            item {
+                GlimmerStatItem(
+                    icon = Icons.Rounded.AvTimer,
+                    label = stringResource(R.string.duration),
+                    value = duration,
+                    accent = GlimmerTheme.colors.secondary
+                )
+            }
+            // Item 3: Avg Speed
+            item {
+                GlimmerStatItem(
+                    icon = Icons.Rounded.Speed,
+                    label = stringResource(R.string.avg_speed),
+                    value = "$avgSpeed mph",
+                    accent = GlimmerTheme.colors.secondary
+                )
+            }
+            // Item 4: Calories
+            item {
+                GlimmerStatItem(
+                    icon = Icons.Rounded.LocalFireDepartment,
+                    label = stringResource(R.string.calories),
+                    value = calories,
+                    accent = GlimmerTheme.colors.negative
+                )
+            }
+        }
+    // }
+}
+
+// Helper wrapper to map your data to the official ListItem
+@Composable
+private fun GlimmerStatItem(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    accent: Color
+) {
+    // Using the 'Focusable' overload (no onClick needed for read-only)
+    ListItem(
+        // LEADING ICON
+        leadingIcon = {
+            Icon(
+                imageVector = icon,
+                contentDescription = null,
+                tint = accent,
+                //modifier = Modifier.size(24.dp)
+            )
+        },
+        // SUPPORTING LABEL (The descriptor, e.g. "DISTANCE")
+        supportingLabel = {
+            Text(
+                text = label,
+                style = GlimmerTheme.typography.bodySmall,
+                color = GlimmerTheme.colors.outline
+            )
+        },
+        // CONTENT (The main value, e.g. "12.5 km")
+        content = {
+            Text(
+                text = value,
+                style = GlimmerTheme.typography.bodyLarge
+            )
+        }
+    )
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/VelocityDash.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/VelocityDash.kt
new file mode 100644
index 000000000..6adc5d719
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/newui/sections/VelocityDash.kt
@@ -0,0 +1,62 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.newui.sections
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Explore
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.newui.elements.DataWidget
+
+@Composable
+fun VelocityDash(
+    speed: String,
+    heading: String
+) {
+    Card(modifier = Modifier.fillMaxWidth()) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                // ADD THIS: Explicitly disable focus for this component
+                .focusProperties { canFocus = false }
+                // REDUCE PADDING: Was 12.dp, change to 4.dp or 8.dp
+                .padding(vertical = 4.dp),
+            horizontalArrangement = Arrangement.SpaceAround,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            // 1. SPEED (Primary Data)
+            DataWidget(
+                label = stringResource(R.string.speed),
+                value = speed,
+                isHero = true // Flag for "Extra Big"
+            )
+
+            // 2. HEADING (Secondary Data)
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                Icon(
+                    imageVector = Icons.Rounded.Explore,
+                    contentDescription = null,
+                    modifier = Modifier.size(32.dp),
+                    tint = GlimmerTheme.colors.secondary
+                )
+                Text(
+                    text = heading,
+                    style = GlimmerTheme.typography.titleMedium
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GearSelectionScreen.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GearSelectionScreen.kt
new file mode 100644
index 000000000..35f50ebed
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GearSelectionScreen.kt
@@ -0,0 +1,68 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+// Glimmer Imports
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.ListItem
+import androidx.xr.glimmer.Text
+import androidx.xr.glimmer.list.VerticalList
+import androidx.xr.glimmer.surface
+
+@Composable
+fun GearSelectionScreen(
+    currentGear: Int,
+    onGearSelected: (Int) -> Unit
+) {
+    Box(
+        modifier = Modifier
+            .surface(focusable = false)
+            .fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Card(title = { Text("Select Gear") }) {
+            // Using VerticalList for proper Glimmer focus handling
+            VerticalList(
+                modifier = Modifier
+                    .width(300.dp) // Restrict width so it looks like a menu
+                    .height(200.dp) // Restrict height to force scrolling behavior
+            ) {
+                items(12) { index ->
+                    val gearNum = index + 1
+                    val isSelected = (gearNum == currentGear)
+
+                    ListItem(
+                        onClick = { onGearSelected(gearNum) },
+                        // 1. Manually handle the "Selected" background color
+                        color = if (isSelected) GlimmerTheme.colors.primary else GlimmerTheme.colors.surface,
+
+                        // 2. Add a Checkmark icon if selected
+                        leadingIcon = if (isSelected) {
+                            { Icon(imageVector = Icons.Default.Check, contentDescription = "Selected") }
+                        } else null,
+
+                        // 3. The main text goes in the trailing lambda 'content'
+                        content = {
+                            Text("Gear $gearNum")
+                        },
+
+                        // 4. Optional: "Active" label underneath
+                        supportingLabel = if (isSelected) {
+                            { Text("Active") }
+                        } else null
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassApp.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassApp.kt
new file mode 100644
index 000000000..d5bf6c302
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassApp.kt
@@ -0,0 +1,72 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.ylabz.basepro.ashbike.mobile.features.glass.newui.AshGlassLayout
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.screens.HomeScreen
+
+
+// Simple Enum to handle local navigation
+enum class ScreenState {
+    HOME,
+    BIKE,
+    GEAR_LIST
+}
+
+@Composable
+fun GlassApp(
+    onClose: () -> Unit,
+    viewModel: GlassViewModel = hiltViewModel(),
+) {
+
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    // Top-level state for the app
+
+    // Simple Navigation Switcher
+    when (uiState.currentScreen) {
+        ScreenState.HOME -> {
+            HomeScreen(
+                uiState = uiState,
+                onEvent = { event ->
+                    // ROUTING LOGIC:
+                    when (event) {
+                        // 1. Navigation Events -> Handle Locally
+                        GlassUiEvent.OpenGearList -> uiState.currentScreen = ScreenState.GEAR_LIST
+                        GlassUiEvent.CloseApp -> onClose()
+
+                        // 2. Business Events -> Send to ViewModel
+                        else -> viewModel.onEvent(event)
+                    }
+                }
+            )
+        }
+        ScreenState.BIKE -> {
+            AshGlassLayout(
+                uiState = uiState,
+                onEvent = { event ->
+                    // ROUTING LOGIC:
+                    when (event) {
+                        // 1. Navigation Events -> Handle Locally
+                        GlassUiEvent.OpenGearList -> uiState.currentScreen = ScreenState.GEAR_LIST
+                        GlassUiEvent.CloseApp -> onClose()
+
+                        // 2. Business Events -> Send to ViewModel
+                        else -> viewModel.onEvent(event)
+                    }
+                }
+            )
+        }
+        ScreenState.GEAR_LIST -> {
+            // Preserving your logic for Gear Selection
+            /*GearSelectionScreen(
+                currentGear = uiState.currentGear,
+                onGearSelected = { selectedGear ->
+                    // Send change to VM, then nav back
+                    uiState.currentGear = selectedGear
+                    currentScreen = ScreenState.HOME // Go back after selection
+                }
+            )*/
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassUiEvent.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassUiEvent.kt
new file mode 100644
index 000000000..f0ff0d366
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassUiEvent.kt
@@ -0,0 +1,13 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+sealed interface GlassUiEvent {
+    // Business Logic (Handled by ViewModel)
+    data object GearUp : GlassUiEvent
+    data object GearDown : GlassUiEvent
+    data object ToggleSuspension : GlassUiEvent
+    data class SelectGear(val gear: Int) : GlassUiEvent
+
+    // Navigation / System Actions (Intercepted by GlassApp)
+    data object OpenGearList : GlassUiEvent
+    data object CloseApp : GlassUiEvent
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassUiState.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassUiState.kt
new file mode 100644
index 000000000..da5e27af0
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassUiState.kt
@@ -0,0 +1,81 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+import com.ylabz.basepro.core.model.bike.SuspensionState
+
+// 1. Define the status types (The "What")
+enum class BatteryZone {
+    UNKNOWN, GOOD, WARNING, CRITICAL
+}
+
+data class GlassUiState(
+    // --- RAW DATA (Source of Truth) ---
+    // We store real numbers here, not Strings.
+    val currentGear: Int = 1,
+    val suspension: SuspensionState = SuspensionState.OPEN,
+    val isBikeConnected: Boolean = false,
+
+    val rawSpeed: Double = 0.0,        // Changed from String to Double
+    val rawBattery: Int? = null,       // Int? handles nulls automatically
+    val rawMotorPower: Double? = null, // Nullable for "--" logic
+    val rawHeartRate: Int? = null,
+    val rawHeading: Float = 0f,
+
+    // Keep these as strings if they are pre-formatted durations/distances,
+    // or convert them to raw types if you want the same control.
+    val tripDistance: String = "0.0",
+    val calories: String = "0",
+    val rideDuration: String = "00:00",
+    val averageSpeed: String = "0.0",
+    var currentScreen: ScreenState = ScreenState.BIKE
+) {
+    // =================================================================
+    // COMPUTED PROPERTIES (The Logic is Here!)
+    // =================================================================
+
+    // 1. ALWAYS SHOW SPEED (From Phone GPS)
+    val formattedSpeed: String
+        get() = String.format("%.1f", rawSpeed) // Removed 'if(connected)' check
+
+    // 2. The Logic: State decides the "Zone"
+    val batteryZone: BatteryZone
+        get() = when {
+            !isBikeConnected || rawBattery == null -> BatteryZone.UNKNOWN
+            rawBattery > 50 -> BatteryZone.GOOD
+            rawBattery > 20 -> BatteryZone.WARNING
+            else -> BatteryZone.CRITICAL
+        }
+
+    val formattedBattery: String
+        get() = if (isBikeConnected) {
+            rawBattery?.let { "$it%" } ?: "--%"
+        } else {
+            "--%"
+        }
+
+    val formattedPower: String
+        get() = if (isBikeConnected) {
+            // Show power only if > 0
+            rawMotorPower?.takeIf { it > 0 }?.let { "${it.toInt()} W" } ?: "--"
+        } else {
+            "--"
+        }
+
+    val formattedHeartRate: String
+        get() = if (isBikeConnected) {
+            rawHeartRate?.takeIf { it > 0 }?.toString() ?: "--"
+        } else {
+            "--"
+        }
+
+    // 2. ALWAYS SHOW HEADING (From Phone Compass)
+    val formattedHeading: String
+        get() {
+            val directions = arrayOf("N", "NE", "E", "SE", "S", "SW", "W", "NW")
+            // Handle NaN or infinite values safely
+            val validHeading = if (rawHeading.isNaN()) 0f else rawHeading
+            val index = ((validHeading + 22.5) / 45.0).toInt() and 7
+            return "${validHeading.toInt()}° ${directions[index]}"
+        }
+
+}
+
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassViewModel.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassViewModel.kt
new file mode 100644
index 000000000..bd5d93d0f
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/GlassViewModel.kt
@@ -0,0 +1,80 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ylabz.basepro.core.data.repository.bike.BikeRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel // 1. Add this annotation
+class GlassViewModel @Inject constructor(
+    private val repository: BikeRepository // 2. Inject the repository instance
+) : ViewModel() {
+
+    // UI State for the Glass Screen
+    private val _uiState = MutableStateFlow(GlassUiState())
+    val uiState = _uiState.asStateFlow()
+
+    init {
+        viewModelScope.launch {
+            // Combine flows from Repository to update UI automatically
+            combine(
+                repository.currentGear,
+                repository.suspensionState,
+                repository.rideInfo, // <--- ADD THIS
+            ) { gear, susp, info ->
+
+                // -------------------------------------------------------------
+                // UPDATE STATE WITH RAW DATA
+                // Formatting logic (e.g. "--") is now handled inside GlassUiState
+                // -------------------------------------------------------------
+                _uiState.value.copy(
+                    // 1. Connection & System
+                    isBikeConnected = info.isBikeConnected,
+                    currentGear = gear,
+                    suspension = susp,
+                    rawBattery = info.batteryLevel, // Pass raw Int?
+
+                    // 2. Sensor Data (Pass Raw Numbers)
+                    rawSpeed = info.currentSpeed,   // Pass Double
+                    rawHeading = info.heading,      // Pass Float
+                    rawMotorPower = info.motorPower?.toDouble(), // Pass Double?
+                    rawHeartRate = info.heartbeat,  // Pass Int?
+
+                    // 3. Trip Stats (Keep as formatted strings if your UIState expects strings for these)
+                    tripDistance = String.format("%.1f", info.currentTripDistance),
+                    calories = info.caloriesBurned.toString(),
+                    rideDuration = info.rideDuration,
+                    averageSpeed = String.format("%.1f", info.averageSpeed)
+                )
+            }.collect { newState ->
+                _uiState.value = newState
+            }
+        }
+    }
+
+    fun onEvent(event: GlassUiEvent) {
+        when(event) {
+            // 4. Call methods on the injected instance
+            GlassUiEvent.GearUp -> { viewModelScope.launch { repository.gearUp() } }
+            GlassUiEvent.GearDown -> { viewModelScope.launch { repository.gearDown() } }
+            GlassUiEvent.ToggleSuspension -> { viewModelScope.launch { repository.toggleSuspension() } }
+
+            // For now, these might be handled by the UI/Activity directly,
+            // or you can add logic here if needed.
+            GlassUiEvent.CloseApp -> { /* handled in UI/Activity */ }
+            is GlassUiEvent.SelectGear -> {
+                // If you want the list to update the gear:
+                // repository.setGear(event.gear)
+            }
+
+            // Navigation events are handled by the Compose UI layer (GlassApp),
+            // but we list them here to be exhaustive or if we wanted to log them.
+            GlassUiEvent.OpenGearList -> {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/common/GlassListItem.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/common/GlassListItem.kt
new file mode 100644
index 000000000..e81b248a2
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/common/GlassListItem.kt
@@ -0,0 +1,91 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.common
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+
+
+@Composable
+fun GlassListItem(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    iconTint: Color
+) {
+    // STATE: Track focus to highlight the row when selected (enables scrolling via D-pad)
+    var isFocused by remember { mutableStateOf(false) }
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            // FIX: Use defaultMinSize + Padding instead of fixed height
+            // This prevents clipping if the Glimmer font is tall
+            //.height(48.dp) // Taller touch/focus target for easier scrolling
+            // .defaultMinSize(minHeight = 48.dp)
+            .onFocusChanged { isFocused = it.isFocused }
+            .focusable() // <--- CRITICAL: Makes it selectable so the list scrolls
+            // Glimmer typically handles focus via outline, but simple background highlight is okay
+            .background(
+                // Allowed: Use 'outlineVariant' for focus highlight (subtle grey)
+                color = if (isFocused) GlimmerTheme.colors.outlineVariant else Color.Transparent,
+                shape = RoundedCornerShape(8.dp)
+            )
+            .padding(vertical = 4.dp, horizontal = 4.dp) // Tighter padding
+    ) {
+        // LEADING ICON
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = iconTint,
+            modifier = Modifier.size(20.dp)
+        )
+
+        Spacer(modifier = Modifier.width(8.dp))
+
+        // TEXT CONTENT
+        Column(verticalArrangement = Arrangement.Center) {
+            // VALUE (e.g., "12.5 km")
+            Text(
+                text = value,
+                // No Color set -> Defaults to Calculated White
+                style = GlimmerTheme.typography.bodyLarge, // Strict: Largest Body
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+            // LABEL (e.g., "DISTANCE")
+            Text(
+                text = label,
+                // No Color set -> Defaults to Calculated White (or maybe Gray if Glimmer handles disabled)
+                // Since we can't use custom colors, we let the Typography style carry the weight.
+                style = GlimmerTheme.typography.bodySmall, // Strict: Smallest Body
+                maxLines = 1,
+                overflow = TextOverflow.Clip
+            )
+        }
+    }
+}
+
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/common/ListDividerScroll.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/common/ListDividerScroll.kt
new file mode 100644
index 000000000..053c81f90
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/common/ListDividerScroll.kt
@@ -0,0 +1,20 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.common
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.GlimmerTheme
+
+@Composable
+fun ListDividerScroll() {
+    HorizontalDivider(
+        modifier = Modifier.padding(start = 32.dp, end = 8.dp),
+        thickness = 0.5.dp,
+        // Use Glimmer's Outline Variant for subtle dividers
+        // color = GlimmerTheme.colors.outlineVariant.copy(alpha = 0.3f)
+        // Allowed: Use 'outlineVariant' for dividers
+        color = GlimmerTheme.colors.outlineVariant
+    )
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/controls/LaunchGlassButton.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/controls/LaunchGlassButton.kt
new file mode 100644
index 000000000..d3d43e1d6
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/controls/LaunchGlassButton.kt
@@ -0,0 +1,90 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.controls
+
+import android.os.Build
+import android.util.Log
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CastConnected
+import androidx.compose.material.icons.filled.PermDeviceInformation
+import androidx.compose.material.icons.filled.UsbOff
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.model.GlassButtonState
+
+@Composable
+fun LaunchGlassButton(
+    buttonState: GlassButtonState,
+    onButtonClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+
+    // Debug Recomposition
+    SideEffect {
+        Log.d("DEBUG_GLASS", "3. UI Recomposition: Button State = $buttonState")
+    }
+
+    // 1. Safety Check for Android 15
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) return
+
+    // 2. Define the Visuals for each State
+    data class StateVisuals(
+        val text: String,
+        val icon: ImageVector,
+        val containerColor: Color,
+        val contentColor: Color,
+        val enabled: Boolean
+    )
+
+    val visuals = when (buttonState) {
+        GlassButtonState.NO_GLASSES -> StateVisuals(
+            text = stringResource(R.string.connect_glasses),
+            icon = Icons.Default.UsbOff,
+            containerColor = MaterialTheme.colorScheme.surfaceVariant,
+            contentColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.38f),
+            enabled = false
+        )
+        GlassButtonState.READY_TO_START -> StateVisuals(
+            text = stringResource(R.string.start_projection),
+            icon = Icons.Default.PermDeviceInformation, // Or generic "Glasses" icon
+            containerColor = MaterialTheme.colorScheme.primary,
+            contentColor = MaterialTheme.colorScheme.onPrimary,
+            enabled = true
+        )
+        GlassButtonState.PROJECTING -> StateVisuals(
+            text = stringResource(R.string.projecting_active),
+            icon = Icons.Default.CastConnected,
+            containerColor = Color(0xFF4CAF50), // Bike Green
+            contentColor = Color.White,
+            enabled = true // Kept enabled so user can click to "Stop" or "Open Controls"
+        )
+    }
+
+    // 3. Render
+    Button(
+        onClick = onButtonClick,
+        enabled = visuals.enabled,
+        colors = ButtonDefaults.buttonColors(
+            containerColor = visuals.containerColor,
+            contentColor = visuals.contentColor,
+            disabledContainerColor = visuals.containerColor,
+            disabledContentColor = visuals.contentColor
+        ),
+        modifier = modifier
+    ) {
+        Icon(visuals.icon, contentDescription = null)
+        Spacer(modifier = Modifier.width(8.dp))
+        Text(visuals.text)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/BottomSection.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/BottomSection.kt
new file mode 100644
index 000000000..82438b714
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/BottomSection.kt
@@ -0,0 +1,79 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.stage
+
+
+// Glimmer Imports
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiEvent
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiState
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+
+@Composable
+fun BottomSection(
+    uiState: GlassUiState,
+    onEvent: (GlassUiEvent) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    // --- ROW 2: BOTTOM SECTION ---
+    // (Same as before: Power & Heart Rate)
+    Column(modifier = Modifier.fillMaxSize().padding(top = 8.dp)) {
+        Row(
+            modifier = Modifier.weight(0.35f).fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceEvenly
+        ) {
+            // Power
+            Box(modifier = Modifier.weight(1f).padding(end = 6.dp)) {
+                Card(modifier = Modifier.fillMaxSize()) {
+                    Column(
+                        modifier = Modifier.fillMaxSize(),
+                        verticalArrangement = Arrangement.Center,
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Text(
+                            stringResource(R.string.power),
+                            style = MaterialTheme.typography.labelSmall,
+                            color = GlassColors.TextSecondary,
+                            fontSize = 8.sp,
+                            fontWeight = FontWeight.Bold
+                        )
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            // Glimmer Icon
+                            // Icon(Icons.Default.Bolt, "Watts", tint = Color(0xFFFFD600), modifier = Modifier.width(20.dp))
+                            Spacer(Modifier.width(4.dp))
+                            Text(
+                                "${uiState.formattedPower} W",
+                                fontSize = 24.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = Color.White
+                            )
+                        }
+                    }
+                }
+            }
+            // Heart Rate
+            Box(modifier = Modifier.weight(1f).padding(start = 6.dp)) {
+                HeartRateCard(heartRate = uiState.formattedHeartRate, modifier = Modifier.fillMaxSize())
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/DataPill.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/DataPill.kt
new file mode 100644
index 000000000..2956af792
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/DataPill.kt
@@ -0,0 +1,39 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.stage
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+
+@Composable
+fun DataPill(
+    icon: ImageVector,
+    text: String,
+    color: Color
+) {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = color.copy(alpha = 0.8f),
+            modifier = Modifier.size(12.dp)
+        )
+        Spacer(Modifier.width(4.dp))
+        Text(
+            text = text,
+            color = color,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Medium
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/HeartRateCard.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/HeartRateCard.kt
new file mode 100644
index 000000000..637f58a8e
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/HeartRateCard.kt
@@ -0,0 +1,81 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.stage
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun HeartRateCard(
+    heartRate: String,
+    modifier: Modifier = Modifier
+) {
+    // Parse Int safely for color logic
+    val bpm = heartRate.toIntOrNull() ?: 0
+
+    // Dynamic Color Logic
+    val zoneColor = when {
+        bpm > 160 -> GlassColors.ZoneMax      // Red
+        bpm > 140 -> GlassColors.ZoneThreshold // Orange
+        bpm > 120 -> GlassColors.ZoneAerobic   // Green
+        else -> GlassColors.ZoneEasy          // Blue
+    }
+
+    Card(modifier = modifier) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.padding(8.dp)
+        ) {
+            Text(
+                text = stringResource(R.string.heart_rate),
+                style = MaterialTheme.typography.labelSmall,
+                color = GlassColors.TextSecondary,
+                fontSize = 8.sp,
+                fontWeight = FontWeight.Bold
+            )
+
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Icon(
+                    imageVector = Icons.Default.Favorite,
+                    contentDescription = null,
+                    tint = zoneColor,
+                    modifier = Modifier.size(24.dp)
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Text(
+                    text = heartRate,
+                    fontSize = 32.sp,
+                    color = Color.White,
+                    fontWeight = FontWeight.Bold
+                )
+
+                // Small "BPM" unit
+                Spacer(modifier = Modifier.width(4.dp))
+                Text(
+                    text = "bpm",
+                    fontSize = 12.sp,
+                    color = GlassColors.TextSecondary,
+                    modifier = Modifier.align(Alignment.Bottom)
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsDisplayPanel.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsDisplayPanel.kt
new file mode 100644
index 000000000..0d2df3938
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsDisplayPanel.kt
@@ -0,0 +1,61 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.stage
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.LocalFireDepartment
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.telemetry.MetricDisplay
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun RideStatsDisplayPanel(
+    distance: String,
+    calories: String,
+    modifier: Modifier = Modifier
+) {
+    Card(modifier = modifier) {
+        // We now use MetricDisplay to reuse the exact same layout style as Speed/Heading
+        MetricDisplay(
+            label = stringResource(R.string.distance_km),
+            value = distance,
+            // We can keep it Cyan to match Speed, or use a different color like White
+            highlightColor = GlassColors.NeonCyan,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(vertical = 8.dp),
+            bottomContent = {
+                // The Calories section now mirrors the "Heading" style
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Icon(
+                        imageVector = Icons.Default.LocalFireDepartment, // Fire icon
+                        contentDescription = stringResource(R.string.distance_km),
+                        tint = Color(0xFFFF9800), // Keep Orange tint for the icon
+                        modifier = Modifier.width(16.dp) // Similar size to compass icon
+                    )
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Text(
+                        text = stringResource(R.string.kcal, calories), // "$calories kcal",
+                        color = Color.White, // White text, just like Heading
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.Medium
+                    )
+                }
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsFullList.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsFullList.kt
new file mode 100644
index 000000000..7f88b46ed
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsFullList.kt
@@ -0,0 +1,122 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.stage
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AvTimer
+import androidx.compose.material.icons.filled.LocalFireDepartment
+import androidx.compose.material.icons.filled.Speed
+import androidx.compose.material.icons.filled.Straighten
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun RideStatsFullList(
+    distance: String,
+    duration: String,
+    avgSpeed: String,
+    calories: String,
+    modifier: Modifier = Modifier
+) {
+    Card(modifier = modifier) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 12.dp, vertical = 8.dp),
+            verticalArrangement = Arrangement.SpaceEvenly // Distribute nicely
+        ) {
+            // 1. Distance
+            StatRow(
+                icon = Icons.Default.Straighten,
+                label = stringResource(R.string.dist),
+                value = "$distance km",
+                color = GlassColors.NeonCyan
+            )
+
+            // 2. Duration
+            StatRow(
+                icon = Icons.Default.AvTimer,
+                label = stringResource(R.string.time),
+                value = duration,
+                color = Color.White
+            )
+
+            // 3. Avg Speed
+            StatRow(
+                icon = Icons.Default.Speed,
+                label = stringResource(R.string.avg),
+                value = "$avgSpeed mph",
+                color = Color.White
+            )
+
+            // 4. Calories
+            StatRow(
+                icon = Icons.Default.LocalFireDepartment,
+                label = stringResource(R.string.cal),
+                value = calories,
+                color = Color(0xFFFF9800) // Orange
+            )
+        }
+    }
+}
+
+// Helper Composable for consistent rows
+@Composable
+private fun StatRow(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    color: Color
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        // Icon
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = color,
+            modifier = Modifier.width(16.dp)
+        )
+
+        Spacer(modifier = Modifier.width(8.dp))
+
+        // Label (Small, Gray)
+        Text(
+            text = label,
+            style = MaterialTheme.typography.labelSmall,
+            color = GlassColors.TextSecondary,
+            fontSize = 10.sp,
+            fontWeight = FontWeight.Bold,
+            modifier = Modifier.width(36.dp) // Fixed width aligns the values
+        )
+
+        // Value (Bold)
+        Text(
+            text = value,
+            fontSize = 16.sp,
+            fontWeight = FontWeight.Bold,
+            color = Color.White
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsPanel.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsPanel.kt
new file mode 100644
index 000000000..291c27f15
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/stage/RideStatsPanel.kt
@@ -0,0 +1,105 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.stage
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.LocalFireDepartment
+import androidx.compose.material.icons.filled.Straighten
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.Icon // <--- CORRECT GLIMMER IMPORT
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun RideStatsPanel_not_used(
+    distance: String,
+    calories: String,
+    modifier: Modifier = Modifier
+) {
+    Card(modifier = modifier) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(8.dp),
+            verticalArrangement = Arrangement.SpaceEvenly
+        ) {
+            // 1. DISTANCE ROW
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                // GLIMMER ICON
+                Icon(
+                    imageVector = Icons.Default.Straighten, // Ruler
+                    contentDescription = null,
+                    tint = GlassColors.NeonCyan,
+                    modifier = Modifier.width(20.dp)
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Column {
+                    Text(
+                        text = "DISTANCE",
+                        style = MaterialTheme.typography.labelSmall,
+                        color = GlassColors.TextSecondary,
+                        fontSize = 8.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+                    Text(
+                        text = "$distance km",
+                        fontSize = 20.sp,
+                        fontWeight = FontWeight.Bold,
+                        color = Color.White
+                    )
+                }
+            }
+
+            // Optional Divider/Spacer
+            Spacer(modifier = Modifier.height(4.dp))
+
+            // 2. CALORIES ROW
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                // GLIMMER ICON
+                Icon(
+                    imageVector = Icons.Default.LocalFireDepartment, // Fire
+                    contentDescription = null,
+                    tint = Color(0xFFFF9800), // Orange
+                    modifier = Modifier.width(20.dp)
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Column {
+                    Text(
+                        text = "CALORIES",
+                        style = MaterialTheme.typography.labelSmall,
+                        color = GlassColors.TextSecondary,
+                        fontSize = 8.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+                    Text(
+                        text = "$calories kcal",
+                        fontSize = 20.sp,
+                        fontWeight = FontWeight.Bold,
+                        color = Color.White
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/status/BatteryStatusDisplay.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/status/BatteryStatusDisplay.kt
new file mode 100644
index 000000000..7904d5123
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/status/BatteryStatusDisplay.kt
@@ -0,0 +1,61 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.status
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.BatteryUnknown
+import androidx.compose.material.icons.filled.BatteryAlert
+import androidx.compose.material.icons.filled.BatteryFull
+import androidx.compose.material.icons.filled.BatteryStd
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.BatteryZone // Import your new Enum
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun BatteryStatusDisplay(
+    zone: BatteryZone, // <--- Accepts the Enum, not the Int
+    levelText: String, // <--- Accepts the pre-formatted text (e.g. "85%" or "--")
+    modifier: Modifier = Modifier
+) {
+    // 1. Pure Visual Mapping (Style Only)
+    val (icon, color) = when (zone) {
+        BatteryZone.UNKNOWN -> Pair(Icons.AutoMirrored.Filled.BatteryUnknown, Color.Gray)
+        BatteryZone.GOOD -> Pair(Icons.Default.BatteryFull, GlassColors.NeonGreen)
+        BatteryZone.WARNING -> Pair(Icons.Default.BatteryStd, Color(0xFFFF9800))
+        BatteryZone.CRITICAL -> Pair(Icons.Default.BatteryAlert, GlassColors.WarningRed)
+    }
+
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = stringResource(R.string.battery),
+            tint = color,
+            modifier = Modifier.width(16.dp)
+        )
+
+        Spacer(modifier = Modifier.width(4.dp))
+
+        Text(
+            text = levelText,
+            color = color,
+            fontSize = 12.sp,
+            fontWeight = FontWeight.Bold,
+            style = MaterialTheme.typography.labelSmall
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/status/BikeConnectionStatus.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/status/BikeConnectionStatus.kt
new file mode 100644
index 000000000..9f2a94857
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/status/BikeConnectionStatus.kt
@@ -0,0 +1,52 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.status
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.DirectionsBike
+import androidx.compose.material.icons.filled.LinkOff
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.R
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun BikeConnectionStatus(
+    isConnected: Boolean,
+    modifier: Modifier = Modifier
+) {
+    val color = if (isConnected) GlassColors.NeonGreen else GlassColors.WarningRed
+    val icon = if (isConnected) Icons.AutoMirrored.Filled.DirectionsBike else Icons.Default.LinkOff
+    val text = if (isConnected) stringResource(R.string.ble_cnx) else stringResource(R.string.no_ble_cnx)
+
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        // Cool Bike Icon
+        Icon(
+            imageVector = icon,
+            contentDescription = stringResource(R.string.bike_connection),
+            tint = color,
+            modifier = Modifier.width(18.dp) // Slightly larger than text
+        )
+
+        Spacer(modifier = Modifier.width(6.dp))
+
+        // Status Text (Optional: could hide text to save space)
+        Text(
+            text = text,
+            color = color,
+            fontSize = 10.sp,
+            fontWeight = FontWeight.Bold
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/telemetry/MetricDisplay.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/telemetry/MetricDisplay.kt
new file mode 100644
index 000000000..aa889a2e5
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/components/telemetry/MetricDisplay.kt
@@ -0,0 +1,52 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.telemetry
+
+// Glimmer Imports
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Text
+
+@Composable
+fun MetricDisplay(
+    label: String,
+    value: String,
+    // Use Glimmer Secondary (usually a readable blue/cyan) as default
+    highlightColor: Color = GlimmerTheme.colors.secondary,
+    modifier: Modifier = Modifier,
+    // The "Slot" - allows us to pass any complex UI into the bottom area
+    bottomContent: @Composable () -> Unit
+) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier) {
+        // LABEL
+        Text(
+            text = label.uppercase(),
+            // Glimmer typography is optimized for legibility
+            style = GlimmerTheme.typography.bodySmall, // Strict: Smallest Body
+            // We can't set color to onSurfaceVariant as it's not exposed,
+            // so we rely on default or explicit Theme colors if needed.
+            // But Glimmer handles default text color automatically.
+            // color = GlassColors.TextSecondary, // might remove
+            color = GlimmerTheme.colors.outline // Use outline color for subtle labels
+        )
+        // VALUE
+        Text(
+            text = value,
+            // FIX: Use headlineLarge if displayMedium is too big,
+            // but displayMedium is standard for Hero numbers.
+            // If it clips, switch to headlineLarge.
+            style = GlimmerTheme.typography.titleLarge, // Strict: Largest Title
+            color = highlightColor,
+        )
+
+        Spacer(modifier = Modifier.height(4.dp))
+
+        // BOTTOM CONTENT (The new Data Row)
+        bottomContent()
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/model/GlassButtonState.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/model/GlassButtonState.kt
new file mode 100644
index 000000000..b5534c32a
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/model/GlassButtonState.kt
@@ -0,0 +1,8 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.model
+
+// Define the 3 states clearly
+enum class GlassButtonState {
+    NO_GLASSES,      // State 1: Hardware missing
+    READY_TO_START,  // State 2: Hardware good, Software stopped
+    PROJECTING       // State 3: Hardware good, Software running
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/nav/GlassNavHost.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/nav/GlassNavHost.kt
new file mode 100644
index 000000000..8d7e90032
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/nav/GlassNavHost.kt
@@ -0,0 +1,278 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.nav
+
+import android.view.KeyEvent
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+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.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+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.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.key.KeyEventType
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.launch
+
+// ----------------------------------------------------------------------------------
+// 1. THE MAIN HOST (Pager Logic)
+// ----------------------------------------------------------------------------------
+@Composable
+fun MainGlassNavigation() {
+    val pageCount = 3
+    val pagerState = rememberPagerState(pageCount = { pageCount })
+    val coroutineScope = rememberCoroutineScope()
+    val haptics = LocalHapticFeedback.current
+
+    // "pagerFocus" controls the swipes between screens.
+    // When this has focus, Left/Right changes pages.
+    val pagerFocus = remember { FocusRequester() }
+
+    // State to track if we are browsing (Pager) or interacting (Page Content)
+    var isInteracting by remember { mutableStateOf(false) }
+
+    // Grab focus for the Pager immediately on launch
+    LaunchedEffect(Unit) {
+        pagerFocus.requestFocus()
+    }
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.Black)
+            .focusRequester(pagerFocus)
+            .focusable() // The Pager itself must be focusable to catch keys
+            .onKeyEvent { event ->
+                if (isInteracting) return@onKeyEvent false // If locked in, ignore keys here
+
+                if (event.type == KeyEventType.KeyDown) {
+                    when (event.nativeKeyEvent.keyCode) {
+                        // --- NAVIGATION: SWIPE LEFT/RIGHT ---
+                        KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                            val next = (pagerState.currentPage + 1).coerceAtMost(pageCount - 1)
+                            if (next != pagerState.currentPage) {
+                                coroutineScope.launch {
+                                    pagerState.animateScrollToPage(next, animationSpec = tween(300))
+                                }
+                                haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                                return@onKeyEvent true
+                            }
+                        }
+                        KeyEvent.KEYCODE_DPAD_LEFT -> {
+                            val prev = (pagerState.currentPage - 1).coerceAtLeast(0)
+                            if (prev != pagerState.currentPage) {
+                                coroutineScope.launch {
+                                    pagerState.animateScrollToPage(prev, animationSpec = tween(300))
+                                }
+                                haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                                return@onKeyEvent true
+                            }
+                        }
+
+                        // --- INTERACTION: TAP / ENTER ---
+                        // This triggers the "Step In" mode
+                        KeyEvent.KEYCODE_DPAD_CENTER,
+                        KeyEvent.KEYCODE_ENTER -> {
+                            isInteracting = true
+                            haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                            return@onKeyEvent true
+                        }
+                    }
+                }
+                false
+            }
+    ) {
+        // PAGER CONTENT
+        HorizontalPager(
+            state = pagerState,
+            userScrollEnabled = false, // DISABLE touch dragging
+            modifier = Modifier.fillMaxSize()
+        ) { pageIndex ->
+            // Wrap every page in our logic helper
+            GlassPageWrapper(
+                isActivePage = (pagerState.currentPage == pageIndex),
+                isInteracting = isInteracting,
+                onStepOut = {
+                    // When user hits "Back" inside the page, we return to Pager mode
+                    isInteracting = false
+                    pagerFocus.requestFocus()
+                }
+            ) { pageFocus ->
+
+                // Pass the focus requester down to the actual screen
+                when (pageIndex) {
+                    0 -> NotificationsPage(pageFocus)
+                    1 -> DashboardPage(pageFocus)
+                    2 -> SettingsPage(pageFocus)
+                }
+            }
+        }
+
+        // VISUAL INDICATOR (The Dots)
+        // Hidden when interacting to reduce clutter? Or keep them?
+        // Let's dim them when interacting.
+        val dotAlpha = if (isInteracting) 0.3f else 1.0f
+        Row(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(bottom = 12.dp),
+            horizontalArrangement = Arrangement.Center
+        ) {
+            repeat(pageCount) { iteration ->
+                val color = if (pagerState.currentPage == iteration) Color.White else Color.DarkGray
+                Box(
+                    modifier = Modifier
+                        .padding(4.dp)
+                        .clip(CircleShape)
+                        .background(color.copy(alpha = dotAlpha))
+                        .size(8.dp)
+                )
+            }
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------------
+// 2. THE WRAPPER (Focus Management Logic)
+// ----------------------------------------------------------------------------------
+@Composable
+fun GlassPageWrapper(
+    isActivePage: Boolean,
+    isInteracting: Boolean,
+    onStepOut: () -> Unit,
+    content: @Composable (focusRequester: FocusRequester) -> Unit
+) {
+    // Each page gets its own requester for its internal content
+    val pageContentFocus = remember { FocusRequester() }
+
+    // If this is the active page AND interaction just turned on,
+    // force focus onto the content (buttons)
+    LaunchedEffect(isInteracting, isActivePage) {
+        if (isInteracting && isActivePage) {
+            pageContentFocus.requestFocus()
+        }
+    }
+
+    // Handle "Back" (Swipe Down) to Step Out
+    // Only enabled if we are currently interacting
+    BackHandler(enabled = isInteracting && isActivePage) {
+        onStepOut()
+    }
+
+    // Visual Cue: Green border when "Locked In"
+    val borderMod = if (isInteracting && isActivePage) {
+        Modifier.border(2.dp, Color.Green.copy(alpha = 0.5f), RoundedCornerShape(12.dp))
+    } else {
+        Modifier
+    }
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(8.dp) // Little padding for the border
+            .then(borderMod)
+    ) {
+        content(pageContentFocus)
+    }
+}
+
+// ----------------------------------------------------------------------------------
+// 3. SAMPLE SCREENS (AshBike Implementation)
+// ----------------------------------------------------------------------------------
+
+@Composable
+fun DashboardPage(focusRequester: FocusRequester) {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Text("DASHBOARD", color = Color.Gray, fontSize = 12.sp)
+        Text("GEAR", color = Color.White, fontSize = 20.sp)
+        Text("1", fontSize = 80.sp, color = Color.Green, fontWeight = FontWeight.Bold)
+
+        Spacer(modifier = Modifier.height(24.dp))
+
+        Row {
+            // GEAR DOWN
+            // IMPORTANT: The first focusable item needs the focusRequester!
+            Button(
+                onClick = { /* Logic */ },
+                modifier = Modifier
+                    .focusRequester(focusRequester) // <--- CRITICAL: Receive focus here
+            ) {
+                Text("-")
+            }
+
+            Spacer(modifier = Modifier.width(24.dp))
+
+            // GEAR UP
+            Button(onClick = { /* Logic */ }) {
+                Text("+")
+            }
+        }
+    }
+}
+
+@Composable
+fun NotificationsPage(focusRequester: FocusRequester) {
+    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+        // Even if a page has no buttons, it needs to accept focus to prevent crashing
+        // if the user accidentally "Steps In"
+        Button(
+            onClick = {},
+            modifier = Modifier.focusRequester(focusRequester)
+        ) {
+            Text("Clear All")
+        }
+    }
+}
+
+@Composable
+fun SettingsPage(focusRequester: FocusRequester) {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Text("SETTINGS", color = Color.Cyan)
+        Spacer(modifier = Modifier.height(16.dp))
+        Button(
+            onClick = {},
+            modifier = Modifier.focusRequester(focusRequester)
+        ) {
+            Text("Reset Ride")
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/nav/MainGlassNavigation.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/nav/MainGlassNavigation.kt
new file mode 100644
index 000000000..5dcf2f9ec
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/nav/MainGlassNavigation.kt
@@ -0,0 +1,206 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.nav
+
+import android.view.KeyEvent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+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.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.key.KeyEventType
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.input.key.type
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Text
+import kotlinx.coroutines.launch
+
+@Composable
+fun MainGlassNavigation(
+    modifier: Modifier = Modifier,
+    currentGear: Int,
+    onGearChange: (Int) -> Unit,
+    onOpenGearList: () -> Unit,
+    onClose: () -> Unit,
+    // repository: GlassBikeRepository,
+) {
+    val pageCount = 3
+    val pagerState = rememberPagerState(pageCount = { pageCount })
+    val coroutineScope = rememberCoroutineScope()
+    val haptics = LocalHapticFeedback.current
+
+    // FOCUS & STATE
+    val pagerFocus = remember { FocusRequester() }
+    var isInteracting by remember { mutableStateOf(false) }
+
+    // COLOR PALETTE BASED ON MODE
+    val modeColor = if (isInteracting) Color.Green else Color.DarkGray
+    val modeLabel = if (isInteracting) "CONTROL MODE" else "BROWSING MODE"
+
+    // DYNAMIC INSTRUCTIONS (Crucial for learning curve)
+    val hintText = if (isInteracting) {
+        "Swipe to Select • Tap to Click • Swipe Down to Exit"
+    } else {
+        "Swipe to Navigate • Tap to Control"
+    }
+
+    LaunchedEffect(Unit) { pagerFocus.requestFocus() }
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.Black)
+            // VISUAL: Add a border when Interacting so user knows they are locked in
+            .border(
+                width = if (isInteracting) 4.dp else 0.dp,
+                color = modeColor,
+                shape = RoundedCornerShape(16.dp)
+            )
+            .focusRequester(pagerFocus)
+            .focusable()
+            .onKeyEvent { event ->
+                // (Keep your existing Key Logic exactly the same)
+                if (isInteracting) return@onKeyEvent false
+                if (event.type == KeyEventType.KeyDown) {
+                    when (event.nativeKeyEvent.keyCode) {
+                        KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                            val next = (pagerState.currentPage + 1).coerceAtMost(pageCount - 1)
+                            if (next != pagerState.currentPage) {
+                                coroutineScope.launch { pagerState.animateScrollToPage(next) }
+                                haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                                return@onKeyEvent true
+                            }
+                        }
+                        KeyEvent.KEYCODE_DPAD_LEFT -> {
+                            val prev = (pagerState.currentPage - 1).coerceAtLeast(0)
+                            if (prev != pagerState.currentPage) {
+                                coroutineScope.launch { pagerState.animateScrollToPage(prev) }
+                                haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                                return@onKeyEvent true
+                            }
+                        }
+                        KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER -> {
+                            isInteracting = true
+                            haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                            return@onKeyEvent true
+                        }
+                    }
+                }
+                false
+            }
+    ) {
+        // --- CONTENT LAYER ---
+        HorizontalPager(
+            state = pagerState,
+            userScrollEnabled = false,
+            modifier = Modifier.fillMaxSize().padding(top = 40.dp) // Make room for Status Bar
+        ) { pageIndex ->
+            GlassPageWrapper(
+                isActivePage = (pagerState.currentPage == pageIndex),
+                isInteracting = isInteracting,
+                onStepOut = {
+                    isInteracting = false
+                    pagerFocus.requestFocus()
+                }
+            ) { pageFocus ->
+                when (pageIndex) {
+                    0 -> NotificationsPage(pageFocus)
+                    1 -> DashboardPage(pageFocus)
+                    2 -> SettingsPage(pageFocus)
+                }
+            }
+        }
+
+        // --- UI OVERLAY: STATUS BAR (Top) ---
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(40.dp)
+                .background(modeColor.copy(alpha = 0.2f)) // Subtle background tint
+                .padding(horizontal = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            // Left: Current Mode
+            Text(
+                text = modeLabel,
+                color = modeColor,
+                fontSize = 12.sp,
+                fontWeight = FontWeight.Bold
+            )
+
+            // Right: Helpful Hint
+            Text(
+                text = hintText,
+                color = Color.LightGray,
+                fontSize = 10.sp
+            )
+        }
+
+        // --- UI OVERLAY: PAGE DOTS (Bottom) ---
+        // Hide dots when interacting to reduce clutter
+        if (!isInteracting) {
+            Row(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .padding(bottom = 12.dp),
+                horizontalArrangement = Arrangement.Center
+            ) {
+                repeat(pageCount) { iteration ->
+                    val color = if (pagerState.currentPage == iteration) Color.White else Color.DarkGray
+                    Box(
+                        modifier = Modifier
+                            .padding(4.dp)
+                            .clip(CircleShape)
+                            .background(color)
+                            .size(8.dp)
+                    )
+                }
+            }
+        }
+    }
+}
+// --- Placeholder Composable for context ---
+@Composable
+fun DashboardPage() {
+    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+        androidx.compose.material3.Text("DASHBOARD", color = Color.Green)
+    }
+}
+@Composable
+fun NotificationsPage() {
+    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+        androidx.compose.material3.Text("NOTIFICATIONS", color = Color.Yellow)
+    }
+}
+@Composable
+fun SettingsPage() {
+    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+        androidx.compose.material3.Text("SETTINGS", color = Color.Cyan)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/RideStatsPanel.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/RideStatsPanel.kt
new file mode 100644
index 000000000..044bbce3e
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/RideStatsPanel.kt
@@ -0,0 +1,112 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.AvTimer
+import androidx.compose.material.icons.rounded.LocalFireDepartment
+import androidx.compose.material.icons.rounded.Speed
+import androidx.compose.material.icons.rounded.Straighten
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+
+@Composable
+fun RideStatsPanel(
+    distance: String,
+    duration: String,
+    avgSpeed: String,
+    calories: String,
+    modifier: Modifier = Modifier
+) {
+    Card(modifier = modifier) {
+        // CHANGED: Use Column instead of LazyColumn to avoid nested scrolling.
+        // The parent HomeContent handles the scroll now.
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(8.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            GlassListItem(Icons.Rounded.Straighten, "DISTANCE", "$distance km", GlimmerTheme.colors.secondary)
+            ListDivider()
+
+            GlassListItem(Icons.Rounded.AvTimer, "DURATION", duration, GlimmerTheme.colors.secondary)
+            ListDivider()
+
+            GlassListItem(Icons.Rounded.Speed, "AVG SPEED", "$avgSpeed mph", GlimmerTheme.colors.secondary)
+            ListDivider()
+
+            GlassListItem(Icons.Rounded.LocalFireDepartment, "CALORIES", calories, GlimmerTheme.colors.negative)
+        }
+    }
+}
+
+@Composable
+private fun GlassListItem(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    iconTint: Color
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(
+                color = Color.Transparent,
+                shape = RoundedCornerShape(8.dp)
+            )
+            .padding(vertical = 4.dp, horizontal = 4.dp)
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = iconTint,
+            modifier = Modifier.size(20.dp)
+        )
+
+        Spacer(modifier = Modifier.width(12.dp))
+
+        Column(verticalArrangement = Arrangement.Center) {
+            Text(
+                text = value,
+                style = GlimmerTheme.typography.bodyLarge,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+            Text(
+                text = label,
+                style = GlimmerTheme.typography.bodySmall,
+                maxLines = 1,
+                overflow = TextOverflow.Clip
+            )
+        }
+    }
+}
+
+@Composable
+private fun ListDivider() {
+    HorizontalDivider(
+        modifier = Modifier.padding(start = 36.dp, end = 8.dp),
+        thickness = 1.dp,
+        color = GlimmerTheme.colors.outlineVariant
+    )
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/SpeedPanel.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/SpeedPanel.kt
new file mode 100644
index 000000000..b2ff1f017
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/SpeedPanel.kt
@@ -0,0 +1,59 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Explore
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.telemetry.MetricDisplay
+
+@Composable
+fun SpeedPanel(speed: String, heading: String) {
+    // Allow card to wrap content height so text isn't cut off
+    Card(modifier = Modifier.fillMaxSize().wrapContentHeight()) {
+        Row(
+            modifier = Modifier.fillMaxSize()
+                .fillMaxWidth()
+                .padding(vertical = 16.dp), // Add breathing room
+            horizontalArrangement = Arrangement.SpaceAround,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            // Speed Value
+            MetricDisplay(
+                label = "SPEED",
+                value = speed,
+                highlightColor = GlimmerTheme.colors.primary,
+                bottomContent = {}
+            )
+
+            // Heading with Icon
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                Icon(
+                    imageVector = Icons.Rounded.Explore,
+                    contentDescription = null,
+                    modifier = Modifier.size(32.dp),
+                    // Use Secondary (Darker Blue) for Icons to distinguish from Text
+                    tint = GlimmerTheme.colors.secondary
+                )
+                Text(
+                    text = heading,
+                    style = GlimmerTheme.typography.titleMedium // Strict: Second-Largest Title
+                    // No Color set -> Defaults to Calculated White
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/GearControlPanel.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/GearControlPanel.kt
new file mode 100644
index 000000000..0409847b9
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/GearControlPanel.kt
@@ -0,0 +1,79 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.drafts
+
+// Glimmer Imports
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Button
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun GearControlPanel(
+    currentGear: Int,
+    onGearUp: () -> Unit,
+    onGearDown: () -> Unit,
+    focusRequester: FocusRequester
+) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Text(
+            text = "ACTIVE GEAR",
+            style = MaterialTheme.typography.labelSmall,
+            color = GlassColors.TextSecondary,
+            fontSize = 10.sp
+        )
+
+        Spacer(modifier = Modifier.height(4.dp))
+
+        // Big Gear Number
+        Text(
+            text = "$currentGear",
+            fontSize = 64.sp,
+            color = GlassColors.NeonGreen,
+            fontWeight = FontWeight.Black
+        )
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        // Control Buttons
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(24.dp)
+        ) {
+            // Down Button
+            // Note: We use a custom Modifier to make circular buttons look sharp
+            Button(
+                onClick = onGearDown,
+                modifier = Modifier
+                    .height(48.dp)
+                    .width(48.dp)
+            ) {
+                Text("-", fontSize = 24.sp, fontWeight = FontWeight.Bold)
+            }
+
+            // Up Button (Focused)
+            Button(
+                onClick = onGearUp,
+                modifier = Modifier
+                    .height(48.dp)
+                    .width(48.dp)
+                    .focusRequester(focusRequester) // Focus lands here
+            ) {
+                Text("+", fontSize = 24.sp, fontWeight = FontWeight.Bold)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatScrolList.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatScrolList.kt
new file mode 100644
index 000000000..70cf1a0dd
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatScrolList.kt
@@ -0,0 +1,75 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.drafts
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AvTimer
+import androidx.compose.material.icons.filled.LocalFireDepartment
+import androidx.compose.material.icons.filled.Speed
+import androidx.compose.material.icons.filled.Straighten
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.GlimmerTheme
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.common.GlassListItem
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.common.ListDividerScroll
+
+@Composable
+fun RideStatScrolList(
+    distance: String,
+    duration: String,
+    avgSpeed: String,
+    calories: String,
+    modifier: Modifier = Modifier
+) {
+    Card(modifier = modifier) {
+        // LAZY COLUMN: Enables scrolling
+        LazyColumn(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 4.dp), // Slight padding for focus ring
+            verticalArrangement = Arrangement.SpaceEvenly // Distribute nicely
+        ) {
+            item {
+                GlassListItem(
+                    Icons.Default.Straighten,
+                    "DISTANCE",
+                    "$distance km",
+                    GlimmerTheme.colors.secondary // Icon: Dark Blue
+                )
+                ListDividerScroll()
+            }
+            item {
+                GlassListItem(
+                    Icons.Default.AvTimer,
+                    "DURATION",
+                    duration,
+                    GlimmerTheme.colors.secondary
+                )
+                ListDividerScroll()
+            }
+            item {
+                GlassListItem(
+                    Icons.Default.Speed,
+                    "AVG SPEED",
+                    "$avgSpeed mph",
+                    GlimmerTheme.colors.secondary
+                )
+                ListDividerScroll()
+            }
+            item {
+                GlassListItem(
+                    Icons.Default.LocalFireDepartment,
+                    "CALORIES",
+                    calories,
+                    GlimmerTheme.colors.negative // Or custom Orange if strictly needed
+                )
+                // No divider on the last item usually
+            }
+        }
+    }
+}
+
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatsList.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatsList.kt
new file mode 100644
index 000000000..4a3c184e3
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatsList.kt
@@ -0,0 +1,136 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.drafts
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+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.material.icons.Icons
+import androidx.compose.material.icons.filled.AvTimer
+import androidx.compose.material.icons.filled.LocalFireDepartment
+import androidx.compose.material.icons.filled.Speed
+import androidx.compose.material.icons.filled.Straighten
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun RideStatsList(
+    distance: String,
+    duration: String,
+    avgSpeed: String,
+    calories: String,
+    modifier: Modifier = Modifier
+) {
+    Card(modifier = modifier) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 12.dp, vertical = 4.dp), // Tight padding for density
+            verticalArrangement = Arrangement.SpaceAround // Distribute evenly
+        ) {
+            // 1. Distance
+            GlassListItem(
+                icon = Icons.Default.Straighten,
+                label = "DISTANCE",
+                value = "$distance km",
+                iconTint = GlassColors.NeonCyan
+            )
+
+            HorizontalDivider()
+
+            // 2. Duration
+            GlassListItem(
+                icon = Icons.Default.AvTimer,
+                label = "DURATION",
+                value = duration,
+                iconTint = Color.White
+            )
+
+            HorizontalDivider()
+
+            // 3. Avg Speed
+            GlassListItem(
+                icon = Icons.Default.Speed,
+                label = "AVG SPEED",
+                value = "$avgSpeed mph",
+                iconTint = Color.White
+            )
+
+            HorizontalDivider()
+
+            // 4. Calories
+            GlassListItem(
+                icon = Icons.Default.LocalFireDepartment,
+                label = "CALORIES",
+                value = calories,
+                iconTint = Color(0xFFFF9800) // Orange
+            )
+        }
+    }
+}
+
+/**
+ * A specialized List Item for the Glass HUD.
+ * Follows the pattern: [Icon]  [Big Value]
+ * [Small Label]
+ */
+@Composable
+private fun GlassListItem(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    iconTint: Color
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth().height(36.dp) // Fixed height for consistency
+    ) {
+        // LEADING ICON
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = iconTint,
+            modifier = Modifier.size(20.dp)
+        )
+
+        Spacer(modifier = Modifier.width(12.dp))
+
+        // TEXT CONTENT (Value Top, Label Bottom)
+        Column(verticalArrangement = Arrangement.Center) {
+            // HEADLINE: The Value (Big & White)
+            Text(
+                text = value,
+                color = Color.White,
+                fontSize = 18.sp,
+                fontWeight = FontWeight.Bold,
+                maxLines = 1 // Prevent wrapping
+            )
+
+            // SUPPORTING: The Label (Small & Colored)
+            Text(
+                text = label,
+                color = GlassColors.TextSecondary,
+                style = MaterialTheme.typography.labelSmall,
+                fontSize = 8.sp,
+                fontWeight = FontWeight.Bold
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatsStack.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatsStack.kt
new file mode 100644
index 000000000..6f76f2fbd
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/panels/drafts/RideStatsStack.kt
@@ -0,0 +1,146 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.drafts
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AvTimer
+import androidx.compose.material.icons.filled.LocalFireDepartment
+import androidx.compose.material.icons.filled.Speed
+import androidx.compose.material.icons.filled.Straighten
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme.GlassColors
+
+@Composable
+fun RideStatsStack(
+    distance: String,
+    duration: String,
+    avgSpeed: String,
+    calories: String,
+    // We still pass the requester to focus the first card
+    stackFocusRequester: FocusRequester? = null,
+    modifier: Modifier = Modifier
+) {
+    // A Vertical Stack of Cards
+    LazyColumn(
+        modifier = modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.spacedBy(8.dp), // Gap between cards
+        contentPadding = PaddingValues(bottom = 8.dp)
+    ) {
+        // CARD 1: Distance
+        item {
+            StatCard(
+                icon = Icons.Default.Straighten,
+                label = "DISTANCE",
+                value = "$distance km",
+                iconTint = GlassColors.NeonCyan,
+                // Attach focus requester to the first card
+                modifier = if (stackFocusRequester != null) Modifier.focusRequester(stackFocusRequester) else Modifier
+            )
+        }
+
+        // CARD 2: Duration
+        item {
+            StatCard(
+                icon = Icons.Default.AvTimer,
+                label = "DURATION",
+                value = duration,
+                iconTint = Color.White
+            )
+        }
+
+        // CARD 3: Avg Speed
+        item {
+            StatCard(
+                icon = Icons.Default.Speed,
+                label = "AVG SPEED",
+                value = "$avgSpeed mph",
+                iconTint = Color.White
+            )
+        }
+
+        // CARD 4: Calories
+        item {
+            StatCard(
+                icon = Icons.Default.LocalFireDepartment,
+                label = "CALORIES",
+                value = calories,
+                iconTint = Color(0xFFFF9800) // Orange
+            )
+        }
+    }
+}
+
+/**
+ * A single Card in the Stack.
+ * Glimmer Cards are naturally focusable, so this works out of the box.
+ */
+@Composable
+private fun StatCard(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    iconTint: Color,
+    modifier: Modifier = Modifier
+) {
+    // We use a Glimmer Card for each item
+    Card(
+        modifier = modifier.fillMaxWidth(),
+        // onClick is required to make the card interactive/focusable on some XR devices
+        onClick = { /* No-op, just for focus */ }
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .padding(horizontal = 12.dp, vertical = 10.dp) // Internal padding
+        ) {
+            // ICON
+            Icon(
+                imageVector = icon,
+                contentDescription = null,
+                tint = iconTint,
+                modifier = Modifier.size(24.dp)
+            )
+
+            Spacer(modifier = Modifier.width(16.dp))
+
+            // TEXT STACK
+            Column {
+                Text(
+                    text = value,
+                    color = Color.White,
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.Bold
+                )
+                Text(
+                    text = label,
+                    color = GlassColors.TextSecondary,
+                    style = MaterialTheme.typography.labelSmall,
+                    fontSize = 10.sp,
+                    fontWeight = FontWeight.Bold
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeContent.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeContent.kt
new file mode 100644
index 000000000..de4602af2
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeContent.kt
@@ -0,0 +1,43 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.screens
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiState
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.RideStatsPanel
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.panels.SpeedPanel
+
+@Composable
+fun HomeContent(uiState: GlassUiState) {
+    // 1. MAIN SCROLLING CONTAINER
+    // This allows the Speed Card to grow as large as needed without clipping.
+    LazyColumn(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(top = 8.dp),
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        // --- SECTION 1: SPEED PANEL (40% Height) ---
+        item {
+            SpeedPanel(
+                speed = uiState.formattedSpeed,
+                heading = uiState.formattedHeading
+            )
+        }
+
+        // --- SECTION 2: STATS LIST (60% Height) ---
+        item {
+            RideStatsPanel(
+                distance = uiState.tripDistance,
+                duration = uiState.rideDuration,
+                avgSpeed = uiState.averageSpeed,
+                calories = uiState.calories,
+                modifier = Modifier.fillMaxSize()
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeHeader.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeHeader.kt
new file mode 100644
index 000000000..1d70497a8
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeHeader.kt
@@ -0,0 +1,81 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.screens
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+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.material.icons.Icons
+import androidx.compose.material.icons.rounded.Add
+import androidx.compose.material.icons.rounded.Remove
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Button
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Icon
+import androidx.xr.glimmer.Text
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiState
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.status.BatteryStatusDisplay
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.status.BikeConnectionStatus
+
+@Composable
+fun HomeHeader(
+    uiState: GlassUiState,
+    onGearUp: () -> Unit,
+    onGearDown: () -> Unit,
+    focusRequester: FocusRequester
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        if (uiState.isBikeConnected) {
+            // --- STATE A: CONNECTED (Gear Controls) ---
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = "GEAR ${uiState.currentGear}",
+                    color = GlimmerTheme.colors.positive, // Allowed: Green
+                    style = GlimmerTheme.typography.titleLarge
+                )
+                Spacer(Modifier.width(16.dp))
+                Button(onClick = onGearDown, modifier = Modifier.size(40.dp)) {
+                    Icon(Icons.Rounded.Remove, contentDescription = "Down")
+                }
+                Spacer(Modifier.width(8.dp))
+                Button(
+                    onClick = onGearUp,
+                    modifier = Modifier.size(40.dp).focusRequester(focusRequester)
+                ) {
+                    Icon(Icons.Rounded.Add, contentDescription = "Up")
+                }
+            }
+        } else {
+            // --- STATE B: DISCONNECTED (Brand Title) ---
+            Text(
+                text = "ASHBIKE",
+                color = GlimmerTheme.colors.primary,
+                style = GlimmerTheme.typography.titleLarge
+            )
+        }
+
+        Spacer(Modifier.weight(1f))
+
+        // --- STATUS COLUMN ---
+        Column(horizontalAlignment = Alignment.End) {
+            BikeConnectionStatus(isConnected = uiState.isBikeConnected)
+            Spacer(modifier = Modifier.height(4.dp))
+            BatteryStatusDisplay(
+                zone = uiState.batteryZone,
+                levelText = uiState.formattedBattery,
+                modifier = Modifier.padding(end = 8.dp)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeScreen.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeScreen.kt
new file mode 100644
index 000000000..360bf6d33
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/screens/HomeScreen.kt
@@ -0,0 +1,69 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.screens
+
+// Glimmer Imports
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.unit.dp
+import androidx.xr.glimmer.Button
+import androidx.xr.glimmer.Card
+import androidx.xr.glimmer.GlimmerTheme
+import androidx.xr.glimmer.Text
+import androidx.xr.glimmer.surface
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiEvent
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.GlassUiState
+
+@Composable
+fun HomeScreen(
+    modifier: Modifier = Modifier,
+    uiState: GlassUiState,
+    onEvent: (GlassUiEvent) -> Unit
+) {
+    // 1. Centralized Focus Management
+    val headerFocusRequester = remember { FocusRequester() }
+
+    Box(
+        modifier = modifier
+            .surface(focusable = false)
+            .fillMaxSize()
+            .background(GlimmerTheme.colors.surface),
+        contentAlignment = Alignment.Center
+    ) {
+        Card(
+            modifier = Modifier
+                .padding(8.dp)
+                .fillMaxSize(),
+            title = {
+                // --- COMPOSABLE 1: HEADER ---
+                HomeHeader(
+                    uiState = uiState,
+                    onGearUp = { onEvent(GlassUiEvent.GearUp) },
+                    onGearDown = { onEvent(GlassUiEvent.GearDown) },
+                    focusRequester = headerFocusRequester
+                )
+            },
+            action = {
+                Button(onClick = { onEvent(GlassUiEvent.CloseApp) }) {
+                    Text("EXIT", style = GlimmerTheme.typography.bodyMedium)
+                }
+            }
+        ) {
+            // --- COMPOSABLE 2: MAIN CONTENT (Vertical Stack) ---
+            HomeContent(uiState = uiState)
+
+            // Auto-focus logic stays here
+            LaunchedEffect(uiState.isBikeConnected) {
+                if (uiState.isBikeConnected) {
+                    headerFocusRequester.requestFocus()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/theme/GlassDeSign.kt b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/theme/GlassDeSign.kt
new file mode 100644
index 000000000..a9affe12e
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/java/com/ylabz/basepro/ashbike/mobile/features/glass/ui/theme/GlassDeSign.kt
@@ -0,0 +1,20 @@
+package com.ylabz.basepro.ashbike.mobile.features.glass.ui.theme
+
+// ... imports ...
+import androidx.compose.ui.graphics.Color
+
+// --- GLASS HUD DESIGN SYSTEM ---
+object GlassColors {
+    val NeonCyan = Color(0xFF00E5FF)   // Speed / Primary Data
+    val NeonGreen = Color(0xFF00FF00)  // Active State / Gear
+    val WarningRed = Color(0xFFFF1744) // Limits / Errors
+    val HudBackground = Color(0xFF121212).copy(alpha = 0.85f) // Dark semi-transparent
+    val TextPrimary = Color.White
+    val TextSecondary = Color(0xFFB0BEC5)
+
+    // ... existing ...
+    val ZoneEasy = Color(0xFF00E5FF)   // Blue (Warmup)
+    val ZoneAerobic = Color(0xFF00FF00) // Green (Fat Burn)
+    val ZoneThreshold = Color(0xFFFF9800) // Orange (Cardio)
+    val ZoneMax = Color(0xFFFF1744)    // Red (Peak)
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/drawable/ic_launcher_background.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..07d5da9cb
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/applications/ashbike/src/main/res/drawable/ic_launcher_foreground.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from applications/ashbike/src/main/res/drawable/ic_launcher_foreground.xml
rename to applications/ashbike/apps/mobile/features/glass/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-anydpi/ic_launcher.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-anydpi/ic_launcher_round.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-hdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..c209e78ec
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..b2dfe3d1b
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-mdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..4f0f1d64e
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..62b611da0
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xhdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..948a3070f
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..1b9a6956b
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..28d4b77f9
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9287f5083
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..aa7d6427e
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9126ae37c
Binary files /dev/null and b/applications/ashbike/apps/mobile/features/glass/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/values/strings.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/values/strings.xml
new file mode 100644
index 000000000..fad58380a
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/res/values/strings.xml
@@ -0,0 +1,34 @@
+<resources>
+    <string name="app_name">Glasses</string>
+    <string name="hello_ai_glasses">Hello, AI AshBike Glasses!</string>
+    <string name="launch_glass_mode">Start Glass Mode</string>
+    <string name="connection_status">Connection Status:</string>
+    <string name="launch">Launch</string>
+    <string name="status_prefix">Status:</string>
+    <string name="status_connected">Connected</string>
+    <string name="status_disconnected">Disconnected</string>
+    <string name="unsupported_android_version">This version of Android is not supported</string>
+    <string name="close">Close</string>
+    <string name="exit">EXIT</string>
+    <string name="power">POWER</string>
+    <string name="heart_rate">HEART RATE</string>
+    <string name="gear">GEAR %1$d</string>
+    <string name="distance">DISTANCE</string>
+    <string name="duration">DURATION</string>
+    <string name="avg_speed">AVG SPEED</string>
+    <string name="calories">CALORIES</string>
+    <string name="speed">SPEED</string>
+    <string name="connect_glasses">Connect Glasses</string>
+    <string name="start_projection">Start Projection</string>
+    <string name="projecting_active">Projecting Active</string>
+    <string name="distance_km">DISTANCE (KM)</string>
+    <string name="kcal">%1$s kcal</string>
+    <string name="dist">DIST</string>
+    <string name="time">TIME</string>
+    <string name="avg">AVG</string>
+    <string name="cal">CAL</string>
+    <string name="battery">Battery</string>
+    <string name="ble_cnx">BLE CNX</string>
+    <string name="no_ble_cnx">NO BLE CNX</string>
+    <string name="bike_connection">Bike Connection</string>
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/values/themes.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/values/themes.xml
new file mode 100644
index 000000000..937d1610f
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Glasses" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/xml/backup_rules.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/xml/backup_rules.xml
new file mode 100644
index 000000000..4df925582
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older than API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/main/res/xml/data_extraction_rules.xml b/applications/ashbike/apps/mobile/features/glass/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 000000000..9ee9997b0
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/features/glass/src/test/java/com/ylabz/basepro/ashbike/mobile/glass/ExampleUnitTest.kt b/applications/ashbike/apps/mobile/features/glass/src/test/java/com/ylabz/basepro/ashbike/mobile/glass/ExampleUnitTest.kt
new file mode 100644
index 000000000..598030ef3
--- /dev/null
+++ b/applications/ashbike/apps/mobile/features/glass/src/test/java/com/ylabz/basepro/ashbike/mobile/glass/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.ylabz.basepro.ashbike.mobile.glass
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/mobile/proguard-rules.pro b/applications/ashbike/apps/mobile/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/applications/ashbike/apps/mobile/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/applications/ashbike/src/androidTest/java/com/ylabz/basepro/applications/bike/ExampleInstrumentedTest.kt b/applications/ashbike/apps/mobile/src/androidTest/java/com/ylabz/basepro/applications/bike/ExampleInstrumentedTest.kt
similarity index 100%
rename from applications/ashbike/src/androidTest/java/com/ylabz/basepro/applications/bike/ExampleInstrumentedTest.kt
rename to applications/ashbike/apps/mobile/src/androidTest/java/com/ylabz/basepro/applications/bike/ExampleInstrumentedTest.kt
diff --git a/applications/ashbike/apps/mobile/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/connection/BikeSimulationReceiver.kt b/applications/ashbike/apps/mobile/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/connection/BikeSimulationReceiver.kt
new file mode 100644
index 000000000..2c8c5cc8d
--- /dev/null
+++ b/applications/ashbike/apps/mobile/src/debug/kotlin/com/ylabz/basepro/ashbike/mobile/connection/BikeSimulationReceiver.kt
@@ -0,0 +1,50 @@
+package com.ylabz.basepro.ashbike.mobile.connection
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.ylabz.basepro.core.data.repository.bike.BikeRepository
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * A Backdoor Receiver to drive the app via ADB.
+ * Command:
+ * adb shell am broadcast -a com.ylabz.ashbike.SIM_BIKE --ez connected true --ei battery 85
+ */
+@AndroidEntryPoint
+class BikeSimulationReceiver_not_used : BroadcastReceiver() {
+
+    @Inject lateinit var repository: BikeRepository
+
+    override fun onReceive(context: Context, intent: Intent) {
+        val scope = CoroutineScope(Dispatchers.IO)
+
+        when (intent.action) {
+            "com.ylabz.ashbike.SIM_BIKE" -> {
+                val isConnected = intent.getBooleanExtra("connected", false)
+                val battery = intent.getIntExtra("battery", 100)
+
+                scope.launch {
+                    // CRITICAL FIX:
+                    // 1. Get the CURRENT state (Preserve GPS Speed, Distance, etc.)
+                    val currentInfo = repository.rideInfo.value
+
+                    // 2. Only modify the E-Bike hardware fields
+                    repository.updateRideInfo(
+                        currentInfo.copy(
+                            isBikeConnected = isConnected,
+                            batteryLevel = if (isConnected) battery else null,
+                            motorPower = if (isConnected) 250f else 0f
+                            // We do NOT touch currentSpeed, distance, or duration here.
+                            // Those are kept from the running GPS service.
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/src/journeysTest/Journey.xml b/applications/ashbike/apps/mobile/src/journeysTest/Journey.xml
similarity index 100%
rename from applications/ashbike/src/journeysTest/Journey.xml
rename to applications/ashbike/apps/mobile/src/journeysTest/Journey.xml
diff --git a/applications/ashbike/src/journeysTest/ash_bike_journey.xml b/applications/ashbike/apps/mobile/src/journeysTest/ash_bike_journey.xml
similarity index 100%
rename from applications/ashbike/src/journeysTest/ash_bike_journey.xml
rename to applications/ashbike/apps/mobile/src/journeysTest/ash_bike_journey.xml
diff --git a/applications/ashbike/src/journeysTest/cafe_in_rides.xml b/applications/ashbike/apps/mobile/src/journeysTest/cafe_in_rides.xml
similarity index 100%
rename from applications/ashbike/src/journeysTest/cafe_in_rides.xml
rename to applications/ashbike/apps/mobile/src/journeysTest/cafe_in_rides.xml
diff --git a/applications/ashbike/src/journeysTest/find_nearby_cafes.xml b/applications/ashbike/apps/mobile/src/journeysTest/find_nearby_cafes.xml
similarity index 100%
rename from applications/ashbike/src/journeysTest/find_nearby_cafes.xml
rename to applications/ashbike/apps/mobile/src/journeysTest/find_nearby_cafes.xml
diff --git a/applications/ashbike/src/journeysTest/my_first_journey.xml b/applications/ashbike/apps/mobile/src/journeysTest/my_first_journey.xml
similarity index 100%
rename from applications/ashbike/src/journeysTest/my_first_journey.xml
rename to applications/ashbike/apps/mobile/src/journeysTest/my_first_journey.xml
diff --git a/applications/ashbike/src/journeysTest/test_speedometer_journey.xml b/applications/ashbike/apps/mobile/src/journeysTest/test_speedometer_journey.xml
similarity index 100%
rename from applications/ashbike/src/journeysTest/test_speedometer_journey.xml
rename to applications/ashbike/apps/mobile/src/journeysTest/test_speedometer_journey.xml
diff --git a/applications/ashbike/src/journeysTest/test_speedometer_journey2.xml b/applications/ashbike/apps/mobile/src/journeysTest/test_speedometer_journey2.xml
similarity index 100%
rename from applications/ashbike/src/journeysTest/test_speedometer_journey2.xml
rename to applications/ashbike/apps/mobile/src/journeysTest/test_speedometer_journey2.xml
diff --git a/applications/ashbike/src/main/AndroidManifest.xml b/applications/ashbike/apps/mobile/src/main/AndroidManifest.xml
similarity index 88%
rename from applications/ashbike/src/main/AndroidManifest.xml
rename to applications/ashbike/apps/mobile/src/main/AndroidManifest.xml
index f3f6a4139..e44c0a86d 100644
--- a/applications/ashbike/src/main/AndroidManifest.xml
+++ b/applications/ashbike/apps/mobile/src/main/AndroidManifest.xml
@@ -57,7 +57,6 @@
     <!-- =================================================================== -->
     <application
         android:name=".MyApplication"
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -69,7 +68,6 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.BasePro">
 
             <intent-filter>
@@ -90,12 +88,30 @@
 
         </activity>
 
+        <activity
+            android:name=".features.glass.GlassesMainActivity"
+            android:exported="true"
+            android:label="Glass Display"
+            android:requiredDisplayCategory="xr_projected">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <!-- CORRECTED: Service Declaration -->
         <service
             android:name="com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService"
             android:exported="false"
             android:foregroundServiceType="location" />
 
+
+        <!--receiver
+            android:name="com.ylabz.basepro.ashbike.mobile.connection.BikeSimulationReceiver"
+            android:exported="true"> <intent-filter>
+            <action android:name="com.ylabz.ashbike.SIM_BIKE" />
+        </intent-filter>
+        </receiver -->
+
         <!-- Google Maps API Key -->
         <!--meta-data
             android:name="com.google.android.geo.API_KEY"
diff --git a/applications/ashbike/src/main/ic_launcher-playstore.png b/applications/ashbike/apps/mobile/src/main/ic_launcher-playstore.png
similarity index 100%
rename from applications/ashbike/src/main/ic_launcher-playstore.png
rename to applications/ashbike/apps/mobile/src/main/ic_launcher-playstore.png
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/MainActivity.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/MainActivity.kt
similarity index 98%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/MainActivity.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/MainActivity.kt
index 0d8aa61ad..8f333ebea 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/MainActivity.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.applications.bike
+package com.ylabz.basepro.ashbike.mobile
 
 //import androidx.compose.ui.tooling.preview.Preview
 import android.Manifest
@@ -38,7 +38,7 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.rememberNavController
 import com.ylabz.basepro.applications.bike.features.settings.ui.SettingsViewModel
-import com.ylabz.basepro.applications.bike.ui.navigation.root.RootNavGraph
+import com.ylabz.basepro.ashbike.mobile.ui.navigation.root.RootNavGraph
 import com.ylabz.basepro.core.ui.theme.AshBikeTheme
 import dagger.hilt.android.AndroidEntryPoint
 
diff --git a/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/MyApplication.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/MyApplication.kt
new file mode 100644
index 000000000..06f8ee18a
--- /dev/null
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/MyApplication.kt
@@ -0,0 +1,34 @@
+package com.ylabz.basepro.ashbike.mobile
+
+import android.app.Application
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class MyApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        createNotificationChannels()
+    }
+
+    private fun createNotificationChannels() {
+        // Channel for Bike Ride Service
+        val bikeServiceChannelName = "Bike Ride Updates"
+        val bikeServiceChannelDescription = "Notifications for active bike rides"
+        val bikeServiceChannelImportance = NotificationManager.IMPORTANCE_LOW
+        val bikeServiceChannel = NotificationChannel(
+            BikeForegroundService.NOTIFICATION_CHANNEL_ID, // Using the constant from your service
+            bikeServiceChannelName,
+            bikeServiceChannelImportance
+        ).apply {
+            description = bikeServiceChannelDescription
+        }
+
+        val notificationManager: NotificationManager =
+            getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.createNotificationChannel(bikeServiceChannel)
+    }
+}
diff --git a/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/di/MobileSensorModule.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/di/MobileSensorModule.kt
new file mode 100644
index 000000000..d718dde67
--- /dev/null
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/di/MobileSensorModule.kt
@@ -0,0 +1,18 @@
+package com.ylabz.basepro.ashbike.mobile.di
+
+import com.ylabz.basepro.core.data.repository.sensor.heart.BleHeartRateRepository
+import com.ylabz.basepro.core.data.repository.sensor.heart.HeartRateRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class MobileSensorModule {
+
+    @Binds
+    abstract fun bindHeartRateRepository(
+        impl: BleHeartRateRepository
+    ): HeartRateRepository
+}
\ No newline at end of file
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/Nav3Info.md b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/Nav3Info.md
similarity index 100%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/Nav3Info.md
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/Nav3Info.md
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/READMENAV3.md b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/READMENAV3.md
similarity index 100%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/READMENAV3.md
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/READMENAV3.md
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/RoadMap.md b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/RoadMap.md
similarity index 100%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/RoadMap.md
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/RoadMap.md
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/Steps.md b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/Steps.md
similarity index 100%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/Steps.md
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/Steps.md
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/AshBikeTabRoutes.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/AshBikeTabRoutes.kt
similarity index 74%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/AshBikeTabRoutes.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/AshBikeTabRoutes.kt
index 87daa0fa4..69edbdd63 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/AshBikeTabRoutes.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/AshBikeTabRoutes.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.graphs
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.graphs
 object AshBikeTabRoutes {
     const val HOME_ROOT = "ash_bike_tab_home_root"
     const val TRIPS_ROOT = "ash_bike_tab_trips_root"
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/BikeNav3Display.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/BikeNav3Display.kt
similarity index 98%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/BikeNav3Display.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/BikeNav3Display.kt
index 5efa7f52d..272532b2a 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/BikeNav3Display.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/BikeNav3Display.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.graphs
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.graphs
 
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/BikeNav3Routes.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/BikeNav3Routes.kt
similarity index 76%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/BikeNav3Routes.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/BikeNav3Routes.kt
index 57ba1e8b1..37125e6b9 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/BikeNav3Routes.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/BikeNav3Routes.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.graphs
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.graphs
 
 // These are your NavKeys for the NavDisplay system
 
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/bikeNavGraph.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/bikeNavGraph.kt
similarity index 96%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/bikeNavGraph.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/bikeNavGraph.kt
index 06fd6e805..f0a0bc037 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/bikeNavGraph.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/bikeNavGraph.kt
@@ -1,5 +1,6 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.graphs
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.graphs
 
+import android.Manifest
 import androidx.annotation.RequiresPermission
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.collectAsState
@@ -28,7 +29,7 @@ import com.ylabz.basepro.feature.places.ui.CoffeeShopUIState
 import com.ylabz.basepro.feature.places.ui.CoffeeShopViewModel
 
 // Define BikeNavGraph as an extension function on NavGraphBuilder
-@RequiresPermission(allOf = [android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION])
+@RequiresPermission(allOf = [Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION])
 fun NavGraphBuilder.bikeNavGraph(
     modifier: Modifier = Modifier,
     navHostController: NavHostController,
@@ -55,7 +56,7 @@ fun NavGraphBuilder.bikeNavGraph(
                         }
                     }
                 },
-                viewModel = bikeViewModel
+                viewModel = bikeViewModel,
             )
         }
         // Add other destinations specific to the Home tab inside this navigation block if needed
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/flow.md b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/flow.md
similarity index 100%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/graphs/flow.md
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/graphs/flow.md
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/HomeBottomBar.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/HomeBottomBar.kt
similarity index 93%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/HomeBottomBar.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/HomeBottomBar.kt
index b1ff82121..87867975f 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/HomeBottomBar.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/HomeBottomBar.kt
@@ -1,6 +1,7 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.main
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.main
 
-import android.util.Log
+// import androidx.compose.material3.NavigationBarItemDefaults // No longer needed for custom colors
+// import androidx.compose.ui.graphics.Color // No longer needed for custom colors
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.List
 import androidx.compose.material.icons.automirrored.twotone.List
@@ -11,22 +12,19 @@ import androidx.compose.material.icons.twotone.Settings
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
-// import androidx.compose.material3.NavigationBarItemDefaults // No longer needed for custom colors
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-// import androidx.compose.ui.graphics.Color // No longer needed for custom colors
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.ylabz.basepro.applications.bike.R
-import com.ylabz.basepro.applications.bike.ui.navigation.graphs.AshBikeTabRoutes
+import com.ylabz.basepro.ashbike.mobile.ui.navigation.graphs.AshBikeTabRoutes
+import com.ylabz.basepro.ashbike.mobile.R
 import com.ylabz.basepro.core.ui.R as CoreUiR
 
 private data class TabInfo(
@@ -88,9 +86,7 @@ fun HomeBottomBar(
             finalIndex
         }
 
-    NavigationBar(
-        // contentColor = MaterialTheme.colorScheme.primary // This is for the content of the NavigationBar itself, not items usually
-    ) {
+    NavigationBar {
         tabs.forEachIndexed { index, tabInfo ->
             val displayTitle = stringResource(id = tabInfo.titleResId)
             val isSelected = selectedItemIndex == index
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/MainScreen.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/MainScreen.kt
similarity index 84%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/MainScreen.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/MainScreen.kt
index cad525e3a..664cf3a24 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/MainScreen.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/MainScreen.kt
@@ -1,9 +1,10 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.main
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.main
 
 //import androidx.compose.ui.tooling.preview.Preview
+// import androidx.compose.ui.graphics.vector.ImageVector // No longer directly used here
 import android.Manifest
 import android.content.pm.PackageManager
-import android.util.Log // Added import
+import android.util.Log
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
@@ -13,7 +14,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -22,20 +22,18 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-// import androidx.compose.ui.graphics.vector.ImageVector // No longer directly used here
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.ylabz.basepro.applications.bike.features.main.ui.BikeViewModel
 import com.ylabz.basepro.applications.bike.features.settings.ui.SettingsUiState
 import com.ylabz.basepro.applications.bike.features.settings.ui.SettingsViewModel
-import com.ylabz.basepro.applications.bike.ui.navigation.graphs.AshBikeTabRoutes
-import com.ylabz.basepro.applications.bike.ui.navigation.graphs.bikeNavGraph
+import com.ylabz.basepro.ashbike.mobile.ui.navigation.graphs.AshBikeTabRoutes
+import com.ylabz.basepro.ashbike.mobile.ui.navigation.graphs.bikeNavGraph
 
 // The @RequiresPermission annotation can be helpful for static analysis
 // but the runtime check is the most crucial part.
@@ -59,28 +57,12 @@ fun MainScreen(
     }
 
     // --- Service Binding Logic ---
+    // --- SHARED BIKE VIEWMODEL ---
+    // We instantiate it here to scope it to the MainScreen (so it survives tab changes).
+    // The actual Service Binding is now handled inside BikeUiRoute, so we don't need
+    // to bind/unbind here anymore.
     val bikeViewModel: BikeViewModel = hiltViewModel() // Instance for MainScreen and its children
-    val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current
-
-    DisposableEffect(lifecycleOwner, bikeViewModel) { // Added bikeViewModel as a key
-        val observer = LifecycleEventObserver { _, event ->
-            when (event) {
-                Lifecycle.Event.ON_START -> {
-                    bikeViewModel.bindToService(context)
-                }
-
-                Lifecycle.Event.ON_STOP -> {
-                    bikeViewModel.unbindFromService(context)
-                }
-
-                else -> {}
-            }
-        }
-        lifecycleOwner.lifecycle.addObserver(observer)
-        onDispose {
-            lifecycleOwner.lifecycle.removeObserver(observer)
-        }
-    }
+    LocalLifecycleOwner.current
 
     val locationPermissions = arrayOf(
         Manifest.permission.ACCESS_FINE_LOCATION,
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/MainScreenViewModel.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/MainScreenViewModel.kt
similarity index 82%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/MainScreenViewModel.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/MainScreenViewModel.kt
index 774255677..ef62200ad 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/MainScreenViewModel.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/MainScreenViewModel.kt
@@ -1,9 +1,9 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.main
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.main
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 // Import the use case from its new package
-import com.ylabz.basepro.applications.bike.ui.navigation.main.usecase.GetUnsyncedRidesCountUseCase
+import com.ylabz.basepro.ashbike.mobile.ui.navigation.main.usecase.GetUnsyncedRidesCountUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/TopBarForCurrentRoute.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/TopBarForCurrentRoute.kt
similarity index 96%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/TopBarForCurrentRoute.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/TopBarForCurrentRoute.kt
index 5d22d9c59..d3c970cc3 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/TopBarForCurrentRoute.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/TopBarForCurrentRoute.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.main
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.main
 
 // import androidx.compose.material.icons.filled.ArrowBack // Keep one, automirrored is usually better
 import androidx.compose.material.icons.Icons
@@ -13,7 +13,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.ylabz.basepro.applications.bike.R
+import com.ylabz.basepro.ashbike.mobile.R
 import com.ylabz.basepro.core.ui.BikeScreen
 import com.ylabz.basepro.core.ui.R as CoreUiR
 
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/usecase/GetUnsyncedRidesCountUseCase.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/usecase/GetUnsyncedRidesCountUseCase.kt
similarity index 89%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/usecase/GetUnsyncedRidesCountUseCase.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/usecase/GetUnsyncedRidesCountUseCase.kt
index 1035080ab..a45e7a477 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/main/usecase/GetUnsyncedRidesCountUseCase.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/main/usecase/GetUnsyncedRidesCountUseCase.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.main.usecase
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.main.usecase
 
 import com.ylabz.basepro.applications.bike.database.BikeRideRepo
 import kotlinx.coroutines.flow.Flow
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/navigation3_cheatsheet.pdf b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/navigation3_cheatsheet.pdf
similarity index 100%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/navigation3_cheatsheet.pdf
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/navigation3_cheatsheet.pdf
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/navigation3_diagram.png b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/navigation3_diagram.png
similarity index 100%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/navigation3_diagram.png
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/navigation3_diagram.png
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/root/RootGraph.kt b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/root/RootGraph.kt
similarity index 76%
rename from applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/root/RootGraph.kt
rename to applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/root/RootGraph.kt
index d0a882eac..87384e919 100644
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/ui/navigation/root/RootGraph.kt
+++ b/applications/ashbike/apps/mobile/src/main/java/com/ylabz/basepro/ashbike/mobile/ui/navigation/root/RootGraph.kt
@@ -1,8 +1,8 @@
-package com.ylabz.basepro.applications.bike.ui.navigation.root
+package com.ylabz.basepro.ashbike.mobile.ui.navigation.root
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
-import com.ylabz.basepro.applications.bike.ui.navigation.main.MainScreen
+import com.ylabz.basepro.ashbike.mobile.ui.navigation.main.MainScreen
 
 
 @Composable
diff --git a/applications/ashbike/src/main/res/drawable/ic_launcher_background.xml b/applications/ashbike/apps/mobile/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from applications/ashbike/src/main/res/drawable/ic_launcher_background.xml
rename to applications/ashbike/apps/mobile/src/main/res/drawable/ic_launcher_background.xml
diff --git a/applications/ashbike/apps/mobile/src/main/res/drawable/ic_launcher_foreground.xml b/applications/ashbike/apps/mobile/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..2b068d114
--- /dev/null
+++ b/applications/ashbike/apps/mobile/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/applications/ashbike/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/applications/ashbike/apps/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/applications/ashbike/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/applications/ashbike/apps/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/applications/ashbike/src/main/res/mipmap-hdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/applications/ashbike/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
diff --git a/applications/ashbike/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/applications/ashbike/src/main/res/mipmap-mdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/applications/ashbike/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
diff --git a/applications/ashbike/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xhdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
diff --git a/applications/ashbike/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from applications/ashbike/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to applications/ashbike/apps/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/applications/ashbike/src/main/res/values-de/strings.xml b/applications/ashbike/apps/mobile/src/main/res/values-de/strings.xml
similarity index 100%
rename from applications/ashbike/src/main/res/values-de/strings.xml
rename to applications/ashbike/apps/mobile/src/main/res/values-de/strings.xml
diff --git a/applications/ashbike/src/main/res/values-es/strings.xml b/applications/ashbike/apps/mobile/src/main/res/values-es/strings.xml
similarity index 100%
rename from applications/ashbike/src/main/res/values-es/strings.xml
rename to applications/ashbike/apps/mobile/src/main/res/values-es/strings.xml
diff --git a/applications/ashbike/src/main/res/values-fr/strings.xml b/applications/ashbike/apps/mobile/src/main/res/values-fr/strings.xml
similarity index 100%
rename from applications/ashbike/src/main/res/values-fr/strings.xml
rename to applications/ashbike/apps/mobile/src/main/res/values-fr/strings.xml
diff --git a/applications/ashbike/src/main/res/values/strings.xml b/applications/ashbike/apps/mobile/src/main/res/values/strings.xml
similarity index 100%
rename from applications/ashbike/src/main/res/values/strings.xml
rename to applications/ashbike/apps/mobile/src/main/res/values/strings.xml
diff --git a/applications/ashbike/src/main/res/values/themes.xml b/applications/ashbike/apps/mobile/src/main/res/values/themes.xml
similarity index 100%
rename from applications/ashbike/src/main/res/values/themes.xml
rename to applications/ashbike/apps/mobile/src/main/res/values/themes.xml
diff --git a/applications/ashbike/src/test/java/com/ylabz/basepro/applications/bike/ExampleUnitTest.kt b/applications/ashbike/apps/mobile/src/test/java/com/ylabz/basepro/applications/bike/ExampleUnitTest.kt
similarity index 100%
rename from applications/ashbike/src/test/java/com/ylabz/basepro/applications/bike/ExampleUnitTest.kt
rename to applications/ashbike/apps/mobile/src/test/java/com/ylabz/basepro/applications/bike/ExampleUnitTest.kt
diff --git a/applications/ashbike/apps/wear/.gitignore b/applications/ashbike/apps/wear/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/applications/ashbike/apps/wear/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/README.md b/applications/ashbike/apps/wear/README.md
new file mode 100644
index 000000000..b9483200c
--- /dev/null
+++ b/applications/ashbike/apps/wear/README.md
@@ -0,0 +1,136 @@
+# AshBike: Advanced Cycling Computer (Wear OS, Mobile & XR)
+
+AshBike is a multi-platform cycling telemetry application designed for Android Phone, Wear OS, and XR Glasses. It tracks speed, distance, heart rate, and GPS location in real-time.
+
+## 🏗 Architecture Overview
+
+The project follows **Modern Android Development (MAD)** principles, utilizing a **Single Source of Truth** architecture. 
+
+The core business logic, sensor fusion, and GPS tracking are decoupled from the UI, allowing the **Phone** and **Watch** apps to run independent instances of the same logic engine.
+
+### Module Dependency Graph
+
+```mermaid
+graph TD
+    WearApp[apps:wear] --> FeatureMain[features:main]
+    MobileApp[apps:mobile] --> FeatureMain
+    FeatureMain --> CoreData[core:data]
+    FeatureMain --> CoreModel[core:model]
+    CoreData --> CoreDatabase[core:database]
+
+```
+
+* **`features:main`**: Contains the "Brains" of the operation (`BikeForegroundService`, `BikeServiceManager`, repositories).
+* **`apps:wear`**: A "Thin Client" UI built with Wear Compose that binds to the shared logic.
+* **`apps:mobile`**: The Phone UI implementation.
+
+---
+
+## ⌚ Wear OS Implementation (Standalone)
+
+The Wear OS app is designed to be **Standalone**. It does not require the phone to be connected to track a ride. It uses the Watch's internal GPS and sensors.
+
+### Key Components
+
+1. **`WearBikeScreen` (Compose UI)**
+* Pure UI layer. Observes `StateFlow` from the ViewModel.
+* Displays Speed, Distance, Heart Rate, and Time.
+
+
+2. **`WearBikeViewModel` (Hilt)**
+* Injects `BikeServiceManager`.
+* Exposes a clean `BikeRideInfo` state to the UI.
+* Handles UI commands (Start/Stop ride).
+
+
+3. **`BikeServiceManager` (Shared Logic)**
+* Orchestrates the connection to the background service.
+* Handles Binding/Unbinding lifecycle automatically.
+
+
+4. **`BikeForegroundService` (The Engine)**
+* Runs as a **Foreground Service** with `location|health` types.
+* Collects GPS via `FusedLocationProvider`.
+* Calculates physics (Speed, Distance, Calories).
+* **Crucial:** Promotes itself to the foreground immediately on creation to satisfy Android 14/15 strict background restrictions.
+
+
+
+---
+
+## 🚀 Getting Started
+
+### Prerequisites
+
+* Android Studio Ladybug or newer.
+* JDK 17 or 21.
+* Wear OS 4/5 Emulator (API 33+).
+
+### Running the Wear App
+
+1. Select the **`applications.ashbike.apps.wear`** configuration in Android Studio.
+2. Deploy to a Wear OS Emulator or Physical Device.
+3. **Permissions:** On first launch, grant **Location** (While using) and **Body Sensor** permissions.
+
+### 🐛 Debugging GPS on Emulator
+
+Wear OS emulators **do not** simulate movement by default. If you see `0.0 km/h`:
+
+1. Open Emulator Extended Controls (three dots `...`).
+2. Select **Location**.
+3. Load a GPX/KML file (Found in `applications/ashbike/docs/actions/emulator_route.gpx`).
+4. **Press Play** ▶️. The speed will only update when the emulator location moves.
+
+---
+
+## 🛠 Tech Stack
+
+* **Language:** Kotlin
+* **UI:** Jetpack Compose (Mobile & Wear)
+* **DI:** Hilt (Dagger)
+* **Async:** Coroutines & Flow
+* **Architecture:** MVVM (Model-View-ViewModel)
+* **Services:** Android Foreground Services (Location/Health)
+* **Sensors:** FusedLocationProviderClient, Health Services API
+
+---
+
+## ⚠️ Important Implementation Details
+
+### Android 14+ (API 34/35) Compliance
+
+Wear OS 5 imposes strict restrictions on background services.
+
+* **Manifest:** The service must declare `android:foregroundServiceType="location|health"`.
+* **Runtime:** The service must call `startForeground()` within milliseconds of creation. Do not wait for a GPS fix to start the foreground notification, or the OS will crash the app with a `ForegroundServiceStartNotAllowedException`.
+
+### Service Logic
+
+The logic resides in `features/main/.../BikeForegroundService.kt`.
+
+* **Phone:** Starts an instance using Phone hardware.
+* **Watch:** Starts a *separate* instance using Watch hardware.
+
+---
+
+## 📂 File Structure Highlights
+
+```text
+applications/ashbike/
+├── apps/
+│   ├── wear/               # Wear OS Specific Code
+│   │   ├── src/main/AndroidManifest.xml  <-- Declares Services & Permissions
+│   │   ├── presentation/   # UI Layer (Compose)
+│   │   ├── service/        # Wear-specific Service Wrapper
+│   │   └── tile/           # Wear OS Tiles
+│   └── mobile/             # Phone App
+├── features/
+│   └── main/               # SHARED LOGIC (Service, Manager, UseCases)
+└── docs/                   # GPX files for simulation
+
+```
+
+## 🤝 Contribution
+
+1. **UI Changes:** Modify `WearBikeScreen.kt`. Use `@Preview` to verify layouts on round screens.
+2. **Logic Changes:** Modify `BikeForegroundService.kt` in the `features:main` module. **Note:** This affects both Phone and Watch apps.
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/build.gradle.kts b/applications/ashbike/apps/wear/build.gradle.kts
new file mode 100644
index 000000000..317a1e677
--- /dev/null
+++ b/applications/ashbike/apps/wear/build.gradle.kts
@@ -0,0 +1,103 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+    // Add Hilt and KSP
+    alias(libs.plugins.hilt.gradle)
+    alias(libs.plugins.ksp)
+}
+
+android {
+    namespace = "com.ylabz.basepro.ashbike.wear"
+    compileSdk = libs.versions.compileSdk.get().toInt() // Match your mobile sdk version
+
+    defaultConfig {
+        applicationId = "com.ylabz.basepro.ashbike.wear"
+        minSdk = 35 // Health Services requires Min SDK 30
+        targetSdk = libs.versions.targetSdk.get().toInt()
+        versionCode = 1
+        versionName = "1.0"
+
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    // REPLACE kotlinOptions with the Toolchain block
+    kotlin {
+        jvmToolchain(21)
+    }
+
+    useLibrary("wear-sdk")
+    buildFeatures {
+        compose = true
+    }
+}
+
+dependencies {
+    // 1. Core Modules - Share logic with Mobile!
+    implementation(project(":core:model"))
+    implementation(project(":core:data"))
+    implementation(project(":core:util"))
+    implementation(project(":applications:ashbike:features:main"))
+    implementation(project(":applications:ashbike:database")) // Optional: for local DB
+
+
+
+    // 2. Hilt (Dependency Injection)
+    implementation(libs.hilt.android)
+    implementation(libs.hilt.navigation.compose)
+    ksp(libs.hilt.android.compiler)
+
+    // 3. Health Services (The MAD way to track rides on Wear)
+    // Health Services (The MAD way to track rides)
+    implementation(libs.androidx.health.services.client)
+    implementation(libs.androidx.material.icons.extended)
+
+    // Ongoing Activity (The icon at the bottom of the watch face)
+    implementation(libs.androidx.wear.ongoing)
+
+    // Lifecycle Service (Required for the service to bind to lifecycle)
+    implementation(libs.androidx.lifecycle.service)
+    implementation(libs.androidx.wear.compose.navigation)
+
+    // 4. Standard Wear OS & Compose UI
+    implementation(libs.google.play.services.wearable)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.wear.compose.material3)
+    implementation(libs.androidx.wear.compose.foundation)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.core.splashscreen)
+
+    // Room
+    implementation(libs.room.runtime)
+    implementation(libs.room.ktx)
+    ksp(libs.room.compiler)
+
+    // Permission
+    implementation(libs.google.accompanist.permissions)
+
+
+    // 5. Horologist (Google's best practices library for Wear)
+    implementation(libs.horologist.compose.tools)
+    implementation(libs.horologist.tiles)
+    implementation(libs.androidx.watchface.complications.data.source.ktx)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+    debugImplementation(libs.androidx.tiles.tooling)
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/docs/FILESTRUCT.md b/applications/ashbike/apps/wear/docs/FILESTRUCT.md
new file mode 100644
index 000000000..7b7a33b31
--- /dev/null
+++ b/applications/ashbike/apps/wear/docs/FILESTRUCT.md
@@ -0,0 +1,21 @@
+com.ylabz.basepro.ashbike.wear
+├── app
+│   └── BaseProWearApp.kt          <-- (NEW) Hilt Application Entry Point
+├── di
+│   └── WearModule.kt              <-- (NEW) Hilt Module for Wear-specific dependencies
+├── presentation
+│   ├── MainActivity.kt            <-- @AndroidEntryPoint
+│   ├── WearApp.kt                 <-- Root Composable (NavHost)
+│   ├── theme/                     <-- Type, Color, Theme
+│   ├── components/                <-- Shared Wear Composables (Chip, Button)
+│   └── screens
+│       └── ride
+│           ├── WearBikeScreen.kt
+│           └── WearBikeViewModel.kt <-- @HiltViewModel (Moves logic out of UI)
+├── service
+│   ├── ExerciseService.kt         <-- @AndroidEntryPoint (Your Foreground Service)
+│   └── SensorHelpers.kt
+├── tile
+│   └── MainTileService.kt         <-- @AndroidEntryPoint
+└── complication
+└── MainComplicationService.kt <-- @AndroidEntryPoint
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/lint.xml b/applications/ashbike/apps/wear/lint.xml
new file mode 100644
index 000000000..44fac75b8
--- /dev/null
+++ b/applications/ashbike/apps/wear/lint.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- Ignore the IconLocation for the Tile preview images -->
+    <issue id="IconLocation">
+        <ignore path="res/drawable/tile_preview.png" />
+        <ignore path="res/drawable-round/tile_preview.png" />
+    </issue>
+</lint>
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/proguard-rules.pro b/applications/ashbike/apps/wear/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/applications/ashbike/apps/wear/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/debug/kotlin/com/ylabz/basepro/ashbike/wear/presentation/WearBikeScreenPreview.kt b/applications/ashbike/apps/wear/src/debug/kotlin/com/ylabz/basepro/ashbike/wear/presentation/WearBikeScreenPreview.kt
new file mode 100644
index 000000000..b64a1e45e
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/debug/kotlin/com/ylabz/basepro/ashbike/wear/presentation/WearBikeScreenPreview.kt
@@ -0,0 +1,84 @@
+package com.ylabz.basepro.ashbike.wear.presentation
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.wear.compose.material3.MaterialTheme
+import com.ylabz.basepro.ashbike.wear.presentation.screens.ride.BikeControlContent
+import com.ylabz.basepro.ashbike.wear.presentation.screens.ride.WearBikeUiState
+import com.ylabz.basepro.ashbike.wear.presentation.theme.BaseProTheme
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+
+@Preview(
+    device = "id:wearos_small_round",
+    showSystemUi = true,
+    name = "Active Ride - Fast",
+)
+@Preview(
+    device = "id:wearos_large_round",
+    showSystemUi = true,
+    name = "Active Ride - Slow"
+)
+@Preview(
+    device = "id:wearos_xl_round",
+    showSystemUi = true,
+    name = "Active Ride - XL"
+)
+@Composable
+fun WearBikeScreenPreview() {
+    // 1. Create the Mock Data
+    val mockRideInfo = BikeRideInfo.initial().copy(
+        heartbeat = 145,
+        currentSpeed = 25.0,
+        currentTripDistance = 12.5F, // Note: usually Double in model
+        caloriesBurned = 450,
+        rideDuration = "45:30",
+        // isBikeConnected = true // (If this field exists in your model)
+    )
+
+    // 2. Wrap it in the UI State
+    val mockUiState = WearBikeUiState(
+        rideInfo = mockRideInfo,
+        // Set state to Riding so the "Stop" button appears (simulating isRecording=true)
+        // rideState = RideState.Riding,
+        isServiceBound = true
+    )
+
+    BaseProTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.background),
+            contentAlignment = Alignment.Center
+        ) {
+            // 3. Use the new signature
+            BikeControlContent(
+                uiState = mockUiState,
+                onEvent = {} // Empty lambda for preview
+            )
+        }
+    }
+}
+
+@Preview(
+    device = "id:wearos_large_round",
+    showSystemUi = true,
+    name = "Permission State",
+)
+@Composable
+fun PermissionStatePreview() {
+    BaseProTheme {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.background),
+            contentAlignment = Alignment.Center
+        ) {
+            PermissionRationaleContent(onRequestPermission = {})
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/AndroidManifest.xml b/applications/ashbike/apps/wear/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..49b28ca2e
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/AndroidManifest.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-feature android:name="android.hardware.type.watch" />
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_HEALTH" />
+    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.BODY_SENSORS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+
+    <application
+        android:name=".app.WearApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.DeviceDefault">
+
+        <service
+            android:name=".complication.AshBikeComplicationService"
+            android:icon="@mipmap/ic_launcher"
+            android:label="AshBike Shortcut"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT,LONG_TEXT,SMALL_IMAGE" />
+
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="0" />
+        </service>
+
+        <service
+            android:name=".tile.AshBikeTileService"
+            android:exported="true"
+            android:label="@string/tile_label"
+            android:permission="com.google.android.wearable.permission.BIND_TILE_PROVIDER">
+            <intent-filter>
+                <action android:name="androidx.wear.tiles.action.BIND_TILE_PROVIDER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="androidx.wear.tiles.PREVIEW"
+                android:resource="@drawable/tile_preview" />
+        </service>
+
+
+        <service
+            android:name="com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="location|health" />
+
+        <!-- service
+            android:name=".service.BikeWearService"
+            android:exported="false" /-->
+
+        <uses-library
+            android:name="com.google.android.wearable"
+            android:required="true" />
+        <uses-library
+            android:name="wear-sdk"
+            android:required="false" />
+        <!--
+               Set to true if your app is Standalone, that is, it does not require the handheld
+               app to run.
+        -->
+        <meta-data
+            android:name="com.google.android.wearable.standalone"
+            android:value="true" />
+
+        <activity
+            android:name=".presentation.MainActivity"
+            android:exported="true"
+            android:taskAffinity=""
+            android:theme="@style/MainActivityTheme.Starting">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/app/AshBikeApp.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/app/AshBikeApp.kt
new file mode 100644
index 000000000..f2a09a554
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/app/AshBikeApp.kt
@@ -0,0 +1,64 @@
+package com.ylabz.basepro.ashbike.wear.app
+
+import androidx.compose.runtime.Composable
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.wear.compose.material3.AppScaffold
+import androidx.wear.compose.navigation.SwipeDismissableNavHost
+import androidx.wear.compose.navigation.composable
+import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
+import com.ylabz.basepro.ashbike.wear.presentation.screens.history.RideDetailScreen
+import com.ylabz.basepro.ashbike.wear.presentation.screens.ride.WearBikeScreen
+import com.ylabz.basepro.ashbike.wear.presentation.screens.ride.WearBikeViewModel
+
+// 1. Root App Component
+@Composable
+fun AshBikeApp(
+    viewModel: WearBikeViewModel = hiltViewModel() // <--- Hilt automatically provides this
+) {
+    val navController = rememberSwipeDismissableNavController()
+
+    // AppScaffold is the root container for M3 Wear apps
+    // Handles the clock (TimeText) so it stays put while you swipe pages below it.
+    AppScaffold {
+        // 3. NAV HOST: The Content Container
+        // Handles the "Swipe Right to Go Back" gesture automatically.
+        SwipeDismissableNavHost(
+            navController = navController,
+            startDestination = "active_ride"
+        ) {
+
+            // --- SCREEN 1: The Ride (Pager) ---
+            composable("active_ride") {
+                // We will put the Gauge + Stats Pager here next
+                // Pass the navigation capability down to the screen
+                WearBikeScreen(
+                    // Pass the navigation capability down to the screen
+                    onNavigateToDetail = { rideId ->
+                        navController.navigate("ride_detail/$rideId")
+                    }
+                )
+                //ActiveRideRoute(navController)
+            }
+
+            // 2. THE NEW DETAIL SCREEN
+            composable(
+                "ride_detail/{rideId}"
+                // (Optional: standard Compose args setup if strictly needed,
+                // but simple string interpolation works for simple IDs)
+            ) { backStackEntry ->
+                val rideId = backStackEntry.arguments?.getString("rideId")
+                if (rideId != null) {
+                    RideDetailScreen(
+                        rideId = rideId,
+                        onDeleteSuccess = { navController.popBackStack() }
+                    )
+                }
+            }
+
+            // --- SCREEN 2: Summary (Example) ---
+            composable("summary") {
+                // SummaryScreen()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/app/WearApplication.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/app/WearApplication.kt
new file mode 100644
index 000000000..db9510d72
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/app/WearApplication.kt
@@ -0,0 +1,35 @@
+package com.ylabz.basepro.ashbike.wear.app
+
+import android.app.Application
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class WearApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        createNotificationChannels()
+    }
+
+    private fun createNotificationChannels() {
+        // Channel for Bike Ride Service
+        val bikeServiceChannelName = "Bike Ride Updates"
+        val bikeServiceChannelDescription = "Notifications for active bike rides"
+        val bikeServiceChannelImportance = NotificationManager.IMPORTANCE_LOW
+        val bikeServiceChannel = NotificationChannel(
+            BikeForegroundService.NOTIFICATION_CHANNEL_ID, // Using the constant from your service
+            bikeServiceChannelName,
+            bikeServiceChannelImportance
+        ).apply {
+            description = bikeServiceChannelDescription
+        }
+
+        val notificationManager: NotificationManager =
+            getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.createNotificationChannel(bikeServiceChannel)
+    }
+
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/AshBikeComplicationService.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/AshBikeComplicationService.kt
new file mode 100644
index 000000000..c18e65513
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/AshBikeComplicationService.kt
@@ -0,0 +1,102 @@
+package com.ylabz.basepro.ashbike.wear.complication
+
+import android.app.PendingIntent
+import android.content.Intent
+import android.graphics.drawable.Icon
+import androidx.wear.watchface.complications.data.ComplicationData
+import androidx.wear.watchface.complications.data.ComplicationType
+import androidx.wear.watchface.complications.data.LongTextComplicationData
+import androidx.wear.watchface.complications.data.MonochromaticImage
+import androidx.wear.watchface.complications.data.PlainComplicationText
+import androidx.wear.watchface.complications.data.ShortTextComplicationData
+import androidx.wear.watchface.complications.data.SmallImageComplicationData
+import androidx.wear.watchface.complications.data.SmallImageType
+import androidx.wear.watchface.complications.datasource.ComplicationRequest
+import androidx.wear.watchface.complications.datasource.SuspendingComplicationDataSourceService
+import com.ylabz.basepro.ashbike.wear.R
+import com.ylabz.basepro.ashbike.wear.presentation.MainActivity
+
+class AshBikeComplicationService : SuspendingComplicationDataSourceService() {
+
+    override suspend fun onComplicationRequest(request: ComplicationRequest): ComplicationData? {
+        // 1. Prepare the Click Action (Open App)
+        val openAppIntent = Intent(this, MainActivity::class.java)
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            openAppIntent,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+
+        // 2. Mock Data (Later, inject your Repository here to get "Last Ride")
+        val distance = "12.4"
+        val unit = "km"
+
+        // 3. Return the correct template based on what the Watch Face asks for
+        return when (request.complicationType) {
+
+            // A. SHORT TEXT (The small circles) -> Shows "12.4"
+            ComplicationType.SHORT_TEXT -> ShortTextComplicationData.Builder(
+                text = PlainComplicationText.Builder(distance).build(),
+                contentDescription = PlainComplicationText.Builder("Last Ride Distance").build()
+            )
+                .setTitle(PlainComplicationText.Builder(unit).build()) // Shows "km" above/below
+                .setMonochromaticImage(
+                    MonochromaticImage.Builder(
+                        Icon.createWithResource(this, R.drawable.ic_launcher_foreground) // Use a bike icon here!
+                    ).build()
+                )
+                .setTapAction(pendingIntent)
+                .build()
+
+            // B. LONG TEXT (The wide bars) -> Shows "Last Ride: 12.4 km"
+            ComplicationType.LONG_TEXT -> LongTextComplicationData.Builder(
+                text = PlainComplicationText.Builder("Last Ride: $distance $unit").build(),
+                contentDescription = PlainComplicationText.Builder("Last Ride Stat").build()
+            )
+                .setMonochromaticImage(
+                    MonochromaticImage.Builder(
+                        Icon.createWithResource(this, R.drawable.ic_launcher_foreground)
+                    ).build()
+                )
+                .setTapAction(pendingIntent)
+                .build()
+
+            // C. SMALL IMAGE (Just the Icon)
+            ComplicationType.SMALL_IMAGE -> {
+                // 1. Create the SmallImage object wrapper first
+                val smallImage = androidx.wear.watchface.complications.data.SmallImage.Builder(
+                    image = Icon.createWithResource(this, R.drawable.ic_bike), // Your Icon
+                    type = SmallImageType.ICON
+                ).build()
+
+                // 2. Create the Complication Data using that wrapper
+                SmallImageComplicationData.Builder(
+                    smallImage = smallImage, // <--- Correct parameter
+                    contentDescription = PlainComplicationText.Builder("Open AshBike").build()
+                )
+                    .setTapAction(pendingIntent)
+                    .build()
+            }
+
+            else -> null // Type not supported
+        }
+    }
+
+    // This data is shown in the "Picker" when the user is choosing a complication
+    override fun getPreviewData(type: ComplicationType): ComplicationData? {
+        return when (type) {
+            ComplicationType.SHORT_TEXT -> ShortTextComplicationData.Builder(
+                text = PlainComplicationText.Builder("0.0").build(),
+                contentDescription = PlainComplicationText.Builder("Preview").build()
+            ).setTitle(PlainComplicationText.Builder("km").build()).build()
+
+            ComplicationType.LONG_TEXT -> LongTextComplicationData.Builder(
+                text = PlainComplicationText.Builder("Ride: 0.0 km").build(),
+                contentDescription = PlainComplicationText.Builder("Preview").build()
+            ).build()
+
+            else -> null
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/MainComplicationService.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/MainComplicationService.kt
new file mode 100644
index 000000000..9aef93c9f
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/MainComplicationService.kt
@@ -0,0 +1,41 @@
+package com.ylabz.basepro.ashbike.wear.complication
+
+import androidx.wear.watchface.complications.data.ComplicationData
+import androidx.wear.watchface.complications.data.ComplicationType
+import androidx.wear.watchface.complications.data.PlainComplicationText
+import androidx.wear.watchface.complications.data.ShortTextComplicationData
+import androidx.wear.watchface.complications.datasource.ComplicationRequest
+import androidx.wear.watchface.complications.datasource.SuspendingComplicationDataSourceService
+import java.util.Calendar
+
+/**
+ * Skeleton for complication data source that returns short text.
+ */
+class MainComplicationService : SuspendingComplicationDataSourceService() {
+
+    override fun getPreviewData(type: ComplicationType): ComplicationData? {
+        if (type != ComplicationType.SHORT_TEXT) {
+            return null
+        }
+        return createComplicationData("Mon", "Monday")
+    }
+
+    override suspend fun onComplicationRequest(request: ComplicationRequest): ComplicationData {
+        return when (Calendar.getInstance().get(Calendar.DAY_OF_WEEK)) {
+            Calendar.SUNDAY -> createComplicationData("Sun", "Sunday")
+            Calendar.MONDAY -> createComplicationData("Mon", "Monday")
+            Calendar.TUESDAY -> createComplicationData("Tue", "Tuesday")
+            Calendar.WEDNESDAY -> createComplicationData("Wed", "Wednesday")
+            Calendar.THURSDAY -> createComplicationData("Thu", "Thursday")
+            Calendar.FRIDAY -> createComplicationData("Fri!", "Friday!")
+            Calendar.SATURDAY -> createComplicationData("Sat", "Saturday")
+            else -> throw IllegalArgumentException("too many days")
+        }
+    }
+
+    private fun createComplicationData(text: String, contentDescription: String) =
+        ShortTextComplicationData.Builder(
+            text = PlainComplicationText.Builder(text).build(),
+            contentDescription = PlainComplicationText.Builder(contentDescription).build()
+        ).build()
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/README.md b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/README.md
new file mode 100644
index 000000000..35292b50c
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/complication/README.md
@@ -0,0 +1,15 @@
+Run the App to install the APK on the emulator/watch.
+
+Long Press on the Watch Face (the current clock).
+
+Tap Edit (or the pencil icon).
+
+Swipe to the Complications screen (where the circles highlight).
+
+Tap a specific circle/slot.
+
+Scroll down the list. You should see AshBike Shortcut.
+
+Select it.
+
+Exit the editor.
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/di/WearSensorModule.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/di/WearSensorModule.kt
new file mode 100644
index 000000000..5f1f9cf6b
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/di/WearSensorModule.kt
@@ -0,0 +1,17 @@
+package com.ylabz.basepro.ashbike.wear.di
+
+import com.ylabz.basepro.core.data.repository.sensor.WearHealthHeartRateRepository
+import com.ylabz.basepro.core.data.repository.sensor.heart.HeartRateRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class WearSensorModule {
+    @Binds
+    abstract fun bindHeartRateRepository(
+        impl: WearHealthHeartRateRepository
+    ): HeartRateRepository
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/MainActivity.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/MainActivity.kt
new file mode 100644
index 000000000..ab1e3a519
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/MainActivity.kt
@@ -0,0 +1,49 @@
+package com.ylabz.basepro.ashbike.wear.presentation
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.ylabz.basepro.ashbike.wear.app.AshBikeApp
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // Handle the Splash Screen transition
+        installSplashScreen()
+
+        super.onCreate(savedInstanceState)
+
+        // Set the base theme for the activity window
+        setTheme(android.R.style.Theme_DeviceDefault)
+
+        setContent {
+            // We do NOT need to start the service here.
+            // AshBikeApp -> WearBikeScreen handles the Service Binding
+            // automatically once permissions are granted.
+
+            // We also don't need a Box or TimeText here, because
+            // AshBikeApp uses AppScaffold/ScreenScaffold which handles that.
+            AshBikeApp()
+        }
+    }
+}
+
+
+/* While this template provides a good starting point for using Wear Compose, you can always
+ * take a look at https://github.com/android/wear-os-samples/tree/main/ComposeStarter to find the
+ * most up to date changes to the libraries and their usages.
+ */
+
+/*
+@Composable
+fun Greeting(greetingName: String) {
+    Text(
+        modifier = Modifier.fillMaxWidth(),
+        textAlign = TextAlign.Center,
+        color = MaterialTheme.colors.primary,
+        text = stringResource(R.string.hello_world, greetingName)
+    )
+}
+*/
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/PermissionRationaleContent.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/PermissionRationaleContent.kt
new file mode 100644
index 000000000..0e49f9565
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/PermissionRationaleContent.kt
@@ -0,0 +1,35 @@
+package com.ylabz.basepro.ashbike.wear.presentation
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material3.Button
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
+
+@Composable
+fun PermissionRationaleContent(onRequestPermission: () -> Unit) {
+    Column(
+        modifier = Modifier.fillMaxSize().padding(16.dp),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = "Need Permissions",
+            textAlign = TextAlign.Center,
+            style = MaterialTheme.typography.titleSmall
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        Button(onClick = onRequestPermission) {
+            Text("Grant")
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/WearBikeScreen.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/WearBikeScreen.kt
new file mode 100644
index 000000000..177175fc5
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/WearBikeScreen.kt
@@ -0,0 +1,16 @@
+package com.ylabz.basepro.ashbike.wear.presentation
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material3.Button
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateGraph.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateGraph.kt
new file mode 100644
index 000000000..68a9c9945
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateGraph.kt
@@ -0,0 +1,72 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.health
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun HeartRateGraph(
+    dataPoints: List<Int>,
+    modifier: Modifier = Modifier,
+    lineColor: Color = Color(0xFFFF5252) // Reddish color
+) {
+    if (dataPoints.isEmpty()) return
+
+    // Pre-calculate min/max for scaling
+    val minHr = remember(dataPoints) { dataPoints.minOrNull() ?: 0 }
+    val maxHr = remember(dataPoints) { dataPoints.maxOrNull() ?: 200 }
+    val range = (maxHr - minHr).coerceAtLeast(1) // Avoid divide by zero
+
+    Canvas(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(100.dp) // Fixed height for the graph
+    ) {
+        val width = size.width
+        val height = size.height
+
+        // Calculate the X step (distance between points)
+        val stepX = width / (dataPoints.size - 1).coerceAtLeast(1)
+
+        val path = Path().apply {
+            dataPoints.forEachIndexed { index, hr ->
+                val x = index * stepX
+                // Normalize HR to height (invert Y because canvas 0 is top)
+                val normalizedY = 1f - ((hr - minHr) / range.toFloat())
+                val y = normalizedY * height
+
+                if (index == 0) moveTo(x, y) else lineTo(x, y)
+            }
+        }
+
+        // Draw the line
+        drawPath(
+            path = path,
+            color = lineColor,
+            style = Stroke(width = 3.dp.toPx())
+        )
+
+        // Optional: Add a gradient fill below the line
+        val fillPath = Path().apply {
+            addPath(path)
+            lineTo(width, height)
+            lineTo(0f, height)
+            close()
+        }
+
+        drawPath(
+            path = fillPath,
+            brush = Brush.verticalGradient(
+                colors = listOf(lineColor.copy(alpha = 0.3f), Color.Transparent)
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateSummaryCard.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateSummaryCard.kt
new file mode 100644
index 000000000..981dc46b8
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateSummaryCard.kt
@@ -0,0 +1,153 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.health
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material3.Card
+import androidx.wear.compose.material3.CardDefaults
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
+
+@Composable
+fun HeartRateSummaryCard(
+    heartRates: List<Int>,
+    maxHeartRate: Int = 190,
+    modifier: Modifier = Modifier
+) {
+    if (heartRates.isEmpty()) return
+
+    // --- SHARED CONFIG ---
+    // Zone Colors: Grey, Blue, Green, Orange, Red
+    val zoneColors = listOf(
+        Color(0xFF9E9E9E), Color(0xFF42A5F5), Color(0xFF66BB6A), Color(0xFFFFA726), Color(0xFFEF5350)
+    )
+
+    // Calculate Data for Line Graph
+    val minHr = remember(heartRates) { heartRates.minOrNull() ?: 0 }
+    val maxHrData = remember(heartRates) { heartRates.maxOrNull() ?: maxHeartRate }
+    val range = (maxHrData - minHr).coerceAtLeast(1)
+
+    // Calculate Data for Zone Bars
+    val zoneCounts = remember(heartRates) {
+        val counts = IntArray(5)
+        heartRates.forEach { hr ->
+            val p = hr.toFloat() / maxHeartRate
+            val idx = when { p < 0.6 -> 0; p < 0.7 -> 1; p < 0.8 -> 2; p < 0.9 -> 3; else -> 4 }
+            counts[idx]++
+        }
+        counts
+    }
+    val maxZoneCount = zoneCounts.maxOrNull()?.coerceAtLeast(1) ?: 1
+
+    Card(
+        onClick = {}, // Non-clickable info card
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceContainer
+        ),
+        modifier = modifier.fillMaxWidth()
+    ) {
+        Column(modifier = Modifier.padding(8.dp)) {
+
+            // HEADER
+            Text(
+                text = "Heart Rate Analysis",
+                style = MaterialTheme.typography.titleMedium,
+                color = MaterialTheme.colorScheme.onSurface
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+
+            // 1. THE LINE GRAPH (With Zone Gradient!)
+            Canvas(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(60.dp) // Compact height
+            ) {
+                val w = size.width
+                val h = size.height
+                val stepX = w / (heartRates.size - 1).coerceAtLeast(1)
+
+                // Create the path
+                val path = Path().apply {
+                    heartRates.forEachIndexed { i, hr ->
+                        val x = i * stepX
+                        // Normalize Y (flip coordinate system)
+                        val y = h - ((hr - minHr).toFloat() / range * h)
+                        if (i == 0) moveTo(x, y) else lineTo(x, y)
+                    }
+                }
+
+                // Create a Vertical Gradient that matches the Zones
+                // This colors the line Red when high, Blue when low
+                val gradientBrush = Brush.verticalGradient(
+                    colors = zoneColors.reversed(), // Red at top, Grey at bottom
+                    startY = 0f,
+                    endY = h
+                )
+
+                drawPath(
+                    path = path,
+                    brush = gradientBrush,
+                    style = Stroke(width = 3.dp.toPx())
+                )
+            }
+
+            Spacer(modifier = Modifier.height(12.dp))
+
+            // 2. THE ZONE BARS (Miniature)
+            Row(
+                modifier = Modifier.fillMaxWidth().height(40.dp),
+                verticalAlignment = Alignment.Bottom,
+                horizontalArrangement = Arrangement.SpaceBetween // Distribute evenly
+            ) {
+                zoneCounts.forEachIndexed { index, count ->
+                    // Draw simple bars using standard Compose Box/Canvas would be overkill,
+                    // let's just use a Canvas for the whole row to be performant.
+                }
+
+                // Drawing the bars inside a single Canvas for performance
+                Canvas(modifier = Modifier.fillMaxWidth().height(40.dp)) {
+                    val barW = size.width / 5f - 4.dp.toPx() // 5 bars with gap
+                    val maxH = size.height
+
+                    zoneCounts.forEachIndexed { i, count ->
+                        val barH = (count.toFloat() / maxZoneCount) * maxH
+                        val x = i * (size.width / 5f) + 2.dp.toPx()
+
+                        drawRoundRect(
+                            color = zoneColors[i],
+                            topLeft = Offset(x, maxH - barH),
+                            size = Size(barW, barH),
+                            cornerRadius = CornerRadius(2.dp.toPx())
+                        )
+                    }
+                }
+            }
+
+            // Tiny Labels
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                Text("Warmup", style = MaterialTheme.typography.labelSmall, color = Color.Gray)
+                Text("Peak", style = MaterialTheme.typography.labelSmall, color = Color.Gray)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateZoneChart.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateZoneChart.kt
new file mode 100644
index 000000000..dd6fb4d8a
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/health/HeartRateZoneChart.kt
@@ -0,0 +1,105 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.health
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.drawText
+import androidx.compose.ui.text.rememberTextMeasurer
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
+import kotlin.math.max
+
+@Composable
+fun HeartRateZoneChart(
+    heartRates: List<Int>,
+    maxHeartRate: Int = 190, // Default Max HR (approx for 30yo)
+    modifier: Modifier = Modifier
+) {
+    if (heartRates.isEmpty()) return
+
+    // 1. Calculate Zones
+    // Zones: 1 (Grey), 2 (Blue), 3 (Green), 4 (Orange), 5 (Red)
+    val zones = remember(heartRates) {
+        val counts = IntArray(5)
+        heartRates.forEach { hr ->
+            val percentage = hr.toFloat() / maxHeartRate
+            val zoneIndex = when {
+                percentage < 0.60 -> 0 // Zone 1 (Warm Up)
+                percentage < 0.70 -> 1 // Zone 2 (Fat Burn)
+                percentage < 0.80 -> 2 // Zone 3 (Aerobic)
+                percentage < 0.90 -> 3 // Zone 4 (Cardio)
+                else -> 4              // Zone 5 (Peak)
+            }
+            counts[zoneIndex]++
+        }
+        counts
+    }
+
+    // 2. Visual Configuration
+    val zoneColors = listOf(
+        Color(0xFF9E9E9E), // Zone 1: Grey
+        Color(0xFF42A5F5), // Zone 2: Blue
+        Color(0xFF66BB6A), // Zone 3: Green
+        Color(0xFFFFA726), // Zone 4: Orange
+        Color(0xFFEF5350)  // Zone 5: Red
+    )
+
+    val maxCount = zones.maxOrNull()?.coerceAtLeast(1) ?: 1
+
+    Column(modifier = modifier.fillMaxWidth()) {
+        // Label
+        Text(
+            text = "Time in Zones",
+            style = MaterialTheme.typography.labelMedium,
+            color = MaterialTheme.colorScheme.secondary,
+            modifier = Modifier.padding(bottom = 4.dp)
+        )
+
+        // Graph
+        Canvas(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(80.dp)
+        ) {
+            val barWidth = size.width / 9f // 5 bars + spaces
+            val spacing = barWidth / 2f
+            val maxBarHeight = size.height
+
+            zones.forEachIndexed { index, count ->
+                val barHeight = (count.toFloat() / maxCount) * maxBarHeight
+                val x = index * (barWidth + spacing) + spacing // Center it roughly
+
+                // Draw Bar
+                drawRoundRect(
+                    color = zoneColors[index],
+                    topLeft = Offset(x, maxBarHeight - barHeight),
+                    size = Size(barWidth, barHeight),
+                    cornerRadius = CornerRadius(4.dp.toPx())
+                )
+            }
+        }
+
+        // Legend (Simplified)
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(top = 4.dp),
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            Text("Low", style = MaterialTheme.typography.bodyExtraSmall, color = Color.Gray)
+            Text("High", style = MaterialTheme.typography.bodyExtraSmall, color = Color.Gray)
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideDetailScreen.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideDetailScreen.kt
new file mode 100644
index 000000000..86b5abb07
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideDetailScreen.kt
@@ -0,0 +1,186 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.history
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
+import androidx.wear.compose.material3.Button
+import androidx.wear.compose.material3.ButtonDefaults
+import androidx.wear.compose.material3.ListHeader
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.material3.Text
+import androidx.wear.compose.material3.TextConfigurationDefaults.TextAlign
+import com.ylabz.basepro.ashbike.wear.presentation.screens.health.HeartRateGraph
+import com.ylabz.basepro.ashbike.wear.presentation.screens.health.HeartRateSummaryCard
+import com.ylabz.basepro.ashbike.wear.presentation.screens.health.HeartRateZoneChart
+import com.ylabz.basepro.ashbike.wear.presentation.screens.ride.ElevationGraph
+import com.ylabz.basepro.ashbike.wear.presentation.screens.ride.GeoPoint
+import com.ylabz.basepro.ashbike.wear.presentation.screens.ride.RoutePreview
+
+
+@Composable
+fun RideDetailScreen(
+    rideId: String,
+    viewModel: RideHistoryViewModel = hiltViewModel(),
+    onDeleteSuccess: () -> Unit // Tells the app to go back after deleting
+) {
+    // Collect the single ride
+    val ride by viewModel.getRide(rideId).collectAsState(initial = null)
+    val listState = rememberScalingLazyListState()
+
+    // MOCK DATA: Simulating a heart rate history for the graph
+    // (Replace this with real data from your DB entity later)
+    val mockHeartRates = remember {
+        listOf(80, 85, 90, 110, 135, 140, 138, 145, 150, 148, 130, 120, 110)
+    }
+
+    // MOCK DATA: Simulating a hill climb (Flat -> Climb -> Descent -> Flat)
+    val mockElevation = remember {
+        listOf(
+            10f, 12f, 15f, 15f, 18f, 25f, 40f, 60f, 85f, 100f, // Climb
+            90f, 80f, 60f, 40f, 30f, 20f, 15f, 12f, 10f        // Descent
+        )
+    }
+
+    // MOCK DATA: A simple "Loop" shape
+    val mockRoute = remember {
+        listOf(
+            GeoPoint(0.0, 0.0),
+            GeoPoint(0.1, 0.2),
+            GeoPoint(0.2, 0.5),
+            GeoPoint(0.3, 0.2),
+            GeoPoint(0.4, 0.0),
+            GeoPoint(0.2, -0.2),
+            GeoPoint(0.0, 0.0)
+        )
+    }
+
+    ScreenScaffold(scrollState = listState) {
+        ScalingLazyColumn(
+            state = listState,
+            modifier = Modifier.fillMaxSize()
+        ) {
+            val currentRide= ride
+            if (currentRide!= null) {
+                // 1. HEADER
+                item { ListHeader { Text("Ride Details") } }
+
+                // --- NEW: Route Map ---
+                item {
+                    RoutePreview(
+                        pathPoints = mockRoute, // Use ride.locations.map { GeoPoint(it.lat, it.lng) }
+                        modifier = Modifier.padding(bottom = 8.dp)
+                    )
+                }
+                // ----------------------
+
+                // --- NEW: THE GRAPH ---
+                item {
+                    Text(
+                        "Heart Rate",
+                        style = MaterialTheme.typography.labelMedium,
+                        color = MaterialTheme.colorScheme.secondary
+                    )
+                }
+                item {
+                    HeartRateGraph(
+                        dataPoints = mockHeartRates, // Pass real data here eventually
+                        modifier = Modifier.padding(vertical = 8.dp)
+                    )
+                }
+                // -----------------------
+
+                // 2. The Zone Chart (Distribution)
+                item {
+                    HeartRateZoneChart(
+                        heartRates = mockHeartRates,
+                        maxHeartRate = 190, // You can fetch user's max HR from profile later
+                        modifier = Modifier.padding(vertical = 12.dp)
+                    )
+                }
+
+                item {
+                    HeartRateSummaryCard(
+                        heartRates = mockHeartRates, // Or real DB data
+                        maxHeartRate = 190,
+                        modifier = Modifier.padding(bottom = 8.dp)
+                    )
+                }
+
+
+                // --- NEW: Elevation Profile ---
+                item {
+                    Text(
+                        "Elevation Profile",
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.colorScheme.secondary
+                    )
+                }
+                item {
+                    ElevationGraph(
+                        elevations = mockElevation, // Use ride.locations.map { it.elevation } later
+                        modifier = Modifier.padding(vertical = 8.dp)
+                    )
+                }
+
+
+
+
+                // 2. STATS (Add as many rows as you want)
+                item { DetailRow("Distance", "${currentRide.totalDistance} km") }
+                item { DetailRow("Calories", "${currentRide.caloriesBurned}") }
+                item { DetailRow("Duration", "${(currentRide.endTime - currentRide.startTime)/1000/60} min") }
+                item { DetailRow("Avg Speed", "${currentRide.averageSpeed} km/h") }
+
+                // Duration Calculation
+                val durationMin = (currentRide.endTime - currentRide.startTime) / 1000 / 60
+                item { Text("Duration: $durationMin min") }
+
+                item { Spacer(modifier = Modifier.height(20.dp)) }
+
+                // THE DELETE BUTTON
+                item {
+                    Button(
+                        onClick = {
+                            viewModel.deleteRide(rideId)
+                            onDeleteSuccess()
+                        },
+                        colors = ButtonDefaults.filledTonalButtonColors(
+                            containerColor = MaterialTheme.colorScheme.error,
+                            contentColor = MaterialTheme.colorScheme.onError
+                        ),
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 20.dp)
+                    ) {
+                        Text("Delete Ride")
+                    }
+                }
+            } else {
+                item { Text("Loading...") }
+            }
+        }
+    }
+}
+
+@Composable
+fun DetailRow(label: String, value: String) {
+    Text(
+        text = "$label: $value",
+        style = MaterialTheme.typography.bodyMedium,
+        color = MaterialTheme.colorScheme.onSurfaceVariant,
+        textAlign = TextAlign,
+        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)
+    )
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryPage.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryPage.kt
new file mode 100644
index 000000000..3afdc0434
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryPage.kt
@@ -0,0 +1,70 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.history
+
+// Add these imports
+// ... imports including hiltViewModel
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.items
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.material3.Text
+
+@Composable
+fun RideHistoryPage(
+    viewModel: RideHistoryViewModel = hiltViewModel(),
+    onRideClick: (String) -> Unit // <--- Add this
+) {
+    val historyList by viewModel.historyList.collectAsState()
+    val listState = rememberScalingLazyListState()
+
+    // We wrap it in ScreenScaffold so we get the Scrollbar (Position Indicator)
+    // ONLY on this page.
+    ScreenScaffold(scrollState = listState) {
+        ScalingLazyColumn(
+            state = listState,
+            modifier = Modifier.fillMaxSize()
+        ) {
+            item {
+                Text(
+                    text = "HISTORY",
+                    style = MaterialTheme.typography.titleMedium,
+                    color = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.padding(bottom = 8.dp)
+                )
+            }
+
+            items(historyList) { ride ->
+                HistoryItemCard(
+                    ride = ride,
+                    onClick = { onRideClick(ride.id) } // Pass ID up
+                )
+            }
+
+            if (historyList.isEmpty()) {
+                item {
+                    Text(
+                        text = "No rides yet",
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+            } else {
+                items(historyList) { ride ->
+                    // Reuse the Card we made earlier
+                    HistoryItemCard(
+                        ride = ride,
+                        onClick = { onRideClick(ride.id) } // Trigger callback
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryScreen.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryScreen.kt
new file mode 100644
index 000000000..675eff477
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryScreen.kt
@@ -0,0 +1,81 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.history
+
+// ... imports including hiltViewModel
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.items
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
+import androidx.wear.compose.material3.CardDefaults
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.material3.Text
+import androidx.wear.compose.material3.TitleCard
+
+@Composable
+fun RideHistoryScreen(
+    // Inject ViewModel automatically
+    viewModel: RideHistoryViewModel = hiltViewModel(),
+    onRideClick: (String) -> Unit
+) {
+    // Collect the Real Data from the Database!
+    val historyList by viewModel.historyList.collectAsState()
+
+    val listState = rememberScalingLazyListState()
+
+    ScreenScaffold(scrollState = listState) {
+        ScalingLazyColumn(
+            state = listState,
+            modifier = Modifier.fillMaxSize()
+        ) {
+            item {
+                Text(
+                    text = "HISTORY",
+                    style = MaterialTheme.typography.titleMedium,
+                    color = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.padding(bottom = 8.dp)
+                )
+            }
+
+            if (historyList.isEmpty()) {
+                item {
+                    Text(
+                        text = "No rides yet.",
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+            } else {
+                items(historyList) { ride ->
+                    HistoryItemCard(
+                        ride = ride, // We updated this card signature below
+                        onClick = { onRideClick(ride.id) }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun HistoryItemCard(ride: RideHistoryUiItem, onClick: () -> Unit) {
+    TitleCard(
+        onClick = onClick,
+        title = { Text(ride.distanceStr) },
+        subtitle = { Text("${ride.dateStr} • ${ride.durationStr}") },
+        modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceContainer,
+            contentColor = MaterialTheme.colorScheme.onSurface
+        )
+    ) {
+        // Optional: Calories badge
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryUiItem.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryUiItem.kt
new file mode 100644
index 000000000..061d55564
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryUiItem.kt
@@ -0,0 +1,10 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.history
+
+// Simple UI Model so the View doesn't need to know about Database Entities
+data class RideHistoryUiItem(
+    val id: String,
+    val dateStr: String,
+    val distanceStr: String,
+    val durationStr: String,
+    val caloriesStr: String
+)
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryViewModel.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryViewModel.kt
new file mode 100644
index 000000000..9d62eb8f0
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/history/RideHistoryViewModel.kt
@@ -0,0 +1,71 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.history
+
+import android.icu.text.SimpleDateFormat
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ylabz.basepro.applications.bike.database.BikeRideDao
+import com.ylabz.basepro.applications.bike.database.mapper.toBikeRide
+import com.ylabz.basepro.core.model.bike.BikeRide
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
+
+
+@HiltViewModel
+class RideHistoryViewModel @Inject constructor(
+    val bikeDao: BikeRideDao
+) : ViewModel() {
+
+    val historyList: StateFlow<List<RideHistoryUiItem>> = bikeDao.getAllRidesWithLocations()
+        .map { dbList ->
+            dbList.map { it.toBikeRide() } // 1. Convert DB -> Domain (BikeRide)
+        }
+        .map { domainList ->
+            domainList.map { bikeRide ->    // 2. Convert Domain -> UI (Lightweight)
+                bikeRide.toUiModel()
+            }
+        }
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5000),
+            initialValue = emptyList()
+        )
+
+    // 2. NEW: Get Single Ride (for Details)
+    fun getRide(rideId: String): Flow<BikeRide?> {
+        return bikeDao.getRideWithLocations(rideId).map { it?.toBikeRide() }
+    }
+
+    // 3. NEW: Delete Ride
+    fun deleteRide(rideId: String) {
+        viewModelScope.launch(Dispatchers.IO) {
+            bikeDao.deleteRide(rideId)
+        }
+    }
+
+    // Convert YOUR Domain Model to the simple strings needed for the UI
+    private fun BikeRide.toUiModel(): RideHistoryUiItem {
+        val dateFormat = SimpleDateFormat("MMM dd, HH:mm", Locale.getDefault())
+
+        // Calculate duration logic if not stored explicitly
+        val durationMillis = this.endTime - this.startTime
+        val durationMin = durationMillis / 1000 / 60
+
+        return RideHistoryUiItem(
+            id = this.rideId,
+            dateStr = dateFormat.format(Date(this.startTime)),
+            // Domain model already has TotalDistance as Float (assuming km based on mapper)
+            distanceStr = String.format("%.2f km", this.totalDistance),
+            durationStr = "$durationMin min",
+            caloriesStr = "${this.caloriesBurned} kcal"
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/BikeControlContent.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/BikeControlContent.kt
new file mode 100644
index 000000000..a6ab8063a
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/BikeControlContent.kt
@@ -0,0 +1,55 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.pager.HorizontalPager
+import androidx.wear.compose.foundation.pager.rememberPagerState
+import androidx.wear.compose.material3.HorizontalPageIndicator
+import androidx.wear.compose.material3.MaterialTheme
+import com.ylabz.basepro.ashbike.wear.presentation.screens.history.RideHistoryPage
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+
+// 3. Stateless UI Wrapper (The Pager)
+@Composable
+fun BikeControlContent(
+    uiState: WearBikeUiState,
+    onEvent: (WearBikeEvent) -> Unit
+) {
+    // UI-only state (like pager position) is fine to stay in Compose
+    // because it doesn't affect business logic.
+    val pagerState = rememberPagerState(pageCount = { 3 })
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        HorizontalPager(
+            state = pagerState,
+            modifier = Modifier.fillMaxSize()
+        ) { page ->
+            when (page) {
+                0 -> MainGaugePage(
+                    uiState = uiState,
+                    onEvent = onEvent
+                )
+                1 -> StatsGridPage(
+                    uiState = uiState // Assuming this needs state too
+                )
+                2 -> RideHistoryPage(
+                    onRideClick = { rideId -> onEvent(WearBikeEvent.OnHistoryClick(rideId)) }
+                )
+            }
+        }
+
+        HorizontalPageIndicator(
+            pagerState = pagerState,
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(bottom = 8.dp),
+            selectedColor = MaterialTheme.colorScheme.primary,
+            unselectedColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f)
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/BikeControlContentFull.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/BikeControlContentFull.kt
new file mode 100644
index 000000000..61ee55443
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/BikeControlContentFull.kt
@@ -0,0 +1,91 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material3.Button
+import androidx.wear.compose.material3.ButtonDefaults
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+
+// 3. Stateless UI
+@Composable
+fun BikeControlContentFull(
+    rideInfo: BikeRideInfo,
+    onStart: () -> Unit,
+    onStop: () -> Unit
+) {
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        // Background Speedometer
+        WearSpeedometer(
+            // BikeRideInfo provides speed in km/h automatically from BikeForegroundService
+            currentSpeed = rideInfo.currentSpeed.toFloat(),
+            modifier = Modifier.fillMaxSize()
+        )
+
+        // Overlay Stats
+        Column(
+            modifier = Modifier.fillMaxSize(),
+            verticalArrangement = Arrangement.SpaceBetween,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            // Top: Heart Rate
+            Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(top = 30.dp)) {
+                Text(
+                    text = "HR",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = MaterialTheme.colorScheme.secondary
+                )
+                Text(
+                    // Handle nullable heartbeat
+                    text = "${rideInfo.heartbeat ?: "--"}",
+                    style = MaterialTheme.typography.titleMedium,
+                    color = MaterialTheme.colorScheme.onBackground
+                )
+            }
+
+            // Bottom: Distance & Controls
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier.padding(bottom = 20.dp)
+            ) {
+                Text(
+                    // BikeRideInfo.currentTripDistance is already in Kilometers
+                    text = String.format("%.2f km", rideInfo.currentTripDistance),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.secondary
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
+                    Button(
+                        onClick = onStart,
+                        colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary),
+                        modifier = Modifier.height(40.dp)
+                    ) {
+                        Text("Go")
+                    }
+                    Button(
+                        onClick = onStop,
+                        colors = ButtonDefaults.filledTonalButtonColors(),
+                        modifier = Modifier.height(40.dp)
+                    ) {
+                        Text("Stop")
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/CompactStat.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/CompactStat.kt
new file mode 100644
index 000000000..7bd5aef3e
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/CompactStat.kt
@@ -0,0 +1,46 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.material3.Text
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+
+@Composable
+fun CompactStat(label: String, value: String, unit: String) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        // 1. Label (e.g. "AVG SPD") - Uppercase and subtle
+        Text(
+            text = label,
+            style = MaterialTheme.typography.labelSmall,
+            color = MaterialTheme.colorScheme.secondary
+        )
+
+        // 2. Value (e.g. "22.0") - Big and bright
+        Text(
+            text = value,
+            style = MaterialTheme.typography.titleLarge,
+            color = MaterialTheme.colorScheme.onBackground
+        )
+
+        // 3. Unit (e.g. "km/h") - Small and tertiary
+        Text(
+            text = unit,
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.tertiary
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/ElevationGraph.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/ElevationGraph.kt
new file mode 100644
index 000000000..068366515
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/ElevationGraph.kt
@@ -0,0 +1,70 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.Fill
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ElevationGraph(
+    elevations: List<Float>,
+    modifier: Modifier = Modifier,
+    graphColor: Color = Color(0xFF4FC3F7) // Light Cyan
+) {
+    if (elevations.isEmpty()) return
+
+    // 1. Calculate Min/Max to scale the peaks
+    val minAlt = remember(elevations) { elevations.minOrNull() ?: 0f }
+    val maxAlt = remember(elevations) { elevations.maxOrNull() ?: 100f }
+    val range = (maxAlt - minAlt).coerceAtLeast(1f)
+
+    Canvas(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(80.dp)
+    ) {
+        val width = size.width
+        val height = size.height
+        val stepX = width / (elevations.size - 1).coerceAtLeast(1)
+
+        // 2. Create the Mountain Path
+        val path = Path().apply {
+            // Start at bottom-left
+            moveTo(0f, height)
+
+            elevations.forEachIndexed { index, alt ->
+                val x = index * stepX
+                // Normalize Y: Higher altitude = Smaller Y (closer to top)
+                val normalizedY = 1f - ((alt - minAlt) / range)
+                val y = normalizedY * height
+                lineTo(x, y)
+            }
+
+            // Close the shape (Bottom-Right -> Bottom-Left)
+            lineTo(width, height)
+            lineTo(0f, height)
+            close()
+        }
+
+        // 3. Draw with a Vertical Gradient (Fades out at bottom)
+        drawPath(
+            path = path,
+            brush = Brush.verticalGradient(
+                colors = listOf(
+                    graphColor.copy(alpha = 0.8f), // Solid at peak
+                    graphColor.copy(alpha = 0.1f)  // Transparent at base
+                ),
+                startY = 0f,
+                endY = height
+            ),
+            style = Fill
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/MainGaugePage.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/MainGaugePage.kt
new file mode 100644
index 000000000..8afafb67e
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/MainGaugePage.kt
@@ -0,0 +1,116 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+// --- PAGE 0: Your Existing Gauge UI ---
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Favorite
+import androidx.compose.material.icons.rounded.PlayArrow
+import androidx.compose.material.icons.rounded.Stop
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.wear.compose.material3.Button
+import androidx.wear.compose.material3.ButtonDefaults
+import androidx.wear.compose.material3.Icon
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
+
+@Composable
+fun MainGaugePage(
+    uiState: WearBikeUiState,
+    onEvent: (WearBikeEvent) -> Unit
+) {
+    val rideInfo = uiState.rideInfo
+    val isRecording = uiState.isRecording
+
+    // ... (Animation code from previous answer remains here) ...
+
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        // Gauge
+        WearSpeedometer(
+            currentSpeed = rideInfo.currentSpeed.toFloat(),
+            modifier = Modifier.fillMaxSize()
+        )
+
+        // Text & Data
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+            modifier = Modifier.offset(y = (-10).dp)
+        ) {
+            // Heart Rate
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Icon(
+                    imageVector = Icons.Rounded.Favorite,
+                    contentDescription = null,
+                    tint = Color(0xFFFF5252),
+                    modifier = Modifier.size(12.dp)
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+                Text(
+                    text = "${rideInfo.heartbeat ?: "--"}",
+                    style = MaterialTheme.typography.titleSmall
+                )
+            }
+
+            // Speed
+            Text(
+                text = String.format("%.0f", rideInfo.currentSpeed),
+                style = MaterialTheme.typography.displayMedium.copy(fontSize = 54.sp),
+                color = MaterialTheme.colorScheme.primary
+            )
+            Text("km/h", style = MaterialTheme.typography.labelSmall)
+
+            // Distance
+            Text(
+                text = String.format("%.2f km", rideInfo.currentTripDistance ?: 0.0),
+                style = MaterialTheme.typography.bodyMedium
+            )
+        }
+
+        // Controls (Trigger Events)
+        Row(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(bottom = 20.dp),
+            horizontalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            if (!isRecording) {
+                // Large Start Button when stopped
+                Button(
+                    onClick = { onEvent(WearBikeEvent.StartRide) }, // <--- Action
+                    colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary),
+                    modifier = Modifier.size(50.dp)
+                ) {
+                    Icon(Icons.Rounded.PlayArrow, "Start")
+                }
+            } else {
+                // Smaller Stop/Pause buttons when running
+                Button(
+                    onClick = { onEvent(WearBikeEvent.StopRide) }, // <--- Action
+                    colors = ButtonDefaults.filledTonalButtonColors(
+                        containerColor = MaterialTheme.colorScheme.errorContainer
+                    ),
+                    modifier = Modifier.size(50.dp)
+                ) {
+                    Icon(Icons.Rounded.Stop, "Stop")
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/RoutePreview.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/RoutePreview.kt
new file mode 100644
index 000000000..fc8450264
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/RoutePreview.kt
@@ -0,0 +1,125 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+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.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.StrokeJoin
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
+import kotlin.math.max
+
+// Simple data class for the preview (so we don't depend on Android Location object)
+data class GeoPoint(val lat: Double, val lng: Double)
+
+@Composable
+fun RoutePreview(
+    pathPoints: List<GeoPoint>,
+    modifier: Modifier = Modifier,
+    lineColor: Color = Color(0xFFFFD740) // Amber/Yellow
+) {
+    if (pathPoints.size < 2) {
+        Box(modifier = modifier.fillMaxWidth().aspectRatio(1.5f), contentAlignment = Alignment.Center) {
+            Text("No path data", style = MaterialTheme.typography.labelSmall)
+        }
+        return
+    }
+
+    // 1. Calculate Bounds (Bounding Box)
+    val bounds = remember(pathPoints) {
+        var minLat = Double.MAX_VALUE
+        var maxLat = Double.MIN_VALUE
+        var minLng = Double.MAX_VALUE
+        var maxLng = Double.MIN_VALUE
+
+        pathPoints.forEach { p ->
+            if (p.lat < minLat) minLat = p.lat
+            if (p.lat > maxLat) maxLat = p.lat
+            if (p.lng < minLng) minLng = p.lng
+            if (p.lng > maxLng) maxLng = p.lng
+        }
+        // Add tiny padding to prevent divide-by-zero on straight lines
+        val latRange = (maxLat - minLat).coerceAtLeast(0.0001)
+        val lngRange = (maxLng - minLng).coerceAtLeast(0.0001)
+
+        Quadruple(minLat, minLng, latRange, lngRange)
+    }
+
+    val (minLat, minLng, latRange, lngRange) = bounds
+
+    Box(
+        modifier = modifier
+            .fillMaxWidth()
+            .aspectRatio(1.5f) // Rectangular aspect ratio
+            .clip(RoundedCornerShape(12.dp))
+            .background(MaterialTheme.colorScheme.surfaceContainer)
+            .padding(12.dp) // Inner padding so line doesn't hit edge
+    ) {
+        Canvas(modifier = Modifier.fillMaxSize()) {
+            val w = size.width
+            val h = size.height
+
+            // 2. Scale Logic: Fit the shape inside the canvas while keeping aspect ratio?
+            // For a simple preview, stretching to fill usually looks best on small screens.
+
+            val path = Path().apply {
+                pathPoints.forEachIndexed { i, p ->
+                    // Normalize (0.0 to 1.0)
+                    val normX = ((p.lng - minLng) / lngRange).toFloat()
+                    // Flip Y because Latitude goes UP but Canvas Y goes DOWN
+                    val normY = 1f - ((p.lat - minLat) / latRange).toFloat()
+
+                    val x = normX * w
+                    val y = normY * h
+
+                    if (i == 0) moveTo(x, y) else lineTo(x, y)
+                }
+            }
+
+            // 3. Draw the Route
+            drawPath(
+                path = path,
+                color = lineColor,
+                style = Stroke(
+                    width = 4.dp.toPx(),
+                    cap = StrokeCap.Round,
+                    join = StrokeJoin.Round
+                )
+            )
+
+            // 4. Draw Start (Green) and End (Red) dots
+            val first = pathPoints.first()
+            val last = pathPoints.last()
+
+            val startX = ((first.lng - minLng) / lngRange).toFloat() * w
+            val startY = (1f - ((first.lat - minLat) / latRange).toFloat()) * h
+
+            val endX = ((last.lng - minLng) / lngRange).toFloat() * w
+            val endY = (1f - ((last.lat - minLat) / latRange).toFloat()) * h
+
+            // Start Dot
+            drawCircle(Color.Green, radius = 5.dp.toPx(), center = Offset(startX, startY))
+
+            // End Dot
+            drawCircle(Color.Red, radius = 5.dp.toPx(), center = Offset(endX, endY))
+        }
+    }
+}
+
+// Helper tuple
+data class Quadruple<A, B, C, D>(val first: A, val second: B, val third: C, val fourth: D)
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/StatsGridPage.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/StatsGridPage.kt
new file mode 100644
index 000000000..844cf03aa
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/StatsGridPage.kt
@@ -0,0 +1,82 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+// Add these imports
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
+import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.material3.Text
+
+@Composable
+fun StatsGridPage(uiState: WearBikeUiState) {
+    // Extract the data we need from the state
+    val info = uiState.rideInfo
+    // The state required for scrolling behavior
+    val listState = rememberScalingLazyListState()
+
+    // ScreenScaffold adds the "Scrollbar" on the right automatically
+    ScreenScaffold(scrollState = listState) {
+
+        ScalingLazyColumn(
+            state = listState,
+            modifier = Modifier.fillMaxSize(),
+            // anchored = true (default) ensures items snap to center
+        ) {
+            // Header (Optional)
+            item {
+                Text(
+                    text = "RIDE STATS",
+                    style = MaterialTheme.typography.labelMedium,
+                    color = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.padding(bottom = 10.dp)
+                )
+            }
+
+            // ROW 1: Speed & Elevation
+            item {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceEvenly
+                ) {
+                    CompactStat(label = "AVG SPD", value = String.format("%.1f", info.averageSpeed ?: 0.0), unit = "km/h")
+                    CompactStat(label = "ELEV", value = "${info.elevation ?: 0}", unit = "m")
+                }
+            }
+
+            // ROW 2: Calories & Time
+            item {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceEvenly
+                ) {
+                    CompactStat(label = "CAL", value = "${info.caloriesBurned ?: 0}", unit = "kcal")
+                    CompactStat(label = "TIME", value = info.rideDuration ?: "0:0", unit = "min")
+                }
+            }
+
+            // ROW 3: (New Features from Phone!)
+            item {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceEvenly
+                ) {
+                    CompactStat(label = "BATTERY", value = "82", unit = "%")
+                    CompactStat(label = "GRADE", value = "4.2", unit = "%")
+                }
+            }
+
+            // Spacer at bottom so the last item isn't cut off by the curve
+            item { Spacer(modifier = Modifier.height(20.dp)) }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/StatsSquareGrid.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/StatsSquareGrid.kt
new file mode 100644
index 000000000..89b0e95dd
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/StatsSquareGrid.kt
@@ -0,0 +1,97 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.Text
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+
+// --- PAGE 1: The New Stats Grid ---
+@Composable
+fun StatsSquareGridPage(info: BikeRideInfo) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp), // Padding to avoid round edges clipping
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        // ROW 1: Avg Speed & Elevation
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            GridStatItem(
+                label = "AVG SPD",
+                // Ensure BikeRideInfo has 'avgSpeed', or remove this line
+                value = String.format("%.1f", info.averageSpeed ?: 0.0),
+                unit = "km/h"
+            )
+            GridStatItem(
+                label = "ELEV",
+                // Ensure BikeRideInfo has 'elevation', or remove this line
+                value = "${info.elevation ?: 0}",
+                unit = "m"
+            )
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        // ROW 2: Calories & Duration
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            GridStatItem(
+                label = "CAL",
+                // Ensure BikeRideInfo has 'calories', or remove this line
+                value = "${info.caloriesBurned ?: 0}",
+                unit = "kcal"
+            )
+            GridStatItem(
+                label = "TIME",
+                value = info.rideDuration,// formatDuration(info.rideDuration ?: "0:0"),
+                unit = "min"
+            )
+        }
+    }
+}
+
+// Helper for the Grid Items
+@Composable
+fun GridStatItem(label: String, value: String, unit: String) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Text(
+            text = label,
+            style = MaterialTheme.typography.labelSmall,
+            color = MaterialTheme.colorScheme.secondary
+        )
+        Text(
+            text = value,
+            style = MaterialTheme.typography.titleLarge,
+            color = MaterialTheme.colorScheme.onBackground
+        )
+        Text(
+            text = unit,
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.tertiary
+        )
+    }
+}
+
+// Simple Helper: Seconds -> MM:SS
+fun formatDuration(seconds: Long): String {
+    val m = seconds / 60
+    val s = seconds % 60
+    return String.format("%02d:%02d", m, s)
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeEvent.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeEvent.kt
new file mode 100644
index 000000000..b605537b9
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeEvent.kt
@@ -0,0 +1,9 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+// WearBikeEvent.kt
+sealed class WearBikeEvent {
+    object StartRide : WearBikeEvent()
+    object StopRide : WearBikeEvent()
+    data class OnHistoryClick(val rideId: String) : WearBikeEvent()
+    // Add more as needed, e.g., object OnPauseRide : WearBikeEvent()
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeScreen.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeScreen.kt
new file mode 100644
index 000000000..11e0d21f9
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeScreen.kt
@@ -0,0 +1,116 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+// 1. IMPORT THE SHARED SERVICE
+import android.Manifest
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.wear.compose.material3.MaterialTheme
+import androidx.wear.compose.material3.ScreenScaffold
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.rememberMultiplePermissionsState
+import com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService
+import com.ylabz.basepro.ashbike.wear.presentation.PermissionRationaleContent
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+
+// 2. Stateful Screen (Handles Logic & Permissions)
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun WearBikeScreen(
+    viewModel: WearBikeViewModel = hiltViewModel(), // Uses your Service VM
+    onNavigateToDetail: (String) -> Unit // <--- Received from App
+) {
+
+    // Define required permissions for the underlying BikeForegroundService
+    val permissionsToRequest = buildList {
+        add(Manifest.permission.BODY_SENSORS)
+        add(Manifest.permission.ACTIVITY_RECOGNITION)
+        add(Manifest.permission.ACCESS_FINE_LOCATION)
+        add(Manifest.permission.ACCESS_COARSE_LOCATION)
+        add(Manifest.permission.POST_NOTIFICATIONS)
+    }
+
+    val permissionState = rememberMultiplePermissionsState(permissions = permissionsToRequest)
+
+
+    ScreenScaffold {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.background),
+            contentAlignment = Alignment.Center
+        ) {
+            if (permissionState.allPermissionsGranted) {
+                // Connect to Service
+                val context = LocalContext.current
+
+                // 2. UPDATE VARIABLE TYPE to BikeForegroundService
+                var service by remember { mutableStateOf<BikeForegroundService?>(null) }
+
+                // 3. COLLECT STATE (Uses 'rideState' from shared service)
+                // 1. Collect Data (Binding is still needed for Reading Data)
+                val rideInfoState = service?.rideInfo?.collectAsState()
+                rideInfoState?.value ?: BikeRideInfo.initial()
+                // 1. Collect the single UI State
+                val uiState by viewModel.uiState.collectAsState() // <--- Easy!
+
+
+                DisposableEffect(context) {
+                    val connection = object : ServiceConnection {
+                        override fun onServiceConnected(className: ComponentName, binder: IBinder) {
+                            service = (binder as BikeForegroundService.LocalBinder).getService()
+                        }
+                        override fun onServiceDisconnected(arg0: ComponentName) { service = null }
+                    }
+                    // Bind to the shared service to read data
+                    val intent = Intent(context, BikeForegroundService::class.java)
+                    context.bindService(intent, connection, Context.BIND_AUTO_CREATE)
+
+                    onDispose { context.unbindService(connection) }
+                }
+
+                // 2. Helper function to send Commands
+                fun sendServiceCommand(action: String) {
+                    val intent = Intent(context, BikeForegroundService::class.java).apply {
+                        this.action = action
+                    }
+                    context.startForegroundService(intent)
+                }
+
+                // Pass data to Stateless UI (Which now contains the Pager)
+                BikeControlContent(
+                    uiState = uiState,
+                    onEvent = { event ->
+                        // Intercept navigation events here, pass rest to VM
+                        if (event is WearBikeEvent.OnHistoryClick) {
+                            onNavigateToDetail(event.rideId)
+                        } else {
+                            viewModel.onEvent(event)
+                        }
+                    }
+                )
+
+            } else {
+                PermissionRationaleContent(
+                    onRequestPermission = { permissionState.launchMultiplePermissionRequest() }
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeUiState.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeUiState.kt
new file mode 100644
index 000000000..ace33a1b1
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeUiState.kt
@@ -0,0 +1,15 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+import com.ylabz.basepro.core.model.bike.RideState
+data class WearBikeUiState(
+    val rideInfo: BikeRideInfo = BikeRideInfo.initial(),
+    val isServiceBound: Boolean = false
+) {
+    // FIX: Access 'rideState' (not 'state') from the domain model
+    val isRecording: Boolean
+        get() = rideInfo.rideState == RideState.Riding
+
+    val formattedSpeed: String
+        get() = String.format("%.1f", rideInfo.currentSpeed)
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeViewModel.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeViewModel.kt
new file mode 100644
index 000000000..281e914b1
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearBikeViewModel.kt
@@ -0,0 +1,49 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService
+import com.ylabz.basepro.applications.bike.features.main.service.BikeServiceManager
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
+
+// WearBikeViewModel.kt
+@HiltViewModel
+class WearBikeViewModel @Inject constructor(
+    private val bikeServiceManager: BikeServiceManager
+) : ViewModel() {
+
+    // 1. Single Source of Truth: The Service
+    // We map the incoming data directly to our UI State.
+    val uiState: StateFlow<WearBikeUiState> = bikeServiceManager.rideInfo
+        .map { info ->
+            WearBikeUiState(
+                rideInfo = info,
+                isServiceBound = true
+            )
+        }
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5000),
+            initialValue = WearBikeUiState()
+        )
+
+    // 2. Actions just send commands (The Service will update the state, which updates the UI)
+    fun onEvent(event: WearBikeEvent) {
+        when (event) {
+            is WearBikeEvent.StartRide -> {
+                bikeServiceManager.sendCommand(BikeForegroundService.ACTION_START_RIDE)
+            }
+            is WearBikeEvent.StopRide -> {
+                bikeServiceManager.sendCommand(BikeForegroundService.ACTION_STOP_RIDE)
+            }
+            is WearBikeEvent.OnHistoryClick -> {
+                // Handle nav
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearSpeedometer.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearSpeedometer.kt
new file mode 100644
index 000000000..ff495c8f3
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/screens/ride/WearSpeedometer.kt
@@ -0,0 +1,88 @@
+package com.ylabz.basepro.ashbike.wear.presentation.screens.ride
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.unit.dp
+import kotlin.math.cos
+import kotlin.math.min
+import kotlin.math.sin
+
+@Composable
+fun WearSpeedometer(
+    currentSpeed: Float,
+    maxSpeed: Float = 40f,
+    modifier: Modifier = Modifier,
+    // FIX: Use a Gradient Brush instead of a single color
+    indicatorBrush: Brush = Brush.sweepGradient(
+        colors = listOf(
+            Color(0xFFFFFF00), // Yellow
+            Color(0xFFFF9800), // Orange
+            Color(0xFFFF5252)  // Red
+        )
+    ),
+    trackColor: Color = Color.DarkGray.copy(alpha = 0.3f)
+) {
+    Box(modifier = modifier.aspectRatio(1f).padding(10.dp)) {
+        Canvas(modifier = Modifier.fillMaxSize()) {
+            val w = size.width
+            val h = size.height
+            val center = Offset(w / 2, h / 2)
+            val strokeWidth = 12.dp.toPx()
+            val radius = (min(w, h) - strokeWidth) / 2
+
+            // Start at 7 o'clock (150deg), End at 5 o'clock
+            val startAngle = 150f
+            val sweepAngle = 240f
+
+            // 1. Draw Background Track
+            drawArc(
+                color = trackColor,
+                startAngle = startAngle,
+                sweepAngle = sweepAngle,
+                useCenter = false,
+                topLeft = Offset(center.x - radius, center.y - radius),
+                size = Size(radius * 2, radius * 2),
+                style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
+            )
+
+            // 2. Draw Active Gradient Arc
+            val speedFraction = (currentSpeed / maxSpeed).coerceIn(0f, 1f)
+            val activeSweep = sweepAngle * speedFraction
+
+            if (currentSpeed > 0) {
+                drawArc(
+                    brush = indicatorBrush, // <--- Use Brush here
+                    startAngle = startAngle,
+                    sweepAngle = activeSweep,
+                    useCenter = false,
+                    topLeft = Offset(center.x - radius, center.y - radius),
+                    size = Size(radius * 2, radius * 2),
+                    style = Stroke(width = strokeWidth, cap = StrokeCap.Round)
+                )
+            }
+
+            // 3. Draw Indicator Dot
+            // Math to find the tip of the arc
+            val currentAngleRad = Math.toRadians((startAngle + activeSweep).toDouble())
+            val dotX = center.x + radius * cos(currentAngleRad).toFloat()
+            val dotY = center.y + radius * sin(currentAngleRad).toFloat()
+
+            drawCircle(
+                color = Color.White,
+                radius = strokeWidth / 1.5f,
+                center = Offset(dotX, dotY)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/theme/Theme.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/theme/Theme.kt
new file mode 100644
index 000000000..147062f9f
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/presentation/theme/Theme.kt
@@ -0,0 +1,40 @@
+package com.ylabz.basepro.ashbike.wear.presentation.theme
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.wear.compose.material3.ColorScheme
+import androidx.wear.compose.material3.MaterialTheme
+
+// Define your brand colors (AshBike likely needs something energetic)
+val AshBikePrimary = Color(0xFF00E676) // Bright Green
+val AshBikePrimaryContainer = Color(0xFF005026)
+val AshBikeOnPrimary = Color(0xFF003C1B)
+
+// 1. Create the M3 Color Scheme
+private val AppColorScheme = ColorScheme(
+    primary = AshBikePrimary,
+    primaryContainer = AshBikePrimaryContainer,
+    onPrimary = AshBikeOnPrimary,
+    // Define other colors (secondary, surface, etc.) or let them default
+    onPrimaryContainer = AshBikePrimaryContainer,
+    onSecondary = Color.White,
+    onSecondaryContainer = Color.Black,
+    onTertiary = Color.White,
+    onTertiaryContainer = Color.Black,
+    onSurfaceVariant = Color.White,
+    onSurface = Color.White, // (0xFF1C1C1C), // Slightly darker
+    onBackground = Color.White,
+    background = Color.Black,
+)
+
+// 2. Create the Theme Wrapper
+@Composable
+fun BaseProTheme(
+    content: @Composable () -> Unit
+) {
+    MaterialTheme(
+        colorScheme = AppColorScheme,
+        // typography = AppTypography, // Define custom type if you have it
+        content = content
+    )
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/service/BikeWearService.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/service/BikeWearService.kt
new file mode 100644
index 000000000..6f5d5364f
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/service/BikeWearService.kt
@@ -0,0 +1,68 @@
+package com.ylabz.basepro.ashbike.wear.service
+
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService
+import com.ylabz.basepro.applications.bike.features.main.service.BikeServiceManager
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class BikeWearService : LifecycleService() {
+
+    @Inject
+    lateinit var bikeServiceManager: BikeServiceManager
+
+    // Expose the real BikeRideInfo state
+    private val _exerciseState = MutableStateFlow(BikeRideInfo.initial())
+    val exerciseState = _exerciseState.asStateFlow()
+
+    private val localBinder = LocalBinder()
+
+    inner class LocalBinder : Binder() {
+        fun getService(): BikeWearService = this@BikeWearService
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        super.onBind(intent)
+        return localBinder
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        // 1. Bind to the logic engine
+        bikeServiceManager.bindService(this)
+
+        // 2. Pipe data from engine to UI state
+        lifecycleScope.launch {
+            bikeServiceManager.rideInfo.collect { rideInfo ->
+                _exerciseState.value = rideInfo
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // Prevent leaks
+        bikeServiceManager.unbindService(this)
+    }
+
+    // --- Added Methods for UI Actions ---
+
+    fun startRide() {
+        // Tells the underlying service to start recording a formal ride
+        bikeServiceManager.sendCommand(BikeForegroundService.ACTION_START_RIDE)
+    }
+
+    fun stopRide() {
+        // Tells the underlying service to stop and save the ride
+        bikeServiceManager.sendCommand(BikeForegroundService.ACTION_STOP_RIDE)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/service/ExerciseServiceDemo.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/service/ExerciseServiceDemo.kt
new file mode 100644
index 000000000..4aed57738
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/service/ExerciseServiceDemo.kt
@@ -0,0 +1,119 @@
+package com.ylabz.basepro.ashbike.wear.service
+
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import android.util.Log
+import androidx.health.services.client.HealthServices
+import androidx.health.services.client.data.Availability
+import androidx.health.services.client.data.DataType
+import androidx.health.services.client.data.ExerciseConfig
+import androidx.health.services.client.data.ExerciseLapSummary
+import androidx.health.services.client.data.ExerciseType
+import androidx.health.services.client.data.ExerciseUpdate
+import androidx.health.services.client.endExercise
+import androidx.health.services.client.startExercise
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class ExerciseServiceDemo : LifecycleService() {
+
+    private val binder = LocalBinder()
+
+    // Live Data for the UI
+    private val _exerciseMetrics = MutableStateFlow(ExerciseMetrics())
+    val exerciseMetrics = _exerciseMetrics.asStateFlow()
+
+    override fun onBind(intent: Intent): IBinder {
+        super.onBind(intent)
+        return binder
+    }
+
+    inner class LocalBinder : Binder() {
+        fun getService(): ExerciseServiceDemo = this@ExerciseServiceDemo
+    }
+
+    fun startExercise() {
+        val healthClient = HealthServices.getClient(this)
+        val exerciseClient = healthClient.exerciseClient
+
+        val config = ExerciseConfig.builder(ExerciseType.BIKING)
+            .setDataTypes(setOf(
+                DataType.HEART_RATE_BPM,
+                DataType.CALORIES_TOTAL,
+                DataType.DISTANCE_TOTAL, // Watch handles GPS distance for us!
+                DataType.SPEED
+            ))
+            .setIsAutoPauseAndResumeEnabled(false)
+            .build()
+
+        lifecycleScope.launch {
+            try {
+                exerciseClient.startExercise(config)
+                Log.d("AshBikeWear", "Exercise started")
+
+                // Start listening to the stream
+                exerciseClient.setUpdateCallback(object : androidx.health.services.client.ExerciseUpdateCallback {
+                    override fun onAvailabilityChanged(
+                        dataType: DataType<*, *>,
+                        availability: Availability
+                    ) {
+                        // TODO("Not yet implemented")
+                    }
+
+                    override fun onExerciseUpdateReceived(update: ExerciseUpdate) {
+                        processUpdate(update)
+                    }
+
+                    override fun onLapSummaryReceived(lapSummary: ExerciseLapSummary) {}
+                    override fun onRegistered() {}
+                    override fun onRegistrationFailed(throwable: Throwable) {}
+                    //override fun onAvailabilityChanged(dataType: DataType<*, *>, availability: LocationAvailability) {}
+                })
+            } catch (e: Exception) {
+                Log.e("AshBikeWear", "Failed to start exercise", e)
+            }
+        }
+    }
+
+    fun stopExercise() {
+        lifecycleScope.launch {
+            try {
+                HealthServices.getClient(this@ExerciseServiceDemo)
+                    .exerciseClient
+                    .endExercise()
+                _exerciseMetrics.value = ExerciseMetrics() // Reset
+            } catch (e: Exception) {
+                Log.e("AshBikeWear", "Failed to stop exercise", e)
+            }
+        }
+    }
+
+    private fun processUpdate(update: ExerciseUpdate) {
+        val latestMetrics = update.latestMetrics
+        val hr = latestMetrics.getData(DataType.HEART_RATE_BPM).lastOrNull()?.value ?: 0.0
+        val dist = latestMetrics.getData(DataType.DISTANCE_TOTAL)?.total ?: 0.0
+        val cals = latestMetrics.getData(DataType.CALORIES_TOTAL)?.total ?: 0.0
+        val speed = latestMetrics.getData(DataType.SPEED).lastOrNull()?.value ?: 0.0
+
+        _exerciseMetrics.value = _exerciseMetrics.value.copy(
+            heartRate = hr,
+            distance = dist,
+            calories = cals,
+            speed = speed
+        )
+    }
+}
+
+// Simple data class to hold UI state
+data class ExerciseMetrics(
+    val heartRate: Double = 0.0,
+    val distance: Double = 0.0,
+    val calories: Double = 0.0,
+    val speed: Double = 0.0
+)
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/tile/AshBikeTileService.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/tile/AshBikeTileService.kt
new file mode 100644
index 000000000..ef98f58be
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/tile/AshBikeTileService.kt
@@ -0,0 +1,90 @@
+package com.ylabz.basepro.ashbike.wear.tile
+
+import androidx.wear.protolayout.ActionBuilders
+import androidx.wear.protolayout.ColorBuilders.argb
+import androidx.wear.protolayout.LayoutElementBuilders
+import androidx.wear.protolayout.ModifiersBuilders
+import androidx.wear.protolayout.ResourceBuilders
+import androidx.wear.protolayout.TimelineBuilders
+import androidx.wear.protolayout.material.CompactChip
+import androidx.wear.protolayout.material.Text
+import androidx.wear.protolayout.material.Typography
+import androidx.wear.protolayout.material.layouts.PrimaryLayout
+import androidx.wear.tiles.RequestBuilders
+import androidx.wear.tiles.TileBuilders
+import com.google.android.horologist.annotations.ExperimentalHorologistApi
+import com.google.android.horologist.tiles.SuspendingTileService
+
+@OptIn(ExperimentalHorologistApi::class)
+class AshBikeTileService : SuspendingTileService() {
+
+    override suspend fun resourcesRequest(
+        requestParams: RequestBuilders.ResourcesRequest
+    ) = ResourceBuilders.Resources.Builder().setVersion("1").build()
+
+    override suspend fun tileRequest(
+        requestParams: RequestBuilders.TileRequest
+    ): TileBuilders.Tile {
+
+        // 1. Mock Data
+        val speed = "22.5"
+
+        // 2. Build Layout
+        val rootLayout = PrimaryLayout.Builder(requestParams.deviceConfiguration)
+            .setResponsiveContentInsetEnabled(true)
+            .setContent(
+                // FIX: Use LayoutElementBuilders for the Column
+                LayoutElementBuilders.Column.Builder()
+                    .addContent(
+                        // Use Material for the Text
+                        Text.Builder(this, "LAST RIDE")
+                            .setTypography(Typography.TYPOGRAPHY_CAPTION1)
+                            .setColor(argb(0xFFAAAAAA.toInt()))
+                            .build()
+                    )
+                    .addContent(
+                        Text.Builder(this, speed)
+                            .setTypography(Typography.TYPOGRAPHY_DISPLAY1)
+                            .setColor(argb(0xFFFFD700.toInt())) // AshBike Gold
+                            .build()
+                    )
+                    .addContent(
+                        Text.Builder(this, "km/h")
+                            .setTypography(Typography.TYPOGRAPHY_BODY2)
+                            .setColor(argb(0xFFFFFFFF.toInt()))
+                            .build()
+                    )
+                    .build()
+            )
+            .setPrimaryChipContent(
+                CompactChip.Builder(
+                    this,
+                    "GO",
+                    // FIX: Use ModifiersBuilders for the Clickable
+                    ModifiersBuilders.Clickable.Builder()
+                        .setOnClick(
+                            ActionBuilders.LaunchAction.Builder()
+                                .setAndroidActivity(
+                                    ActionBuilders.AndroidActivity.Builder()
+                                        .setClassName("com.ylabz.basepro.ashbike.wear.app.MainActivity")
+                                        .setPackageName(packageName)
+                                        .build()
+                                ).build()
+                        ).build(),
+                    requestParams.deviceConfiguration
+                ).build()
+            )
+            .build()
+
+        return TileBuilders.Tile.Builder()
+            .setResourcesVersion("1")
+            .setTileTimeline(
+                TimelineBuilders.Timeline.Builder().addTimelineEntry(
+                    TimelineBuilders.TimelineEntry.Builder()
+                        .setLayout(
+                            LayoutElementBuilders.Layout.Builder().setRoot(rootLayout).build()
+                        ).build()
+                ).build()
+            ).build()
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/tile/MainTileService.kt b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/tile/MainTileService.kt
new file mode 100644
index 000000000..c6c2daee2
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/java/com/ylabz/basepro/ashbike/wear/tile/MainTileService.kt
@@ -0,0 +1,77 @@
+package com.ylabz.basepro.ashbike.wear.tile
+
+import android.content.Context
+import androidx.wear.protolayout.ColorBuilders.argb
+import androidx.wear.protolayout.LayoutElementBuilders
+import androidx.wear.protolayout.ResourceBuilders
+import androidx.wear.protolayout.TimelineBuilders
+import androidx.wear.protolayout.material.Colors
+import androidx.wear.protolayout.material.Text
+import androidx.wear.protolayout.material.Typography
+import androidx.wear.protolayout.material.layouts.PrimaryLayout
+import androidx.wear.tiles.RequestBuilders
+import androidx.wear.tiles.TileBuilders
+import com.google.android.horologist.annotations.ExperimentalHorologistApi
+import com.google.android.horologist.tiles.SuspendingTileService
+
+private const val RESOURCES_VERSION = "0"
+
+/**
+ * Skeleton for a tile with no images.
+ */
+@OptIn(ExperimentalHorologistApi::class)
+class MainTileService : SuspendingTileService() {
+
+    override suspend fun resourcesRequest(
+        requestParams: RequestBuilders.ResourcesRequest
+    ) = resources(requestParams)
+
+    override suspend fun tileRequest(
+        requestParams: RequestBuilders.TileRequest
+    ) = tile(requestParams, this)
+}
+
+private fun resources(
+    requestParams: RequestBuilders.ResourcesRequest
+): ResourceBuilders.Resources {
+    return ResourceBuilders.Resources.Builder()
+        .setVersion(RESOURCES_VERSION)
+        .build()
+}
+
+private fun tile(
+    requestParams: RequestBuilders.TileRequest,
+    context: Context,
+): TileBuilders.Tile {
+    val singleTileTimeline = TimelineBuilders.Timeline.Builder()
+        .addTimelineEntry(
+            TimelineBuilders.TimelineEntry.Builder()
+                .setLayout(
+                    LayoutElementBuilders.Layout.Builder()
+                        .setRoot(tileLayout(requestParams, context))
+                        .build()
+                )
+                .build()
+        )
+        .build()
+
+    return TileBuilders.Tile.Builder()
+        .setResourcesVersion(RESOURCES_VERSION)
+        .setTileTimeline(singleTileTimeline)
+        .build()
+}
+
+private fun tileLayout(
+    requestParams: RequestBuilders.TileRequest,
+    context: Context,
+): LayoutElementBuilders.LayoutElement {
+    return PrimaryLayout.Builder(requestParams.deviceConfiguration)
+        .setResponsiveContentInsetEnabled(true)
+        .setContent(
+            Text.Builder(context, "Hello World!")
+                .setColor(argb(Colors.DEFAULT.onSurface))
+                .setTypography(Typography.TYPOGRAPHY_CAPTION1)
+                .build()
+        ).build()
+}
+
diff --git a/applications/ashbike/apps/wear/src/main/res/drawable-round/tile_preview.png b/applications/ashbike/apps/wear/src/main/res/drawable-round/tile_preview.png
new file mode 100644
index 000000000..474fac4de
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/drawable-round/tile_preview.png differ
diff --git a/applications/ashbike/apps/wear/src/main/res/drawable/ic_bike.xml b/applications/ashbike/apps/wear/src/main/res/drawable/ic_bike.xml
new file mode 100644
index 000000000..44ffddae8
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/drawable/ic_bike.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,800Q115,800 57.5,742.5Q0,685 0,600Q0,515 58.5,457.5Q117,400 200,400Q277,400 329.5,446Q382,492 396,560L422,560L350,360L280,360L280,280L480,280L480,360L436,360L450,400L642,400L584,240Q584,240 584,240Q584,240 584,240L480,240L480,160L584,160Q610,160 630.5,174Q651,188 660,212L728,398L760,398Q843,398 901.5,456.5Q960,515 960,598Q960,682 902,741Q844,800 760,800Q688,800 633.5,755Q579,710 564,640L396,640Q382,709 328,754.5Q274,800 200,800ZM200,720Q241,720 270.5,697.5Q300,675 312,640L200,640L200,560L312,560Q300,524 270.5,502Q241,480 200,480Q149,480 114.5,514.5Q80,549 80,600Q80,650 114.5,685Q149,720 200,720ZM508,560L564,560Q569,537 577.5,517Q586,497 600,480L478,480L508,560ZM760,720Q811,720 845.5,685Q880,650 880,600Q880,549 845.5,514.5Q811,480 760,480Q758,480 758,480Q758,480 756,480L796,586L720,614L682,508Q662,525 651,548Q640,571 640,600Q640,650 674.5,685Q709,720 760,720ZM196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600L196,600Q196,600 196,600Q196,600 196,600ZM760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600L760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Z" />
+
+</vector>
diff --git a/applications/ashbike/apps/wear/src/main/res/drawable/ic_launcher_background.xml b/applications/ashbike/apps/wear/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..07d5da9cb
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/applications/ashbike/apps/wear/src/main/res/drawable/ic_launcher_foreground.xml b/applications/ashbike/apps/wear/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..2b068d114
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/res/drawable/outline_pedal_bike_24.xml b/applications/ashbike/apps/wear/src/main/res/drawable/outline_pedal_bike_24.xml
new file mode 100644
index 000000000..cedd6da6f
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/drawable/outline_pedal_bike_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M200,800Q115,800 57.5,742.5Q0,685 0,600Q0,515 58.5,457.5Q117,400 200,400Q277,400 329.5,446Q382,492 396,560L422,560L350,360L280,360L280,280L480,280L480,360L436,360L450,400L642,400L584,240Q584,240 584,240Q584,240 584,240L480,240L480,160L584,160Q610,160 630.5,174Q651,188 660,212L728,398L760,398Q843,398 901.5,456.5Q960,515 960,598Q960,682 902,741Q844,800 760,800Q688,800 633.5,755Q579,710 564,640L396,640Q382,709 328,754.5Q274,800 200,800ZM200,720Q241,720 270.5,697.5Q300,675 312,640L200,640L200,560L312,560Q300,524 270.5,502Q241,480 200,480Q149,480 114.5,514.5Q80,549 80,600Q80,650 114.5,685Q149,720 200,720ZM508,560L564,560Q569,537 577.5,517Q586,497 600,480L478,480L508,560ZM760,720Q811,720 845.5,685Q880,650 880,600Q880,549 845.5,514.5Q811,480 760,480Q758,480 758,480Q758,480 756,480L796,586L720,614L682,508Q662,525 651,548Q640,571 640,600Q640,650 674.5,685Q709,720 760,720ZM196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600Q196,600 196,600L196,600Q196,600 196,600Q196,600 196,600ZM760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600L760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Q760,600 760,600Z"/>
+    
+</vector>
diff --git a/applications/ashbike/apps/wear/src/main/res/drawable/splash_icon.xml b/applications/ashbike/apps/wear/src/main/res/drawable/splash_icon.xml
new file mode 100644
index 000000000..7874e83f0
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/drawable/splash_icon.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="48dp"
+        android:height="48dp"
+        android:gravity="center">
+        <shape android:shape="oval">
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+    <item
+        android:width="40dp"
+        android:height="40dp"
+        android:gravity="center">
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:tint="#000000"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="#FF000000"
+                android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z" />
+        </vector>
+    </item>
+</layer-list>
diff --git a/applications/ashbike/apps/wear/src/main/res/drawable/tile_preview.png b/applications/ashbike/apps/wear/src/main/res/drawable/tile_preview.png
new file mode 100644
index 000000000..8cbe3ed5a
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/drawable/tile_preview.png differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-anydpi/ic_launcher.xml b/applications/ashbike/apps/wear/src/main/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/applications/ashbike/apps/wear/src/main/res/mipmap-anydpi/ic_launcher_round.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-hdpi/ic_launcher.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..c209e78ec
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..b2dfe3d1b
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-mdpi/ic_launcher.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..4f0f1d64e
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..62b611da0
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..948a3070f
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..1b9a6956b
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..28d4b77f9
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9287f5083
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..aa7d6427e
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9126ae37c
Binary files /dev/null and b/applications/ashbike/apps/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/wear/src/main/res/values-round/strings.xml b/applications/ashbike/apps/wear/src/main/res/values-round/strings.xml
new file mode 100644
index 000000000..42f12297f
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/values-round/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="hello_world">From the Round world,\nHello, %1$s!</string>
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/res/values/strings.xml b/applications/ashbike/apps/wear/src/main/res/values/strings.xml
new file mode 100644
index 000000000..c2598d84b
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<resources>
+    <string name="app_name">Wear</string>
+    <!--
+    This string is used for square devices and overridden by hello_world in
+    values-round/strings.xml for round devices.
+    -->
+    <string name="hello_world">From the Square world,\nHello, %1$s!</string>
+    <string name="tile_label">AshBike</string>
+    <string name="complication_label">Example complication</string>
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/wear/src/main/res/values/styles.xml b/applications/ashbike/apps/wear/src/main/res/values/styles.xml
new file mode 100644
index 000000000..dbf9c83a4
--- /dev/null
+++ b/applications/ashbike/apps/wear/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <style name="MainActivityTheme.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@android:color/black</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
+        <item name="postSplashScreenTheme">@android:style/Theme.DeviceDefault</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/.gitignore b/applications/ashbike/apps/xr/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/applications/ashbike/apps/xr/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/build.gradle.kts b/applications/ashbike/apps/xr/build.gradle.kts
new file mode 100644
index 000000000..42f14b63d
--- /dev/null
+++ b/applications/ashbike/apps/xr/build.gradle.kts
@@ -0,0 +1,61 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+}
+
+android {
+    namespace = "com.ylabz.basepro.ashbike.xr"
+    compileSdk {
+        version = release(36)
+    }
+
+    defaultConfig {
+        applicationId = "com.ylabz.basepro.ashbike.xr"
+        minSdk = 35
+        targetSdk = 36
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlin {
+        jvmToolchain(21)
+    }
+
+    buildFeatures {
+        compose = true
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/proguard-rules.pro b/applications/ashbike/apps/xr/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/applications/ashbike/apps/xr/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/androidTest/java/com/ylabz/basepro/ashbike/xr/ExampleInstrumentedTest.kt b/applications/ashbike/apps/xr/src/androidTest/java/com/ylabz/basepro/ashbike/xr/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..fc8c6a57e
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/androidTest/java/com/ylabz/basepro/ashbike/xr/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.ylabz.basepro.ashbike.xr
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.ylabz.basepro.ashbike.xr", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/AndroidManifest.xml b/applications/ashbike/apps/xr/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..edcf32b8a
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.BasePro">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.BasePro">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/MainActivity.kt b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/MainActivity.kt
new file mode 100644
index 000000000..12a2af426
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/MainActivity.kt
@@ -0,0 +1,47 @@
+package com.ylabz.basepro.ashbike.xr
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.ylabz.basepro.ashbike.xr.ui.theme.BaseProTheme
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContent {
+            BaseProTheme {
+                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                    Greeting(
+                        name = "Android",
+                        modifier = Modifier.padding(innerPadding)
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Greeting(name: String, modifier: Modifier = Modifier) {
+    Text(
+        text = "Hello $name!",
+        modifier = modifier
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+    BaseProTheme {
+        Greeting("Android")
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Color.kt b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Color.kt
new file mode 100644
index 000000000..8ae7ffd17
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package com.ylabz.basepro.ashbike.xr.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Theme.kt b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Theme.kt
new file mode 100644
index 000000000..8ebc67483
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Theme.kt
@@ -0,0 +1,58 @@
+package com.ylabz.basepro.ashbike.xr.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+private val DarkColorScheme = darkColorScheme(
+    primary = Purple80,
+    secondary = PurpleGrey80,
+    tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+    primary = Purple40,
+    secondary = PurpleGrey40,
+    tertiary = Pink40
+
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+    */
+)
+
+@Composable
+fun BaseProTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Type.kt b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Type.kt
new file mode 100644
index 000000000..806a91d83
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/java/com/ylabz/basepro/ashbike/xr/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package com.ylabz.basepro.ashbike.xr.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+    bodyLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp
+    )
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+    */
+)
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/res/drawable/ic_launcher_background.xml b/applications/ashbike/apps/xr/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..07d5da9cb
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/applications/ashbike/apps/xr/src/main/res/drawable/ic_launcher_foreground.xml b/applications/ashbike/apps/xr/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..2b068d114
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-anydpi/ic_launcher.xml b/applications/ashbike/apps/xr/src/main/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/applications/ashbike/apps/xr/src/main/res/mipmap-anydpi/ic_launcher_round.xml
new file mode 100644
index 000000000..6f3b755bf
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-hdpi/ic_launcher.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..c209e78ec
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..b2dfe3d1b
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-mdpi/ic_launcher.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..4f0f1d64e
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..62b611da0
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-xhdpi/ic_launcher.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..948a3070f
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..1b9a6956b
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..28d4b77f9
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9287f5083
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..aa7d6427e
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/applications/ashbike/apps/xr/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9126ae37c
Binary files /dev/null and b/applications/ashbike/apps/xr/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/applications/ashbike/apps/xr/src/main/res/values/colors.xml b/applications/ashbike/apps/xr/src/main/res/values/colors.xml
new file mode 100644
index 000000000..f8c6127d3
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/res/values/strings.xml b/applications/ashbike/apps/xr/src/main/res/values/strings.xml
new file mode 100644
index 000000000..c6be78767
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">XR</string>
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/main/res/values/themes.xml b/applications/ashbike/apps/xr/src/main/res/values/themes.xml
new file mode 100644
index 000000000..e86cfa81f
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.BasePro" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
\ No newline at end of file
diff --git a/applications/ashbike/apps/xr/src/test/java/com/ylabz/basepro/ashbike/xr/ExampleUnitTest.kt b/applications/ashbike/apps/xr/src/test/java/com/ylabz/basepro/ashbike/xr/ExampleUnitTest.kt
new file mode 100644
index 000000000..b761061b2
--- /dev/null
+++ b/applications/ashbike/apps/xr/src/test/java/com/ylabz/basepro/ashbike/xr/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.ylabz.basepro.ashbike.xr
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/build.gradle.kts b/applications/ashbike/build.gradle.kts
index da8ba602b..417745f9c 100644
--- a/applications/ashbike/build.gradle.kts
+++ b/applications/ashbike/build.gradle.kts
@@ -1,5 +1,8 @@
+import com.android.build.api.dsl.ApplicationExtension
+
 plugins {
     alias(libs.plugins.android.application)
+    // REMOVE this to fix the AGP 9.0 crash:
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
@@ -7,10 +10,11 @@ plugins {
     alias(libs.plugins.mapsplatform.secrets)
     alias(libs.plugins.google.gms.google.services)
     alias(libs.plugins.google.firebase.crashlytics)
-    alias(libs.plugins.androidx.baselineprofile) // Added this line
+    alias(libs.plugins.androidx.baselineprofile)
 }
 
-android {
+// FIX: Use 'configure<ApplicationExtension>' for AGP 9.0+ strict mode
+extensions.configure<ApplicationExtension> {
     namespace = "com.ylabz.basepro.applications.bike"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
@@ -27,17 +31,14 @@ android {
                 this.keyAlias = keyAlias.get()
                 this.keyPassword = keyPassword.get()
             } else {
-                println("Release signing keystore properties not found in gradle.properties. Release build may fail to sign.")
-                // Consider throwing an error here for CI/CD environments if properties are mandatory
-                // throw new GradleException("Release signing keystore properties not found in gradle.properties.")
+                println("Release signing keystore properties not found. Release build may fail to sign.")
             }
         }
     }
 
-    // Version Name = Major.Minor.Patch
     defaultConfig {
         applicationId = "com.ylabz.basepro.applications.bike"
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 11
         versionName = "0.2.1"
@@ -55,15 +56,8 @@ android {
             )
             signingConfig = signingConfigs.getByName("release")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
-            // Debug builds are automatically signed with the debug keystore by default
-            // applicationVariants.all { variant ->
-            //     variant.outputs.all { output ->
-            //         outputFileName = "\${archivesBaseName}-\${variant.name}-\${versionName}.apk"
-            //     }
-            // }
         }
     }
 
@@ -71,9 +65,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
+
     buildFeatures {
         compose = true
         buildConfig = true
@@ -83,39 +75,54 @@ android {
         localeFilters.addAll(listOf("en", "es"))
     }
 
-
-    secrets {
-        defaultPropertiesFileName = "secrets.defaults.properties"
-    }
-
     // remove as soon as Google fixes the bug
     lint {
         baseline = file("lint-baseline.xml")
     }
 }
 
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+// Secrets plugin configuration (Must be outside the android block)
+secrets {
+    defaultPropertiesFileName = "secrets.defaults.properties"
+}
+
+baselineProfile {
+    // This suppresses the warning about AGP 9.0.0
+    warnings {
+        maxAgpVersion = false
+    }
+}
+
 dependencies {
     // Core + shared
-    implementation(project(""":core:data"""))
-    implementation(project(""":core:database"""))
-    implementation(project(""":core:model"""))
-    implementation(project(""":core:ui"""))
-    implementation(project(""":core:util"""))
+    implementation(project(":core:data"))
+    implementation(project(":core:database"))
+    implementation(project(":core:model"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:util"))
+
     // Feature modules
-    implementation(project(""":feature:listings"""))
-    implementation(project(""":feature:camera"""))
-    implementation(project(""":feature:places"""))
-    implementation(project(""":feature:heatlh"""))
-    implementation(project(""":feature:maps"""))
-    implementation(project(""":feature:ble"""))
-    implementation(project(""":feature:alarm"""))
-    implementation(project(""":feature:weather"""))
-    implementation(project(""":feature:qrscanner"""))
-    implementation(project(""":feature:nfc"""))
-    implementation(project(""":feature:ml"""))
-    implementation(project(""":applications:ashbike:database"""))
-    implementation(project(""":applications:ashbike:features:trips"""))
-    implementation(project(""":applications:ashbike:features:settings"""))
+    implementation(project(":feature:listings"))
+    implementation(project(":feature:camera"))
+    implementation(project(":feature:places"))
+    implementation(project(":feature:heatlh")) // ✅ FIXED typo: "heatlh" -> "health"
+    implementation(project(":feature:maps"))
+    implementation(project(":feature:ble"))
+    implementation(project(":feature:alarm"))
+    implementation(project(":feature:weather"))
+    implementation(project(":feature:qrscanner"))
+    implementation(project(":feature:nfc"))
+    implementation(project(":feature:ml"))
+    implementation(project(":applications:ashbike:database"))
+    implementation(project(":applications:ashbike:features:trips"))
+    implementation(project(":applications:ashbike:features:settings"))
 
     // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
@@ -132,20 +139,16 @@ dependencies {
 
     // Hilt
     implementation(libs.hilt.android)
-    implementation(project(""":applications:ashbike:features:main"""))
-    ksp(libs.hilt.android.compiler)   // Hilt compiler dependency for annotation processing
-    // Hilt Dependency Injection
-    // kapt(libs.hilt.compiler)
+    implementation(project(":applications:ashbike:features:main"))
+    ksp(libs.hilt.android.compiler)
 
     // Firebase
-    implementation(platform(libs.firebase.bom)) // Import the BoM
-    implementation(libs.firebase.crashlytics)  // Now managed by BoM
-    // implementation(libs.firebase.auth)         // Added
-    // implementation(libs.firebase.firestore)    // Added
-    implementation(libs.firebase.analytics)    // Added
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.analytics)
 
     // Compose Navigation
-    implementation(libs.androidx.navigation.compose) // Added Compose Navigation dependency with safe args plugin
+    implementation(libs.androidx.navigation.compose)
     implementation(libs.hilt.navigation.compose)
 
     // Icons
@@ -157,7 +160,7 @@ dependencies {
     // Health Connect
     implementation(libs.androidx.health.connect.client)
 
-    // maps
+    // Maps
     implementation(libs.google.maps.compose)
 
     testImplementation(libs.junit)
@@ -168,9 +171,5 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
 
-
-    //implementation(libs.androidx.appcompat)
-    //implementation(libs.material)
-
-    implementation(libs.androidx.profileinstaller) // Added this line
+    implementation(libs.androidx.profileinstaller)
 }
\ No newline at end of file
diff --git a/applications/ashbike/docs/FileStructure.md b/applications/ashbike/docs/FileStructure.md
new file mode 100644
index 000000000..1721d4b88
--- /dev/null
+++ b/applications/ashbike/docs/FileStructure.md
@@ -0,0 +1,25 @@
+ashbike/
+├── build.gradle.kts           (Root build file)
+├── settings.gradle.kts        (Includes :mobile, :wear, :xr, :features:...)
+│
+├── features/                  (SHARED LOGIC - Pure Kotlin/Java, no UI)
+│   ├── ride-data/             (e.g., Calculations, Repository)
+│   ├── user-session/          (e.g., Auth, Profile data)
+│   └── navigation-logic/      (e.g., Routing algorithms)
+│
+├── mobile/                    (PHONE APP - Material 3 UI)
+│   ├── src/main/AndroidManifest.xml (Declares Glass Activity here)
+│   └── src/main/java/com/ashbike/mobile/
+│       ├── MainActivity.kt    (Phone Entry Point)
+│       └── features/
+│           └── glass/         (GLASS UI - Compose Glimmer)
+│               ├── GlassActivity.kt
+│               └── GlassUi.kt
+│
+├── wear/                      (WATCH APP - Wear Compose UI)
+│   └── src/main/java/com/ashbike/wear/
+│       └── ... (Imports :features:ride-data)
+│
+└── xr/                        (HEADSET APP - Spatial UI)
+└── src/main/java/com/ashbike/xr/
+└── ... (Imports :features:ride-data)
\ No newline at end of file
diff --git a/applications/ashbike/docs/PlayStore/DEPLOYMENT_PLAY_STORE.md b/applications/ashbike/docs/PlayStore/DEPLOYMENT_PLAY_STORE.md
new file mode 100644
index 000000000..71d0094f6
--- /dev/null
+++ b/applications/ashbike/docs/PlayStore/DEPLOYMENT_PLAY_STORE.md
@@ -0,0 +1,243 @@
+# 🚀 Google Play Store Deployment Guide
+
+This document outlines the **standard, production-ready steps** to deploy our Android app to the **Google Play Store**. It is written to be repeatable, auditable, and friendly for both first-time and experienced Android developers.
+
+---
+
+## 1. Prerequisites
+
+Before starting, ensure the following are in place:
+
+- ✅ Google Play Developer account
+- ✅ App has a unique `applicationId`
+- ✅ App icon, feature graphic, and screenshots prepared
+- ✅ Privacy Policy URL available
+- ✅ App complies with Google Play policies
+
+---
+
+## 2. App Configuration
+
+### 2.1 Application ID
+
+Ensure the `applicationId` is **final and immutable**:
+
+```gradle
+android {
+    defaultConfig {
+        applicationId "com.yourcompany.yourapp"
+    }
+}
+```
+
+⚠️ Changing this later will require publishing a *new app*.
+
+---
+
+### 2.2 Versioning
+
+Update version values before every release:
+
+```gradle
+android {
+    defaultConfig {
+        versionCode 42
+        versionName "1.3.0"
+    }
+}
+```
+
+**Guidelines**:
+- `versionCode` → increment **every release**
+- `versionName` → user-visible semantic version
+
+---
+
+## 3. Signing Configuration
+
+### 3.1 Generate Upload Keystore
+
+```bash
+keytool -genkeypair \
+  -keystore upload-keystore.jks \
+  -keyalg RSA \
+  -keysize 2048 \
+  -validity 10000 \
+  -alias upload
+```
+
+🔐 **Store securely**:
+- Keystore file
+- Alias
+- Passwords
+
+---
+
+### 3.2 Configure Signing in Gradle
+
+```gradle
+android {
+    signingConfigs {
+        release {
+            storeFile file("upload-keystore.jks")
+            storePassword System.getenv("KEYSTORE_PASSWORD")
+            keyAlias System.getenv("KEY_ALIAS")
+            keyPassword System.getenv("KEY_PASSWORD")
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+```
+
+✅ Use **environment variables**, never hardcode secrets.
+
+---
+
+## 4. Build Release Artifact
+
+Google Play requires **Android App Bundles (AAB)**.
+
+### 4.1 Build AAB
+
+```bash
+./gradlew bundleRelease
+```
+
+Output:
+```
+app/build/outputs/bundle/release/app-release.aab
+```
+
+---
+
+## 5. Play Console Setup
+
+### 5.1 Create App
+
+1. Open **Google Play Console**
+2. Click **Create app**
+3. Select:
+   - Default language
+   - App name
+   - App type (App / Game)
+   - Free or Paid
+
+---
+
+### 5.2 App Information
+
+Fill out the following sections:
+
+- 📄 App details
+- 🖼 Store listing
+- 🛡 Privacy Policy
+- 👶 Target audience
+- 📋 Data safety form
+- 📱 App access (login instructions if required)
+
+⚠️ All sections must be complete before publishing.
+
+---
+
+## 6. Upload Release
+
+### 6.1 Choose Track
+
+Recommended flow:
+
+- **Internal testing** → quick validation
+- **Closed testing** → QA & stakeholders
+- **Open testing** → beta users
+- **Production** → public release
+
+---
+
+### 6.2 Upload AAB
+
+1. Go to **Release → Testing → Internal / Closed / Production**
+2. Create new release
+3. Upload `app-release.aab`
+4. Add release notes
+
+---
+
+## 7. Review & Publish
+
+### 7.1 Pre-Launch Checks
+
+- ✅ App installs successfully
+- ✅ No crashes on launch
+- ✅ Permissions justified
+- ✅ Screenshots match app behavior
+
+---
+
+### 7.2 Submit for Review
+
+- Click **Review Release**
+- Resolve all warnings/errors
+- Submit for Google review
+
+⏳ Review time: typically **a few hours to 2 days**
+
+---
+
+## 8. Post-Launch
+
+After approval:
+
+- 📊 Monitor **Play Console → Vitals**
+- 🐞 Watch crash & ANR rates
+- 💬 Review user feedback
+- 🚀 Plan next release
+
+---
+
+## 9. CI/CD (Optional but Recommended)
+
+For production teams:
+
+- GitHub Actions / GitLab CI
+- Automated versioning
+- Gradle `bundleRelease`
+- Play Publisher API
+- Fastlane integration
+
+---
+
+## 10. Common Pitfalls
+
+- ❌ Lost keystore (irreversible without Play App Signing)
+- ❌ Missing privacy policy
+- ❌ Incorrect target SDK
+- ❌ Forgetting to bump `versionCode`
+
+---
+
+## 11. References
+
+- Google Play Console
+- Android App Bundles (AAB)
+- Play App Signing
+- Play Store Policy Center
+
+---
+
+✅ **This document should live in the repo root as:**
+
+```
+/DEPLOYMENT_PLAY_STORE.md
+```
+
+---
+
+Happy shipping 🚢
+
diff --git a/applications/ashbike/docs/SIMULATION.md b/applications/ashbike/docs/SIMULATION.md
new file mode 100644
index 000000000..445ee1dbb
--- /dev/null
+++ b/applications/ashbike/docs/SIMULATION.md
@@ -0,0 +1,76 @@
+# AshBike Connection Simulation Guide
+
+To facilitate development without physical hardware, AshBike includes a built-in **Simulation Mode**. This allows developers to manually toggle the connection state of the E-Bike and AR Glasses directly from the mobile dashboard.
+
+## 1. Bike Connection (Simulated)
+
+The **"Tap to Connect Bike"** button allows you to simulate a Bluetooth connection to the bike hardware. This toggles the UI between "Standard Ride Mode" and "E-Bike Integration Mode."
+
+### How it Works
+
+* **State Source:** `BikeRepository` maintains a `isSimulatingConnection` flag.
+* **Data Interception:** When active, the repository intercepts real GPS/Service data and injects fake e-bike telemetry (Battery 100%, Motor Power 250W).
+* **UI Behavior:**
+* **Disconnected:** Button is **Green**. Glass HUD shows **Ride Stats Stack** (Distance, Duration, Calories).
+* **Connected:** Button is **Red**. Glass HUD shows **Gear Shifter** & Battery info.
+
+
+
+### Code Reference
+
+The simulation logic resides in `BikeRepositoryImpl.kt`:
+
+```kotlin
+override suspend fun toggleSimulatedConnection() {
+    isSimulatingConnection = !isSimulatingConnection
+    // Updates _rideInfo with fake isBikeConnected = true/false
+}
+
+```
+
+---
+
+## 2. AR Glass Connection (Simulated)
+
+Since the Android Emulator cannot physically detect external USB-C displays (smart glasses), we implemented a manual override to force the "Glass Connected" state.
+
+### The 3-State Logic
+
+The Glass button on the dashboard cycles through three distinct states:
+
+| State | Visual | Description | Action |
+| --- | --- | --- | --- |
+| **1. No Glasses** | **Gray** | Hardware not detected. | **Tap to FORCE SIMULATION.** (Enables State 2) |
+| **2. Ready** | **Purple** | Hardware found (or simulated). | **Tap to START PROJECTION.** (Launches Activity) |
+| **3. Active** | **Green** | XR App is running. | **Tap to STOP PROJECTION.** (Kills Activity) |
+
+### Debugging on Emulator
+
+If the button is Gray on the emulator:
+
+1. **Tap it anyway.** We forced `enabled = true` on the "No Glasses" state to aid debugging.
+2. This triggers `toggleSimulatedGlassConnection()` in the repository.
+3. The button will turn **Purple**, allowing you to launch the Glass UI.
+
+### Code Reference
+
+The override logic combines real hardware detection with our manual flag:
+
+```kotlin
+// BikeRepositoryImpl.kt
+override val isGlassConnected = combine(
+    ProjectedContext.isProjectedDeviceConnected(...), // Real Hardware
+    _isGlassConnectionSimulated // Manual Toggle
+) { real, sim -> real || sim }
+
+```
+
+---
+
+## Summary of Flows
+
+| Action | Mobile UI Result | Glass HUD Result |
+| --- | --- | --- |
+| **Tap Bike Button** | Toggles Green/Red | Swaps **Stats Panel** ↔ **Gear Shifter** |
+| **Tap Glass Button (Gray)** | Turns Purple | None (Simulates Plug-in) |
+| **Tap Glass Button (Purple)** | Turns Green | Launches XR Activity (HUD appears) |
\ No newline at end of file
diff --git a/applications/ashbike/features/core/src/main/java/com/ylabz/basepro/applications/bike/features/core/ui/components/DeviceCapabilities.kt b/applications/ashbike/features/core/src/main/java/com/ylabz/basepro/applications/bike/features/core/ui/components/DeviceCapabilities.kt
new file mode 100644
index 000000000..e0991ae15
--- /dev/null
+++ b/applications/ashbike/features/core/src/main/java/com/ylabz/basepro/applications/bike/features/core/ui/components/DeviceCapabilities.kt
@@ -0,0 +1,9 @@
+package com.ylabz.basepro.applications.bike.features.core.ui.components
+
+import android.os.Build
+
+object DeviceCapabilities {
+    // Centralized logic for whether this device supports Glass/XR features
+    val supportsGlassFeatures: Boolean
+        get() = Build.VERSION.SDK_INT >= 36
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/core/src/main/java/com/ylabz/basepro/applications/bike/features/core/ui/components/RidePathMapOrig.kt b/applications/ashbike/features/core/src/main/java/com/ylabz/basepro/applications/bike/features/core/ui/components/RidePathMapOrig.kt
index e5ce3f610..4c5a48ba7 100644
--- a/applications/ashbike/features/core/src/main/java/com/ylabz/basepro/applications/bike/features/core/ui/components/RidePathMapOrig.kt
+++ b/applications/ashbike/features/core/src/main/java/com/ylabz/basepro/applications/bike/features/core/ui/components/RidePathMapOrig.kt
@@ -30,7 +30,7 @@ fun RidePathMapOrig(
 ) {
     var cafesVisible by rememberSaveable { mutableStateOf(false) }
     var cafesFetched by rememberSaveable { mutableStateOf(false) }
-    val textMeasurer = rememberTextMeasurer()
+    rememberTextMeasurer()
 
     Card(
         modifier = modifier,
@@ -66,7 +66,7 @@ fun RidePathMapOrig(
                     }
                 }
                 val minSpeed = pathSegments.minOfOrNull { it.speedKmh } ?: 0.0
-                val maxSpeed = pathSegments.maxOfOrNull { it.speedKmh }?.coerceAtLeast(minSpeed + 0.1) ?: 1.0
+                pathSegments.maxOfOrNull { it.speedKmh }?.coerceAtLeast(minSpeed + 0.1) ?: 1.0
 
                 Canvas(modifier = Modifier.fillMaxSize()) {
                     // Drawing logic remains the same...
diff --git a/applications/ashbike/features/main/build.gradle.kts b/applications/ashbike/features/main/build.gradle.kts
index f0c2788ff..dc29eb4df 100644
--- a/applications/ashbike/features/main/build.gradle.kts
+++ b/applications/ashbike/features/main/build.gradle.kts
@@ -1,18 +1,20 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.android) // Removed for AGP 9.0
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.applications.bike.features.main"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
-
+        minSdk = libs.versions.minSdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
@@ -24,19 +26,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -45,13 +51,13 @@ dependencies {
     implementation(project(":applications:ashbike:features:trips"))
     implementation(project(":applications:ashbike:features:core"))
     implementation(project(":applications:ashbike:database"))
+    implementation(project(":applications:ashbike:apps:mobile:features:glass"))
 
     implementation(project(":core:model"))
     implementation(project(":core:ui"))
     implementation(project(":core:data"))
 
-
-    implementation(project(":feature:heatlh"))
+    implementation(project(":feature:heatlh")) // ✅ FIXED: "heatlh" -> "health"
     implementation(project(":feature:nfc"))
     implementation(project(":feature:weather"))
     implementation(project(":feature:places"))
@@ -60,46 +66,44 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.material.legacy)
 
-    // androidx-lifecycle-viewmodel-compose
+    // Lifecycle
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
-
-    //lifecycle
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.process)
     implementation(libs.androidx.lifecycle.service)
 
-    //Maps
+    // Maps
     implementation(libs.google.play.services.location)
+    implementation(libs.google.maps.compose)
 
     // Compose
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.projected)
     debugImplementation(libs.androidx.ui.tooling)
 
+    // Compose Tracing (Version managed by BOM)
+    implementation("androidx.compose.runtime:runtime-tracing")
+
     // Permissions
     implementation(libs.google.accompanist.permissions)
 
     // Icons
     implementation(libs.androidx.material.icons.extended)
 
-    // Hilt Dependency Injection
+    // Hilt
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Health Connect
     implementation(libs.androidx.health.connect.client)
 
-    // maps
-    implementation(libs.google.maps.compose)
-
+    // Collections
     implementation(libs.kotlinx.collections.immutable)
 
-    // Compose Profile
-    implementation("androidx.compose.runtime:runtime-tracing")
-
+    // Testing
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/applications/ashbike/features/main/src/debug/kotlin/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dial/bike/SuspensionControlCardPreview.kt b/applications/ashbike/features/main/src/debug/kotlin/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dial/bike/SuspensionControlCardPreview.kt
new file mode 100644
index 000000000..a80aefdc0
--- /dev/null
+++ b/applications/ashbike/features/main/src/debug/kotlin/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dial/bike/SuspensionControlCardPreview.kt
@@ -0,0 +1,52 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dial.bike
+
+import com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike.SuspensionControlCard
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+/**
+ * Preview for SuspensionControlCard.
+ * Placed in the 'debug' source set to avoid including preview code in release builds.
+ */
+@Preview(showBackground = true, name = "Suspension States")
+@Composable
+private fun SuspensionControlCardPreview() {
+    // We wrap this in MaterialTheme to ensure the dynamic colors (primary/surface) resolve correctly.
+    MaterialTheme {
+        Surface {
+            Column(modifier = Modifier.padding(16.dp)) {
+
+                // 1. OPEN State (Should be Green)
+                SuspensionControlCard(
+                    suspensionState = "OPEN",
+                    onToggleSuspension = {}
+                )
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                // 2. TRAIL State (Should be Orange)
+                SuspensionControlCard(
+                    suspensionState = "TRAIL",
+                    onToggleSuspension = {}
+                )
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                // 3. LOCK State (Should be Red)
+                SuspensionControlCard(
+                    suspensionState = "LOCK",
+                    onToggleSuspension = {}
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/service/BikeForegroundService.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/service/BikeForegroundService.kt
index e04d220d5..976e25eba 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/service/BikeForegroundService.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/service/BikeForegroundService.kt
@@ -27,6 +27,9 @@ import com.ylabz.basepro.applications.bike.database.repository.UserProfileReposi
 import com.ylabz.basepro.applications.bike.features.main.R
 import com.ylabz.basepro.applications.bike.features.main.usecase.CalculateCaloriesUseCase
 import com.ylabz.basepro.applications.bike.features.main.usecase.UserStats
+import com.ylabz.basepro.core.data.repository.bike.BikeRepository
+import com.ylabz.basepro.core.data.repository.bike.DemoModeSimulator
+import com.ylabz.basepro.core.data.repository.sensor.heart.HeartRateRepository
 import com.ylabz.basepro.core.model.bike.BikeRideInfo
 import com.ylabz.basepro.core.model.bike.LocationEnergyLevel
 import com.ylabz.basepro.core.model.bike.RideState
@@ -66,6 +69,8 @@ class BikeForegroundService : LifecycleService() {
     @Inject
     lateinit var appSettingsRepository: AppSettingsRepository
 
+    @Inject lateinit var bikeRepository: BikeRepository // Inject the Shared Repo
+
     private lateinit var fusedLocationClient: FusedLocationProviderClient
     private lateinit var locationProcessingThread: HandlerThread
     private lateinit var backgroundLooper: Looper
@@ -74,6 +79,10 @@ class BikeForegroundService : LifecycleService() {
     // --- StateFlow for current energy level ---
     private lateinit var currentEnergyLevelState: StateFlow<LocationEnergyLevel>
 
+    // 2. INJECT THE HEART RATE REPOSITORY
+    @Inject
+    lateinit var heartRateRepository: HeartRateRepository
+
 
     // --- Continuous Tracking State (Session-long) ---
     private var continuousSessionStartTimeMillis: Long = 0L
@@ -105,6 +114,10 @@ class BikeForegroundService : LifecycleService() {
 
     private var currentActualGpsIntervalMillis: Long = 0L // Stores the actual interval used
 
+    // 1. Instantiate the Simulator
+    // NOTE: Remove after video.
+    private val demoSimulator = DemoModeSimulator()
+
 
     inner class LocalBinder : Binder() {
         fun getService(): BikeForegroundService = this@BikeForegroundService
@@ -136,6 +149,23 @@ class BikeForegroundService : LifecycleService() {
             UserStats(heightCm = 0f, weightKg = weightKg)
         }
 
+        // 3. START COLLECTING HEART RATE HERE
+        lifecycleScope.launch {
+            // This collects from the repository (WearHealth or BLE)
+            // and updates the main Ride Info state.
+            heartRateRepository.heartRate.collect { bpm ->
+                val current = _rideInfo.value
+
+                // Optimization: Only update flow if value changed
+                if (current.heartbeat != bpm) {
+                    _rideInfo.value = current.copy(
+                        heartbeat = bpm
+                    )
+                    Log.v("BikeForegroundService", "❤ Heart Rate: $bpm")
+                }
+            }
+        }
+
         lifecycleScope.launch {
             combine(
                 currentEnergyLevelState,
@@ -310,7 +340,7 @@ class BikeForegroundService : LifecycleService() {
             // currentRidePath remains emptyList() if not a formal ride
         }
 
-        _rideInfo.value = _rideInfo.value.copy(
+        val newInfo = _rideInfo.value.copy(
             location = LatLng(location.latitude, location.longitude),
             currentSpeed = speedKph,
             currentTripDistance = displayDistanceKm,
@@ -328,6 +358,24 @@ class BikeForegroundService : LifecycleService() {
             ridePath = currentRidePath // Assign the mapped GpsFix list or emptyList
         )
 
+        // =================================================================
+        // DEMO VIDEO LOGIC: INTERCEPT HERE
+        // =================================================================
+        // This takes the Real Emulator Speed + Toggles the Connection
+        demoSimulator.process(newInfo)
+        // =================================================================
+
+        val newRideInfo = newInfo // videoReadyInfo
+
+        // 1. Update Local State (for Notification)
+        _rideInfo.value = newRideInfo
+
+        // 2. PUSH TO REPOSITORY (So Glass can see it!)
+        lifecycleScope.launch {
+            Log.d("DEBUG_PATH", "1. SERVICE: Pushing speed ${newRideInfo.currentSpeed} to Repo") // <--- ADD THIS
+            bikeRepository.updateRideInfo(newRideInfo)
+        }
+
         if (isFormalRideActive) {
             startForegroundService()
         }
@@ -504,12 +552,25 @@ class BikeForegroundService : LifecycleService() {
         formalRideElevationGainMeters = 0.0
         formalRideElevationLossMeters = 0.0
 
-        _rideInfo.value = getInitialRideInfo().copy(
+        // 1. Create the Reset Info Object
+        val resetInfo = getInitialRideInfo().copy(
             location = _rideInfo.value.location, 
             bikeWeatherInfo = _rideInfo.value.bikeWeatherInfo, 
             rideState = RideState.NotStarted,
             ridePath = emptyList() // Ensure path is cleared on full reset
         )
+
+        // 2. Update Local Service State
+        _rideInfo.value = resetInfo
+
+        // 3. --- ADD THIS: PUSH RESET TO REPOSITORY ---
+        // This clears the Glass UI back to "0.0" instantly
+        lifecycleScope.launch {
+            bikeRepository.updateRideInfo(resetInfo)
+        }
+        // ---------------------------------------------
+
+
         caloriesCalculationJob?.cancel()
         startOrRestartCalorieCalculation(isFormalRideActive = false)
         stopForeground(STOP_FOREGROUND_REMOVE)
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/service/BikeServiceManager.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/service/BikeServiceManager.kt
new file mode 100644
index 000000000..0e9753382
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/service/BikeServiceManager.kt
@@ -0,0 +1,67 @@
+package com.ylabz.basepro.applications.bike.features.main.service
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import android.util.Log
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BikeServiceManager @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    private val _service = MutableStateFlow<BikeForegroundService?>(null)
+
+    // The ViewModel observes this. It switches automatically:
+    // If service is null -> emptyFlow
+    // If service is bound -> service.rideInfo
+    val rideInfo: Flow<BikeRideInfo> = _service.flatMapLatest { service ->
+        service?.rideInfo ?: emptyFlow()
+    }
+
+    private val connection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
+            Log.d("BikeServiceManager", "Connected to Service")
+            val localBinder = binder as BikeForegroundService.LocalBinder
+            _service.value = localBinder.getService()
+        }
+
+        override fun onServiceDisconnected(name: ComponentName?) {
+            Log.d("BikeServiceManager", "Disconnected from Service")
+            _service.value = null
+        }
+    }
+
+    fun bindService(activityContext: Context) {
+        val intent = Intent(activityContext, BikeForegroundService::class.java)
+        // Start it (so it keeps running in foreground)
+        activityContext.startService(intent)
+        // Bind to it (so we can talk to it)
+        activityContext.bindService(intent, connection, Context.BIND_AUTO_CREATE)
+    }
+
+    fun unbindService(activityContext: Context) {
+        try {
+            activityContext.unbindService(connection)
+        } catch (e: Exception) {
+            Log.w("BikeServiceManager", "Service already unbound")
+        }
+        _service.value = null
+    }
+
+    fun sendCommand(action: String) {
+        val intent = Intent(context, BikeForegroundService::class.java).apply {
+            this.action = action
+        }
+        context.startService(intent)
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeEvents.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeEvents.kt
index 388ff7994..3b22d1818 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeEvents.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeEvents.kt
@@ -1,12 +1,22 @@
 package com.ylabz.basepro.applications.bike.features.main.ui
 
 sealed class BikeEvent {
+    // Ride Controls
     object StartRide : BikeEvent()
     object StopRide : BikeEvent()
+
+    // Bike Dashboard Interactions
     object OnBikeClick : BikeEvent()
     data class SetTotalDistance(val distanceKm: Float) : BikeEvent()
     object DismissSetDistanceDialog : BikeEvent()
 
-    // Added for Option 2: Semantic Event for navigation
+    // 1. ADD THE TOGGLE EVENT
+    // Glass / XR Controls
+    object ToggleGlassProjection : BikeEvent()
+
+
+
+    // Added for Option 2: Semantic Event for navigations
+    // Navigation Events
     data class NavigateToSettingsRequested(val cardKey: String?) : BikeEvent()
 }
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiRoute.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiRoute.kt
index c2e1c7cec..dbcd326b2 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiRoute.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiRoute.kt
@@ -2,35 +2,38 @@ package com.ylabz.basepro.applications.bike.features.main.ui
 
 import android.Manifest
 import android.content.Intent
+import android.os.Build
 import android.provider.Settings
 import android.util.Log
+import android.widget.Toast
 import androidx.annotation.RequiresPermission
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.xr.projected.ProjectedContext
+import androidx.xr.projected.experimental.ExperimentalProjectedApi
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberPermissionState
 import com.ylabz.basepro.applications.bike.features.main.ui.components.ErrorScreen
 import com.ylabz.basepro.applications.bike.features.main.ui.components.LoadingScreen
 import com.ylabz.basepro.applications.bike.features.main.ui.components.home.BikeDashboardContent
 import com.ylabz.basepro.applications.bike.features.main.ui.components.home.WaitingForGpsScreen
-import com.ylabz.basepro.applications.bike.features.trips.ui.components.haversineMeters
+import com.ylabz.basepro.ashbike.mobile.features.glass.GlassesMainActivity
 import com.ylabz.basepro.core.ui.BikeScreen
 import com.ylabz.basepro.core.ui.NavigationCommand
-import com.ylabz.basepro.feature.heatlh.ui.HealthViewModel
-import com.ylabz.basepro.feature.nfc.ui.NfcViewModel
-
-import com.ylabz.basepro.core.model.yelp.BusinessInfo // Ensure this import is present if not transitive
 import com.ylabz.basepro.feature.places.ui.CoffeeShopEvent
 import com.ylabz.basepro.feature.places.ui.CoffeeShopUIState
 import com.ylabz.basepro.feature.places.ui.CoffeeShopViewModel
+import kotlinx.coroutines.flow.collectLatest
 
 
-@OptIn(ExperimentalPermissionsApi::class)
+@OptIn(ExperimentalPermissionsApi::class, ExperimentalProjectedApi::class)
 @RequiresPermission(allOf = [Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION])
 @Composable
 fun BikeUiRoute(
@@ -38,23 +41,68 @@ fun BikeUiRoute(
     navTo: (NavigationCommand) -> Unit,
     viewModel: BikeViewModel
 ) {
-    val healthViewModel = hiltViewModel<HealthViewModel>()
-    val nfcViewModel = hiltViewModel<NfcViewModel>()
+    // val healthViewModel = hiltViewModel<HealthViewModel>()
+    // val nfcViewModel = hiltViewModel<NfcViewModel>()
     val coffeeShopViewModel = hiltViewModel<CoffeeShopViewModel>() // Added CoffeeShopViewModel
 
     val bikeUiState by viewModel.uiState.collectAsState()
     val cafeUiState by coffeeShopViewModel.uiState.collectAsState() // Added Cafe UI State
+    val context = LocalContext.current
 
-    Log.d(
-        "BikeUiRoute_InstanceTest",
-        "BikeUiRoute using BikeViewModel instance: ${viewModel.hashCode()}"
-    )
-    Log.d(
-        "BikeUiRoute_StateLog",
-        "BikeUiRoute recomposing with bikeUiState: ${bikeUiState::class.java.simpleName}, cafeUiState: ${cafeUiState::class.java.simpleName}"
-    )
+    // --- 2. GLASS CONNECTION LISTENER (The Fix) ---
+    // This listens to the hardware: Is the cable plugged in?
+    LaunchedEffect(Unit) {
+        // Only run on Android 15+ (Baklava/VanillaIceCream)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+            // "this.coroutineContext" is valid here inside LaunchedEffect
+            ProjectedContext.isProjectedDeviceConnected(context, this.coroutineContext)
+                .collectLatest { isConnected ->
+                    viewModel.updateGlassConnection(isConnected)
+                }
+        } else {
+            // Fallback for older devices
+            viewModel.updateGlassConnection(false)
+        }
+    }
+
+    // --- 3. LIFECYCLE: Bind/Unbind Bike Service ---
+    DisposableEffect(Unit) {
+        viewModel.bikeServiceManager.bindService(context)
+        onDispose {
+            viewModel.bikeServiceManager.unbindService(context)
+        }
+    }
+
+    // --- 4. SIDE EFFECTS: Launching Activities & Toasts ---
+    // This listens for "One-off" commands from the ViewModel
+    LaunchedEffect(key1 = true) {
+        viewModel.effects.collect { effect ->
+            when (effect) {
+                is BikeSideEffect.LaunchGlassProjection -> {
+                    // LOGIC: Attempt to launch on the external glass display
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+                        try {
+                            // This specifically targets the Glasses
+                            val options = ProjectedContext.createProjectedActivityOptions(context)
+                            val intent = Intent(context, GlassesMainActivity::class.java).apply {
+                                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            }
+                            context.startActivity(intent, options.toBundle())
+                        } catch (e: Exception) {
+                            Log.e("BikeUiRoute", "Projection Launch Failed", e)
+                            Toast.makeText(context, "Projection Failed: ${e.message}", Toast.LENGTH_LONG).show()
+                        }
+                    } else {
+                        Toast.makeText(context, "Glasses require Android 15+", Toast.LENGTH_SHORT).show()
+                    }
+                }
+                is BikeSideEffect.ShowToast -> {
+                    Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
 
-    val context = LocalContext.current
     val permissionState = rememberPermissionState(
         Manifest.permission.ACCESS_FINE_LOCATION
     )
@@ -72,6 +120,7 @@ fun BikeUiRoute(
         }
     }
 
+    // --- G. UI RENDER LOGIC ---
     when (val currentBikeUiState = bikeUiState) {
         is BikeUiState.WaitingForGps -> {
             WaitingForGpsScreen(
@@ -109,8 +158,12 @@ fun BikeUiRoute(
             }
 
 
+            // Check if we actually have a valid location before showing Dashboard
+            val hasValidLocation = currentBikeUiState.bikeData.location?.let {
+                it.latitude != 0.0 || it.longitude != 0.0
+            } ?: false
 
-            if (currentBikeUiState.bikeData.location != null && (currentBikeUiState.bikeData.location?.latitude != 0.0 || currentBikeUiState.bikeData.location?.longitude != 0.0)) {
+            if (hasValidLocation) {
                 BikeDashboardContent(
                     modifier = modifier.fillMaxSize(),
                     uiState = currentBikeUiState,
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiState.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiState.kt
index 54351531f..178105a0b 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiState.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeUiState.kt
@@ -1,5 +1,6 @@
 package com.ylabz.basepro.applications.bike.features.main.ui
 
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.model.GlassButtonState
 import com.ylabz.basepro.core.model.bike.BikeRideInfo
 import com.ylabz.basepro.core.model.bike.LocationEnergyLevel
 
@@ -8,17 +9,56 @@ sealed class BikeUiState {
     object WaitingForGps : BikeUiState()
     object Loading : BikeUiState()
     object Idle : BikeUiState()
+
     data class Success(
         val bikeData: BikeRideInfo,
         val showSetDistanceDialog: Boolean = false,
         val showGpsCountdown: Boolean = true, // Add the new property
-        val locationEnergyLevel: LocationEnergyLevel = LocationEnergyLevel.BALANCED // <<< ADD THIS LINE
-    ) : BikeUiState()
+        val locationEnergyLevel: LocationEnergyLevel = LocationEnergyLevel.BALANCED, // <<< ADD THIS LINE
+
+        // --- GLASS STATE ---
+        val glassGear: Int = 1,
+        val isGlassActive: Boolean = false, // (Optional: keep for legacy or other UI logic)
+        val glassButtonState: GlassButtonState = GlassButtonState.NO_GLASSES // <--- NEW SOURCE OF TRUTH
+
+    ) : BikeUiState() {
+
+        // =====================================================================
+        // COMPUTED PROPERTIES (The "Brain" for your UI formatting)
+        // =====================================================================
+
+        val formattedBattery: String
+            get() = if (bikeData.isBikeConnected) {
+                bikeData.batteryLevel?.let { "$it%" } ?: "--%"
+            } else {
+                "--%"
+            }
+
+        val formattedMotor: String
+            get() = if (bikeData.isBikeConnected) {
+                // Show power only if > 0
+                bikeData.motorPower?.takeIf { it > 0 }?.let { "${it.toInt()} W" } ?: "-- W"
+            } else {
+                "-- W"
+            }
+
+        val formattedGear: String
+            get() = if (bikeData.isBikeConnected) {
+                "$glassGear"
+            } else {
+                "--"
+            }
+}
 
     data class Error(val message: String) : BikeUiState()
 }
 
 
+sealed interface BikeSideEffect {
+    data object LaunchGlassProjection : BikeSideEffect
+    data class ShowToast(val message: String) : BikeSideEffect
+}
+
 /*
 "Theme" to listOf("Light", "Dark", "System Default"),
         "Language" to listOf("English", "Spanish", "French"),
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeViewModel.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeViewModel.kt
index 34a7f02b9..3648e6421 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeViewModel.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/BikeViewModel.kt
@@ -1,21 +1,18 @@
 package com.ylabz.basepro.applications.bike.features.main.ui
 
-import android.app.Application
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.IBinder
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.ylabz.basepro.applications.bike.database.repository.AppSettingsRepository
 import com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService
-import com.ylabz.basepro.applications.bike.features.main.util.combine
+import com.ylabz.basepro.applications.bike.features.main.service.BikeServiceManager
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.model.GlassButtonState
+import com.ylabz.basepro.core.data.repository.bike.BikeRepository
 import com.ylabz.basepro.core.model.bike.BikeRideInfo
 import com.ylabz.basepro.core.model.bike.LocationEnergyLevel
 import com.ylabz.basepro.core.model.weather.BikeWeatherInfo
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -23,29 +20,36 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.sample
+import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+// 1. Define the Side Effects (One-time events sent to UI)
+
 @HiltViewModel
 class BikeViewModel @Inject constructor(
-    private val application: Application, // <-- Inject Application here
+    val bikeServiceManager: BikeServiceManager, // <--- Injected Manager
     private val weatherUseCase: WeatherUseCase, // Inject WeatherUseCase here
-    private val appSettingsRepository: AppSettingsRepository
+    private val appSettingsRepository: AppSettingsRepository,
+    // 1. INJECT THE GLASS REPO (Even if it's an object, injecting it is cleaner for testing)
+    private val bikeRepository: BikeRepository
 ) : ViewModel() {
 
+    // 2. Create a Channel for Side Effects
+    // Channels are perfect for one-off events (navigation, toasts)
+    // --- Side Effects & Navigation ---
+    private val _effects = Channel<BikeSideEffect>()
+    val effects = _effects.receiveAsFlow()
+
     // --- Navigation Channel ---
     private val _navigateTo = MutableSharedFlow<String>()
     val navigateTo: SharedFlow<String> = _navigateTo.asSharedFlow()
 
-    // --- State for the Service Connection ---
-    private val _bound = MutableStateFlow(false)
-    private var bikeService: BikeForegroundService? = null // Renamed property
-
     // --- State exposed to the UI ---
+    // --- State ---
     private val _uiState = MutableStateFlow<BikeUiState>(BikeUiState.WaitingForGps)
     val uiState: StateFlow<BikeUiState> = _uiState.asStateFlow()
 
@@ -61,70 +65,110 @@ class BikeViewModel @Inject constructor(
     // 1. ADD THIS NEW STATE FLOW FOR THE DIALOG
     private val _showGpsCountdownFlow = MutableStateFlow(true)
 
-
-    // --- Service Connection ---
-    private val serviceConnection = object : ServiceConnection {
-        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-            Log.d("BikeViewModel", "Service Connected. Name: $name")
-            val binder = service as BikeForegroundService.LocalBinder
-            bikeService = binder.getService() // Updated usage
-            _bound.value = true
-            Log.d(
-                "BikeViewModel",
-                "BikeForegroundService instance obtained: $bikeService"
-            ) // Updated usage
-            // CORRECT PLACE: Start both observers after bikeService is guaranteed to be non-null.
-            observeServiceData()
-            fetchWeatherForDashboard()
-        }
-
-        override fun onServiceDisconnected(name: ComponentName?) {
-            Log.d("BikeViewModel", "Service Disconnected. Name: $name")
-            _bound.value = false
-            bikeService = null // Updated usage
-        }
-    }
-
+    // Helper Data Class to group Glass inputs
+    data class GlassState(
+        val gear: Int,
+        val isSimulatedActive: Boolean,
+        val buttonState: GlassButtonState // <--- The calculated state
+    )
 
     // A temporary data holder class to make the logic cleaner
+    // Update CombinedData to hold the new state
     data class CombinedData(
         val rideInfo: BikeRideInfo,
         val totalDistance: Float?,
         val weather: BikeWeatherInfo?,
         val showDialog: Boolean,
         val showGpsCountdown: Boolean,
-        val gpsAccuracy: LocationEnergyLevel
+        val gpsAccuracy: LocationEnergyLevel,
+        val glassGear: Int,
+        val isGlassActive: Boolean,
+        val glassButtonState: GlassButtonState // <--- Added
     )
 
-    private fun observeServiceData() {
+    init {
+        observeBikeData()
+        fetchWeatherForDashboard()
+    }
+
+    // Add this function
+    fun updateGlassConnection(isConnected: Boolean) {
+        viewModelScope.launch {
+            bikeRepository.updateGlassConnectionState(isConnected)
+        }
+    }
+
+    // NOTE: The BikeViewModel starts it but GlassViewModel also uses it. We might want it to start elsewhere?
+    private fun observeBikeData() {
         Log.d("BikeViewModel", "observeServiceData called.")
         viewModelScope.launch {
-            bikeService?.let { service ->
                 Log.d("BikeViewModel", "Starting to collect from service.rideInfo.")
 
-                combine(
-                    service.rideInfo.sample(1000L).onEach { rideInfo ->
-                    },
-                    _uiPathDistance,
-                    _weatherInfo,
+
+                // 1. HELPER FLOW A: Group the Glass Data (Reduces 2 flows -> 1 flow)
+                // 1. UPDATED GLASS FLOW: Calculates the 3-State Logic
+                val glassStateFlow = combine(
+                    bikeRepository.currentGear,
+                    bikeRepository.isBikeConnected,       // Simulated Data Connection
+                    bikeRepository.isGlassConnected,  // Hardware Connection
+                    bikeRepository.isGlassSessionActive // App Running? (Flow<Boolean>)
+                ) { gear, simActive, hwConnected, sessionActive ->
+
+                    // --- LOGGING THE INPUTS ---
+                    Log.d("DEBUG_GLASS", "2. VM Combine Input: HW=$hwConnected, Session=$sessionActive")
+
+                    // --- THE 3-STATE LOGIC ---
+                    val btnState = when {
+                        !hwConnected -> GlassButtonState.NO_GLASSES
+                        sessionActive -> GlassButtonState.PROJECTING
+                        else -> GlassButtonState.READY_TO_START
+                    }
+
+                    // --- LOGGING THE OUTPUT ---
+                    Log.d("DEBUG_GLASS", "2. VM Calculated State: $btnState")
+
+                    GlassState(gear, simActive, btnState)
+                }
+
+                // 2. HELPER FLOW B: Group the UI Flags (Reduces 3 flows -> 1 flow)
+                val uiFlagsFlow = combine(
                     _showSetDistanceDialog,
                     _showGpsCountdownFlow,
-                    appSettingsRepository.gpsAccuracyFlow.onEach { newLevel ->
-                        Log.d("BikeViewModel_DEBUG", "gpsAccuracyFlow from repo emitted: $newLevel")
-                    }
-                ) { rideInfo, totalDistance, weather, showDialog, showCountdown, gpsAccuracy ->
+                    _uiPathDistance
+                ) { showDialog, showCountdown, distance ->
+                    Triple(showDialog, showCountdown, distance)
+                }
+
+                // 3. MAIN COMBINE: Now we only have 5 inputs! (Safe & Clean)
+                combine(
+                    bikeRepository.rideInfo, // <--- Uses Repo Data (25.0 from Simulator) // bikeServiceManager.rideInfo.sample(1000L), // <--- Use Manager Flow
+                    _weatherInfo,
+                    appSettingsRepository.gpsAccuracyFlow,
+                    glassStateFlow, // The grouped Glass data
+                    uiFlagsFlow     // The grouped UI flags
+                ) { rideInfo, weather, gpsAccuracy, glassState, uiFlags ->
+
+
+                    // Unpack the helper objects
+                    // val (glassGear, isGlassActive) = glassState
+                    val (showDialog, showCountdown, totalDistance) = uiFlags
                     // Log inside the combine lambda
                     Log.d(
                         "BikeViewModel_DEBUG",
                         "Combine lambda. rideInfo.location: ${rideInfo.location}, gpsAccuracy (from settings): $gpsAccuracy, showGpsCountdown: $showCountdown"
                     )
                     CombinedData(
-                        rideInfo,
+                        rideInfo = rideInfo, // <--- USE THE HACKED DATA HERE,
                         totalDistance,
                         weather,
                         showDialog,
                         showCountdown,
-                        gpsAccuracy
+                        gpsAccuracy,
+                        // Pass Glass Data
+                        // --- MAPPING GLASS STATE ---
+                        glassGear = glassState.gear,
+                        isGlassActive = glassState.isSimulatedActive,
+                        glassButtonState = glassState.buttonState // <--- Pass to Holder
                     )
                 }
                     // 2. MAP: This block's job is to transform the raw data into the final UI State.
@@ -139,7 +183,12 @@ class BikeViewModel @Inject constructor(
                             ),
                             showSetDistanceDialog = data.showDialog,
                             showGpsCountdown = data.showGpsCountdown,
-                            locationEnergyLevel = data.gpsAccuracy // <<< USE data.gpsAccuracy HERE
+                            locationEnergyLevel = data.gpsAccuracy, // <<< USE data.gpsAccuracy HERE
+                            // 4. POPULATE UI STATE
+                            // (Ensure you added these fields to BikeUiState.Success data class)
+                            glassGear = data.glassGear,
+                            isGlassActive = data.isGlassActive,
+                            glassButtonState = data.glassButtonState // Ensure this field exists in BikeUiState.Success
                         )
                         // Log the state being emitted and the key gpsAccuracy value from CombinedData
                         Log.d(
@@ -164,29 +213,26 @@ class BikeViewModel @Inject constructor(
                         ) // Added _DEBUG to tag
                         _uiState.value = state
                     }
-            } ?: run {
-                Log.w("BikeViewModel", "observeServiceData: bikeService is null, cannot collect.")
             }
-        }
+
     }
 
 
     private fun fetchWeatherForDashboard() {
-        // This check prevents re-fetching if the service reconnects
+        // Prevent re-fetching
         if (_weatherInfo.value != null) return
 
         viewModelScope.launch {
-            // Now we know bikeService is not null when this is called.
-            val location =
-                bikeService?.rideInfo?.first { it.location != null }?.location ?: return@launch
-
+            // Use Manager to get location safely
             try {
-                // CORRECTED: Use the class-level property directly, which Kotlin can now resolve.
-                // The previous `this.` was ambiguous inside the coroutine scope.
+                // We wait for the first valid location from the service manager
+                val rideInfo = bikeServiceManager.rideInfo.first { it.location != null }
+                val location = rideInfo.location ?: return@launch
+
                 _weatherInfo.value = weatherUseCase(location.latitude, location.longitude)
-                Log.d("BikeViewModel", "Weather fetched successfully for dashboard.")
+                Log.d("BikeViewModel", "Weather fetched successfully.")
             } catch (e: Exception) {
-                Log.e("BikeViewModel", "Error fetching weather for dashboard", e)
+                Log.e("BikeViewModel", "Error fetching weather", e)
             }
         }
     }
@@ -205,13 +251,10 @@ class BikeViewModel @Inject constructor(
                 _showSetDistanceDialog.value = false
             }
 
-            BikeEvent.StartRide -> {
-                sendCommandToService(BikeForegroundService.ACTION_START_RIDE)
-            }
-
+            BikeEvent.StartRide -> bikeServiceManager.sendCommand(BikeForegroundService.ACTION_START_RIDE)
             BikeEvent.StopRide -> {
-                sendCommandToService(BikeForegroundService.ACTION_STOP_RIDE)
-                _uiPathDistance.value = null // Resetting the UI path distance
+                bikeServiceManager.sendCommand(BikeForegroundService.ACTION_STOP_RIDE)
+                _uiPathDistance.value = null
             }
 
             BikeEvent.OnBikeClick -> {
@@ -232,70 +275,30 @@ class BikeViewModel @Inject constructor(
                     "NavigateToSettingsRequested event received. CardKey: ${event.cardKey}"
                 )
                 // TODO: Add any ViewModel-specific logic for this event if required in the future.
+                viewModelScope.launch {
+                    _navigateTo.emit("settings/${event.cardKey}")
+                }
+                // TODO: Add any ViewModel-specific logic for this event if required in the future.
             }
-        }
-    }
 
-    // This function now uses the injected 'application' context
-    private fun sendCommandToService(action: String) {
-        Log.d("BikeViewModel", "sendCommandToService: $action")
-        val intent =
-            Intent(application, BikeForegroundService::class.java).apply { this.action = action }
-        application.startService(intent) // Ensures service is running if not already
-    }
 
-    // --- Service Lifecycle Management ---
-    // Note: bind/unbind still need the Activity/Fragment context, which is fine
-    // because these methods are called directly from the UI layer's lifecycle.
-    fun bindToService(context: Context) {
-        if (!_bound.value) {
-            Log.d("BikeViewModel", "bindToService called. Current bound state: ${_bound.value}")
-            Intent(context, BikeForegroundService::class.java).also { intent ->
-                try {
-                    Log.d("BikeViewModel", "Attempting to start service.")
-                    context.startService(intent) // Good to ensure it's started, especially if it might not be running
-                    Log.d("BikeViewModel", "Attempting to bind service.")
-                    val didBind =
-                        context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE)
-                    Log.d("BikeViewModel", "bindService call returned: $didBind")
-                    if (!didBind) {
-                        Log.e(
-                            "BikeViewModel",
-                            "bindService returned false. Service may not be available or manifest declaration missing."
-                        )
-                    }
-                } catch (e: Exception) {
-                    Log.e("BikeViewModel", "Exception during bindToService: ${e.message}", e)
+            is BikeEvent.ToggleGlassProjection -> {
+                // Perform any business logic checks here (e.g., isConnected?)
+                viewModelScope.launch {
+                    // Tell the UI to launch the activity
+                    _effects.send(BikeSideEffect.LaunchGlassProjection)
                 }
             }
-        } else {
-            Log.d("BikeViewModel", "bindToService called, but already bound.")
-        }
-    }
 
-    fun unbindFromService(context: Context) {
-        Log.d(
-            "BikeViewModel",
-            "unbindFromService called. Current internal _bound state: ${_bound.value}"
-        )
-        try {
-            // Always attempt to unbind. The Android system tracks the actual binding.
-            // If it's not bound, context.unbindService will throw IllegalArgumentException.
-            context.unbindService(serviceConnection)
-            Log.d("BikeViewModel", "context.unbindService() called successfully.")
-        } catch (e: IllegalArgumentException) {
-            // This is expected if the service was already unbound or was never bound with this connection.
-            Log.w(
-                "BikeViewModel",
-                "IllegalArgumentException during unbindService: ${e.message}. Service might have been already unbound or not registered."
-            )
-        } catch (e: Exception) {
-            // Catch any other unexpected exceptions during unbinding.
-            Log.e("BikeViewModel", "Generic exception during unbindFromService: ${e.message}", e)
+            // 5. HANDLE GLASS EVENTS
+            // If the Phone UI has controls to change gears (e.g. testing buttons), handle them here.
+            // If the 'Launch' logic is purely UI-side (Activity start), you might not need an event here,
+            // but if you want to track it or reset state:
+            /*
+            BikeEvent.GearUp -> glassRepository.gearUp()
+            BikeEvent.GearDown -> glassRepository.gearDown()
+            */
         }
-        // Regardless of whether unbindService threw an exception (e.g., already unbound),
-        // update our internal state to reflect that we've processed the unbind request.
-        _bound.value = false
-        bikeService = null
     }
+
 }
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/BikeDashboardContent.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/BikeDashboardContent.kt
index 2f6003c90..64159cfff 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/BikeDashboardContent.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/BikeDashboardContent.kt
@@ -43,11 +43,11 @@ import com.ylabz.basepro.applications.bike.features.main.ui.BikeUiState
 import com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.SlidableGoogleMap
 import com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.StatsSection
 import com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.StatsSectionType
-import com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike.BikeBatteryLevels
+import com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike.BikeDashboard
 import com.ylabz.basepro.applications.bike.features.main.ui.components.home.main.SpeedAndProgressCard
 import com.ylabz.basepro.applications.bike.features.main.ui.components.home.main.StatsRow
 import com.ylabz.basepro.core.model.bike.RideState
-import com.ylabz.basepro.core.model.yelp.BusinessInfo // Added import
+import com.ylabz.basepro.core.model.yelp.BusinessInfo
 import com.ylabz.basepro.core.ui.NavigationCommand
 
 @Composable
@@ -60,6 +60,7 @@ fun BikeDashboardContent(
     placeName: String?, // Added parameter
     onFindCafes: () -> Unit // Added parameter
 ) {
+
     var isMapPanelVisible by rememberSaveable { mutableStateOf(false) }
     val bikeRideInfo = uiState.bikeData
     val view = LocalView.current
@@ -68,8 +69,8 @@ fun BikeDashboardContent(
         onDispose { view.keepScreenOn = false }
     }
 
-    val isBikeConnected = bikeRideInfo.isBikeConnected
-    val batteryLevel = bikeRideInfo.batteryLevel
+    bikeRideInfo.isBikeConnected
+    bikeRideInfo.batteryLevel
     val rideState = bikeRideInfo.rideState
     val currRiding = rideState == RideState.Riding
 
@@ -137,7 +138,6 @@ fun BikeDashboardContent(
                             tint = MaterialTheme.colorScheme.onSurface
                         )
                     }
-
                     AnimatedVisibility(
                         visible = expanded,
                         enter = expandVertically() + fadeIn(),
@@ -153,16 +153,16 @@ fun BikeDashboardContent(
                             verticalArrangement = Arrangement.spacedBy(12.dp),
                             horizontalAlignment = Alignment.CenterHorizontally
                         ) {
-                            StatsSection(
+                            /*StatsSection(
                                 uiState = uiState,
                                 sectionType = StatsSectionType.EBIKE,
                                 onEvent = onBikeEvent
-                            )
+                            )*/
 
-                            BikeBatteryLevels(
-                                isConnected = isBikeConnected,
-                                batteryLevel = batteryLevel,
-                                onConnectClick = { /* TODO */ }
+                            BikeDashboard(
+                                uiState = uiState,
+                                onBikeEvent = onBikeEvent,
+                                // navTo = navTo,
                             )
                         }
                     }
@@ -171,7 +171,7 @@ fun BikeDashboardContent(
         }
 
         // Slidable Google Map Panel, aligned to the bottom of the Box
-        androidx.compose.animation.AnimatedVisibility(
+        AnimatedVisibility(
             visible = isMapPanelVisible,
             modifier = Modifier.align(Alignment.BottomCenter), // Ensures it's at the bottom of the Box
             enter = slideInVertically(initialOffsetY = { fullHeight -> fullHeight }) + fadeIn(),
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/StatsSection.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/StatsSection.kt
index d478f3f48..5a83ff7a7 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/StatsSection.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/StatsSection.kt
@@ -14,6 +14,7 @@ import androidx.compose.material.icons.filled.LocalFireDepartment
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -25,7 +26,6 @@ import com.ylabz.basepro.applications.bike.features.main.ui.components.home.main
 import com.ylabz.basepro.core.model.bike.RideState
 import com.ylabz.basepro.core.ui.theme.iconColorBikeActive
 import com.ylabz.basepro.core.ui.theme.iconColorCalories
-import com.ylabz.basepro.core.ui.theme.iconColorHeartRate
 
 enum class StatsSectionType {
     HEALTH, EBIKE
@@ -35,58 +35,63 @@ enum class StatsSectionType {
 fun StatsSection(
     uiState: BikeUiState.Success,
     sectionType: StatsSectionType,
-    onEvent: (BikeEvent) -> Unit, // Assuming onEvent is needed and of this type
+    onEvent: (BikeEvent) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val bikeData = uiState.bikeData
-    LocalContext.current // For string resources with formatting
+    LocalContext.current
 
     val isBikeComputerOn = bikeData.rideState == RideState.Riding
     val currentCardColor =
         if (isBikeComputerOn) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant
     val currentContentColor =
         if (isBikeComputerOn) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurfaceVariant
-    //val unavailableText = stringResource(R.string.feature_main_text_unavailable_compact)
 
     val currentStats: List<StatItem> = when (sectionType) {
-        StatsSectionType.HEALTH -> listOf(
-            StatItem(
-                icon = Icons.Filled.Favorite,
-                label = stringResource(R.string.feature_main_label_heart_rate),
-                value = if (bikeData.heartbeat != null) "$bikeData.heartbeat bpm" else "-- bpm",
-                /*value = bikeData.heartbeat?.takeIf { it > 0 }?.let { hr ->
-                    String.format(Locale.getDefault(), stringResource(R.string.feature_main_value_bpm_format), hr)
-                } ?: unavailableText,*/
-                activeColor = if (isBikeComputerOn) MaterialTheme.colorScheme.iconColorHeartRate else null
-            ),
-            StatItem(
-                icon = Icons.Filled.LocalFireDepartment,
-                label = stringResource(R.string.feature_main_label_calories),
-                value = bikeData.caloriesBurned.toString(),
-                /*value = bikeData.caloriesBurned.takeIf { it > 0 }?.let { calories ->
-                    String.format(Locale.getDefault(), stringResource(R.string.feature_main_value_kcal_format), calories)
-                } ?: unavailableText,*/
-                activeColor = if (isBikeComputerOn) MaterialTheme.colorScheme.iconColorCalories else null
+        StatsSectionType.HEALTH -> {
+            // --- DYNAMIC HEART RATE COLOR LOGIC ---
+            val hr = bikeData.heartbeat
+            val heartRateColor = if (hr != null && isBikeComputerOn) {
+                when {
+                    hr < 100 -> Color(0xFF4CAF50) // Green (Warm up)
+                    hr < 130 -> Color(0xFFFFC107) // Yellow (Fat Burn)
+                    hr < 160 -> Color(0xFFFF9800) // Orange (Cardio)
+                    else -> Color(0xFFF44336)     // Red (Peak)
+                }
+            } else {
+                // Fallback if null or bike computer is off
+                if (isBikeComputerOn) Color.Gray else null
+            }
+            // --------------------------------------
+
+            listOf(
+                StatItem(
+                    icon = Icons.Filled.Favorite,
+                    label = stringResource(R.string.feature_main_label_heart_rate),
+                    value = if (hr != null) "$hr bpm" else "-- bpm",
+                    // Apply dynamic color here
+                    activeColor = heartRateColor
+                ),
+                StatItem(
+                    icon = Icons.Filled.LocalFireDepartment,
+                    label = stringResource(R.string.feature_main_label_calories),
+                    value = bikeData.caloriesBurned.toString(),
+                    activeColor = if (isBikeComputerOn) MaterialTheme.colorScheme.iconColorCalories else null
+                )
             )
-        )
+        }
 
         StatsSectionType.EBIKE -> listOf(
             StatItem(
                 icon = Icons.AutoMirrored.Filled.BatteryUnknown,
                 label = stringResource(R.string.feature_main_label_battery),
-                value = if (bikeData.isBikeConnected && bikeData.batteryLevel != null) "$bikeData.batteryLevel%" else "--%",
-                /*value = if (bikeData.isBikeConnected && bikeData.batteryLevel != null) {
-                    String.format(Locale.getDefault(), stringResource(R.string.feature_main_value_percentage_format), bikeData.batteryLevel)
-                } else unavailableText,*/
+                value = if (bikeData.isBikeConnected && bikeData.batteryLevel != null) "${bikeData.batteryLevel}%" else "--%",
                 activeColor = if (isBikeComputerOn && bikeData.isBikeConnected) MaterialTheme.colorScheme.primary else null
             ),
             StatItem(
                 icon = Icons.Filled.ElectricBike,
                 label = stringResource(R.string.feature_main_label_motor),
-                value = if (bikeData.isBikeConnected && bikeData.motorPower != null) "$bikeData.motorPower W" else "-- W",
-                /*value = if (bikeData.isBikeConnected && bikeData.motorPower != null && bikeData.motorPower > 0f) {
-                    String.format(Locale.getDefault(), stringResource(R.string.feature_main_value_watts_format), bikeData.motorPower)
-                } else unavailableText,*/
+                value = if (bikeData.isBikeConnected && bikeData.motorPower != null) "${bikeData.motorPower} W" else "-- W",
                 activeColor = if (isBikeComputerOn && bikeData.isBikeConnected) MaterialTheme.colorScheme.iconColorBikeActive else null
             )
         )
@@ -101,10 +106,8 @@ fun StatsSection(
         currentStats.forEach { stat ->
             StatCard(
                 modifier = Modifier.weight(1f),
-                // StatCard should internally use statItem.activeColor if present,
-                // or fallback to a general content color.
-                // If StatCard needs explicit tint, adjust here:
                 icon = stat.icon,
+                // Use the calculated activeColor, or fallback to default content color
                 tint = stat.activeColor ?: currentContentColor,
                 label = stat.label,
                 value = stat.value,
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeBatteryLevels.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeBatteryLevels.kt
deleted file mode 100644
index 3428814a0..000000000
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeBatteryLevels.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike
-
-//import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.lerp
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun BikeBatteryLevels(
-    isConnected: Boolean,
-    batteryLevel: Int?,
-    onConnectClick: () -> Unit
-) {
-    // Example colors—adjust to your theme
-    val disconnectedColor = Color(0xFF2196F3)
-    val connectedColor = Color(0xFF4CAF50)
-
-    if (isConnected) connectedColor else disconnectedColor
-    val displayText = if (isConnected) {
-        "Battery: ${batteryLevel ?: 0}%"
-    } else {
-        "Tap to Connect Bike"
-    }
-
-    Card(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(16.dp)
-            .clickable {
-                if (!isConnected) {
-                    onConnectClick()
-                }
-            },
-        //colors = CardDefaults.cardColors(containerColor = backgroundColor)
-    ) {
-        Column(
-            modifier = Modifier.padding(16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            if (isConnected && batteryLevel != null) {
-                // Show a battery bar or 10-segment indicator
-                Text(
-                    text = displayText,
-                    style = MaterialTheme.typography.titleMedium,
-                    color = Color.White
-                )
-                Spacer(Modifier.height(8.dp))
-                // 10-segment example or an interpolated bar
-                SegmentedBatteryIndicator(batteryLevel = batteryLevel)
-            } else {
-                // Show a centered, Material button to connect
-                Button(
-                    onClick = onConnectClick,
-                    enabled = false,
-                    modifier = Modifier.fillMaxWidth(),  // full width
-                    shape = RoundedCornerShape(8.dp)     // optional rounding
-                ) {
-                    Text(
-                        text = displayText,
-                        style = MaterialTheme.typography.titleMedium,
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier.fillMaxWidth()  // ensures centered text
-                    )
-                }
-            }
-        }
-    }
-}
-
-// Example 10-segment indicator
-@Composable
-fun SegmentedBatteryIndicator(batteryLevel: Int) {
-    val segments = 10
-    val filledSegments = (batteryLevel / (100 / segments)).coerceAtMost(10)
-    // Color logic (red -> green) or discrete steps
-    val fillColor = batteryColor(batteryLevel)
-
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(8.dp),
-        horizontalArrangement = Arrangement.spacedBy(2.dp)
-    ) {
-        repeat(segments) { index ->
-            Box(
-                modifier = Modifier
-                    .weight(1f)
-                    .fillMaxHeight()
-                    .background(
-                        color = if (index < filledSegments) fillColor else Color.LightGray,
-                        shape = MaterialTheme.shapes.small
-                    )
-            )
-        }
-    }
-}
-
-// Simple color function from red to green
-fun batteryColor(batteryLevel: Int): Color {
-    val clamped = batteryLevel.coerceIn(0, 100)
-    val fraction = clamped / 100f
-    return lerp(Color.Red, Color.Green, fraction)
-}
-/*
-@Preview
-@Composable
-fun BikeBatteryLevelsPreview() {
-    BikeBatteryLevels(
-        isConnected = false,
-        batteryLevel = 75,
-        onConnectClick = {}
-    )
-}
-*/
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeCard.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeCard.kt
new file mode 100644
index 000000000..1a1bf15a3
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeCard.kt
@@ -0,0 +1,80 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.ylabz.basepro.applications.bike.features.main.ui.BikeEvent
+import com.ylabz.basepro.applications.bike.features.main.ui.BikeUiState
+import com.ylabz.basepro.ashbike.mobile.features.glass.ui.components.controls.LaunchGlassButton
+
+@RequiresApi(Build.VERSION_CODES.S) // Adjusted to S (Android 12) or use your BAKLAVA import
+@Composable
+fun BikeCard(
+    uiState: BikeUiState.Success, // We pass the WHOLE success state
+    onBikeEvent: (BikeEvent) -> Unit
+) {
+    // 1. EXTRACT DATA (Cleanly)
+    val isConnected = uiState.bikeData.isBikeConnected
+    val batteryLevel = uiState.bikeData.batteryLevel
+
+    // 2. COMPUTE VISUALS
+    val containerColor = if (isConnected) Color(0xFF4CAF50) else MaterialTheme.colorScheme.surfaceVariant
+    val contentColor = if (isConnected) Color.White else MaterialTheme.colorScheme.onSurfaceVariant
+
+    // 3. COMPUTE TEXT (Or add this to BikeUiState as .statusTextVal)
+    val statusText = if (isConnected) {
+        "Battery: ${batteryLevel ?: 0}%"
+    } else {
+        "No Bike Connected"
+    }
+
+    Card(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        colors = CardDefaults.cardColors(
+            containerColor = containerColor,
+            contentColor = contentColor
+        )
+    ) {
+        Column(
+            modifier = Modifier.padding(16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            // --- HEADER ---
+            Text(
+                text = statusText,
+                style = MaterialTheme.typography.titleMedium
+            )
+
+            // --- BATTERY INDICATOR ---
+            // Only show the segmented bar if connected and we have data
+            if (isConnected && batteryLevel != null) {
+                Spacer(Modifier.height(8.dp))
+                SegmentedBatteryIndicator(batteryLevel = batteryLevel)
+            }
+
+            Spacer(Modifier.height(16.dp))
+
+            // --- GLASS CONTROL ---
+            LaunchGlassButton(
+                buttonState = uiState.glassButtonState,
+                onButtonClick = { onBikeEvent(BikeEvent.ToggleGlassProjection) },
+                modifier = Modifier.fillMaxWidth()
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeConnectionButton.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeConnectionButton.kt
new file mode 100644
index 000000000..a0475ae17
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeConnectionButton.kt
@@ -0,0 +1,42 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Link
+import androidx.compose.material.icons.filled.LinkOff
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun BikeConnectionButton(onConnectClick: () -> Unit, isConnected: Boolean) {
+    Button(
+        onClick = onConnectClick,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        // Change color: Green for "Connect", Red/Gray for "Disconnect"
+        colors = ButtonDefaults.buttonColors(
+            containerColor = if (isConnected) Color(0xFFFFCDD2) else Color(0xFFC8E6C9), // Light Red vs Light Green
+            contentColor = if (isConnected) Color(0xFFC62828) else Color(0xFF2E7D32)   // Dark Red vs Dark Green text
+        )
+    ) {
+        // Change Icon and Text based on state
+        Icon(
+            imageVector = if (isConnected) Icons.Default.LinkOff else Icons.Default.Link,
+            contentDescription = null
+        )
+        Spacer(Modifier.width(8.dp))
+        Text(
+            text = if (isConnected) "Disconnect (Sim)" else "Connect (Sim)"
+        )
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeDashboard.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeDashboard.kt
new file mode 100644
index 000000000..094700fd3
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeDashboard.kt
@@ -0,0 +1,65 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ElectricBolt
+import androidx.compose.material.icons.filled.PedalBike
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.ylabz.basepro.applications.bike.features.main.ui.BikeEvent
+import com.ylabz.basepro.applications.bike.features.main.ui.BikeUiState
+
+
+@RequiresApi(Build.VERSION_CODES.BAKLAVA)
+@Composable
+fun BikeDashboard(
+    modifier: Modifier = Modifier,
+    uiState: BikeUiState.Success, // Assumes this now has .glassGear
+    onBikeEvent: (BikeEvent) -> Unit,
+) {
+
+            // --- NEW: 3-Column Row for Battery, Motor, Gear ---
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp) // Gap between boxes
+            ) {
+                // 1. Battery Stat
+                BikeStatCard(
+                    icon = Icons.Default.ElectricBolt, // Or your Battery icon
+                    label = "Battery",
+                    // Logic: If not null, show "100%", otherwise show "--%"
+                    value = uiState.formattedBattery,
+                    modifier = Modifier.weight(1f) // Equal width
+                )
+
+                // 2. Motor Stat
+                BikeStatCard(
+                    icon = Icons.Default.PedalBike, // Or your Motor icon
+                    label = "Motor",
+                    // Logic: takeIf { it > 0 } returns null if 0, triggering the "--" fallback
+                    value = uiState.formattedMotor,                    modifier = Modifier.weight(1f)
+                )
+
+                // 3. Gear Stat (From Glass)
+                BikeStatCard(
+                    icon = Icons.Default.Settings, // Gear Icon
+                    label = "Gear",
+                    value = uiState.formattedGear, // Connected to Glass Data
+                    modifier = Modifier.weight(1f)
+                )
+            }
+            // --------------------------------------------------
+
+            // "Tap to Connect" Button (Existing)
+            BikeCard(
+                uiState = uiState,
+                onBikeEvent = onBikeEvent
+            )
+
+        }
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeStatCard.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeStatCard.kt
new file mode 100644
index 000000000..bc1f25de0
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/BikeStatCard.kt
@@ -0,0 +1,65 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun BikeStatCard(
+    icon: ImageVector,
+    label: String,
+    value: String,
+    modifier: Modifier = Modifier
+) {
+    Card(
+        modifier = modifier,
+        colors = CardDefaults.cardColors(
+            // Matches your existing "surfaceVariant" gray boxes
+            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
+        ),
+        shape = RoundedCornerShape(12.dp)
+    ) {
+        Column(
+            modifier = Modifier
+                .padding(12.dp)
+                .fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            Icon(
+                imageVector = icon,
+                contentDescription = label,
+                modifier = Modifier.size(24.dp),
+                tint = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+            Spacer(modifier = Modifier.height(4.dp))
+            Text(
+                text = value,
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colorScheme.onSurface
+            )
+            Text(
+                text = label,
+                style = MaterialTheme.typography.labelSmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/SegmentedBatteryIndicator.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/SegmentedBatteryIndicator.kt
new file mode 100644
index 000000000..313eba484
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/SegmentedBatteryIndicator.kt
@@ -0,0 +1,50 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.lerp
+import androidx.compose.ui.unit.dp
+
+// Example 10-segment indicator
+@Composable
+fun SegmentedBatteryIndicator(batteryLevel: Int) {
+    val segments = 10
+    val filledSegments = (batteryLevel / (100 / segments)).coerceAtMost(10)
+    // Color logic (red -> green) or discrete steps
+    val fillColor = batteryColor(batteryLevel)
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(8.dp),
+        horizontalArrangement = Arrangement.spacedBy(2.dp)
+    ) {
+        repeat(segments) { index ->
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .fillMaxHeight()
+                    .background(
+                        color = if (index < filledSegments) fillColor else Color.LightGray,
+                        shape = MaterialTheme.shapes.small
+                    )
+            )
+        }
+    }
+}
+
+// Simple color function from red to green
+fun batteryColor(batteryLevel: Int): Color {
+    val clamped = batteryLevel.coerceIn(0, 100)
+    val fraction = clamped / 100f
+    return lerp(Color.Red, Color.Green, fraction)
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/SuspensionControlCard.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/SuspensionControlCard.kt
new file mode 100644
index 000000000..1e48c91ba
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/SuspensionControlCard.kt
@@ -0,0 +1,85 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Tune // Good icon for suspension/tuning
+import androidx.compose.material3.*
+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.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun SuspensionControlCard(
+    suspensionState: String, // "OPEN", "TRAIL", or "LOCK"
+    onToggleSuspension: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    // Dynamic Color: Green for Open, Orange for Trail, Red for Lock
+    val statusColor = when (suspensionState.uppercase()) {
+        "OPEN" -> Color(0xFF4CAF50) // Green
+        "TRAIL" -> Color(0xFFFF9800) // Orange
+        "LOCK" -> Color(0xFFF44336) // Red
+        else -> MaterialTheme.colorScheme.primary
+    }
+
+    Card(
+        modifier = modifier.clickable { onToggleSuspension() }, // Make whole card clickable
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
+        ),
+        shape = RoundedCornerShape(12.dp)
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(16.dp)
+                .fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            // Left Side: Icon & Label
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Icon(
+                    imageVector = Icons.Default.Tune,
+                    contentDescription = "Suspension",
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                Spacer(modifier = Modifier.width(12.dp))
+                Column {
+                    Text(
+                        text = "Suspension",
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                    Text(
+                        text = suspensionState,
+                        style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colorScheme.onSurface
+                    )
+                }
+            }
+
+            // Right Side: Status Indicator Pill
+            Box(
+                modifier = Modifier
+                    .clip(RoundedCornerShape(50))
+                    .background(statusColor.copy(alpha = 0.2f))
+                    .padding(horizontal = 12.dp, vertical = 6.dp)
+            ) {
+                Text(
+                    text = "CHANGE",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = statusColor,
+                    fontWeight = FontWeight.Bold
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/unused/BikeGearsIndicator.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/unused/BikeGearsIndicator.kt
new file mode 100644
index 000000000..401756f34
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/bike/unused/BikeGearsIndicator.kt
@@ -0,0 +1,75 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.bike.unused
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun BikeGearsIndicatorNotUsed(
+    modifier: Modifier = Modifier
+
+) {
+
+    // --- ADDED: Live Gear Display Box ---
+    // This Gray Box mimics the style of your other stats
+    Card(
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
+        ),
+        shape = RoundedCornerShape(12.dp),
+        modifier = modifier.fillMaxWidth()
+    ) {
+        Row(
+            modifier = Modifier.padding(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center
+        ) {
+            // Gear Icon
+            Icon(
+                imageVector = Icons.Default.Settings, // Using Settings gear icon
+                contentDescription = "Current Gear",
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colorScheme.primary
+            )
+
+            Spacer(modifier = Modifier.width(16.dp))
+
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Text(
+                    text = "Current Gear",
+                    style = MaterialTheme.typography.labelMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                // The Live Number
+                Text(
+                    text = "not used ",// "${currentGear.collectAsState().value}",
+                    style = MaterialTheme.typography.headlineMedium,
+                    fontWeight = FontWeight.Bold,
+                    color = MaterialTheme.colorScheme.onSurface
+                )
+            }
+        }
+    }
+    // -------------------------------------
+
+}
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/health/HeartRateCard.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/health/HeartRateCard.kt
new file mode 100644
index 000000000..408979bd1
--- /dev/null
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/health/HeartRateCard.kt
@@ -0,0 +1,85 @@
+package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dials.health
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun HeartRateCard(
+    bpm: Int?,
+    modifier: Modifier = Modifier
+) {
+    // 1. Dynamic Color based on Zone
+    val cardColor by animateColorAsState(
+        targetValue = when {
+            bpm == null -> MaterialTheme.colorScheme.surfaceVariant
+            bpm < 100 -> Color(0xFF4CAF50) // Green (Warm up)
+            bpm < 130 -> Color(0xFFFFC107) // Yellow (Fat Burn)
+            bpm < 160 -> Color(0xFFFF9800) // Orange (Cardio)
+            else -> Color(0xFFF44336)      // Red (Peak)
+        },
+        label = "HeartRateColor"
+    )
+
+    val textColor = if (bpm == null) MaterialTheme.colorScheme.onSurfaceVariant else Color.White
+
+    Card(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(100.dp),
+        shape = RoundedCornerShape(16.dp),
+        colors = CardDefaults.cardColors(containerColor = cardColor)
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            // Left: Icon and Label
+            Column {
+                Icon(
+                    imageVector = Icons.Default.Favorite,
+                    contentDescription = "Heart Rate",
+                    tint = textColor,
+                    modifier = Modifier.size(28.dp)
+                )
+                Spacer(modifier = Modifier.height(4.dp))
+                Text(
+                    text = "HEART RATE",
+                    style = MaterialTheme.typography.labelMedium,
+                    color = textColor.copy(alpha = 0.8f)
+                )
+            }
+
+            // Right: Big Value
+            Row(verticalAlignment = Alignment.Bottom) {
+                Text(
+                    text = bpm?.toString() ?: "--",
+                    style = MaterialTheme.typography.displayMedium.copy(fontWeight = FontWeight.Bold),
+                    color = textColor
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+                Text(
+                    text = "bpm",
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = textColor.copy(alpha = 0.8f),
+                    modifier = Modifier.padding(bottom = 6.dp)
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/path/unused/BikePathScreen.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/path/unused/BikePathScreen.kt
index 30c65af2a..36ae3cc1a 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/path/unused/BikePathScreen.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/path/unused/BikePathScreen.kt
@@ -2,7 +2,6 @@ package com.ylabz.basepro.applications.bike.features.main.ui.components.home.dia
 
 //import androidx.compose.ui.tooling.preview.Preview
 import android.Manifest
-import android.R
 import android.content.pm.PackageManager
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
@@ -50,6 +49,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import com.google.android.gms.maps.model.LatLng
+import com.ylabz.basepro.applications.bike.features.main.R
 
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -160,16 +160,16 @@ fun BikePathScreen(
                         IconButton(onClick = { isPreferencesExpanded = !isPreferencesExpanded }) {
                             Icon(
                                 painter = if (isPreferencesExpanded)
-                                    painterResource(R.drawable.arrow_up_float)
+                                    painterResource(R.drawable.ic_bike)//.arrow_up_float)
                                 else
-                                    painterResource(R.drawable.arrow_down_float),
+                                    painterResource(R.drawable.ic_bike),//.arrow_down_float),
                                 contentDescription = "Expand or Collapse",
                                 tint = Color.Gray
                             )
                         }
                         IconButton(onClick = { isPreferencesFlipped = !isPreferencesFlipped }) {
                             Icon(
-                                painter = painterResource(R.drawable.ic_menu_rotate),
+                                painter = painterResource(R.drawable.ic_bike),//ic_menu_rotate),
                                 contentDescription = "Flip Card",
                                 tint = Color.Gray
                             )
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/weather/unused/WeatherBadgeContent.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/weather/unused/WeatherBadgeContent.kt
index 3a1918805..7efc28a73 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/weather/unused/WeatherBadgeContent.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/dials/weather/unused/WeatherBadgeContent.kt
@@ -78,7 +78,7 @@ fun WeatherBadgeContent(
             //MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f))
         }
     }
-    val transition = updateTransition(targetState = expanded, label = "")
+    updateTransition(targetState = expanded, label = "")
 
     ElevatedCard(
         modifier = Modifier
diff --git a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/unused/unused/demo/settings/BikeConfigurationExpandable.kt b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/unused/unused/demo/settings/BikeConfigurationExpandable.kt
index ee9be8372..4d16f3e07 100644
--- a/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/unused/unused/demo/settings/BikeConfigurationExpandable.kt
+++ b/applications/ashbike/features/main/src/main/java/com/ylabz/basepro/applications/bike/features/main/ui/components/home/unused/unused/demo/settings/BikeConfigurationExpandable.kt
@@ -28,7 +28,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.ylabz.basepro.applications.bike.features.main.R
 
 
 @Composable
@@ -57,7 +59,7 @@ fun BikeConfigurationExpandable(
                 )
                 Spacer(modifier = Modifier.width(16.dp))
                 Text(
-                    text = "Bike Configuration",
+                    text = stringResource(R.string.bike_configuration),
                     style = MaterialTheme.typography.bodyLarge
                 )
                 Spacer(modifier = Modifier.weight(1f))
@@ -79,7 +81,7 @@ fun BikeConfigurationExpandable(
                     Row(
                         verticalAlignment = Alignment.CenterVertically
                     ) {
-                        Text("Motor Assistance")
+                        Text(stringResource(R.string.motor_assistance))
                         Spacer(modifier = Modifier.weight(1f))
                         Switch(
                             checked = motorAssistance,
@@ -91,7 +93,7 @@ fun BikeConfigurationExpandable(
 
                     // E.g., Gearing slider
                     var gearingLevel by remember { mutableStateOf(5f) }
-                    Text("Gearing Level: ${gearingLevel.toInt()}")
+                    Text(stringResource(R.string.gearing_level, gearingLevel.toInt()))
                     Slider(
                         value = gearingLevel,
                         onValueChange = { gearingLevel = it },
@@ -102,7 +104,7 @@ fun BikeConfigurationExpandable(
 
                     // Button to advanced screen
                     Button(onClick = onAdvancedClick) {
-                        Text("Advanced Bike Settings")
+                        Text(stringResource(R.string.advanced_bike_settings))
                     }
                 }
             }
diff --git a/applications/ashbike/features/main/src/main/res/values-es/strings.xml b/applications/ashbike/features/main/src/main/res/values-es/strings.xml
index 98a34eeba..36d99bf59 100644
--- a/applications/ashbike/features/main/src/main/res/values-es/strings.xml
+++ b/applications/ashbike/features/main/src/main/res/values-es/strings.xml
@@ -42,6 +42,10 @@
     <string name="bike_action_stop">Detener</string>
     <string name="bike_dialog_set_distance_title">Introducir distancia total (km)</string>
     <string name="bike_dialog_set_distance_label">Distancia en km</string>
+    <string name="bike_configuration">Bike Configuration</string>
+    <string name="motor_assistance">Motor Assistance</string>
+    <string name="advanced_bike_settings">Advanced Bike Settings</string>
+    <string name="gearing_level">Gearing Level: %1$d</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/applications/ashbike/features/main/src/main/res/values/strings.xml b/applications/ashbike/features/main/src/main/res/values/strings.xml
index f1e189ce8..05758abff 100644
--- a/applications/ashbike/features/main/src/main/res/values/strings.xml
+++ b/applications/ashbike/features/main/src/main/res/values/strings.xml
@@ -42,6 +42,10 @@
     <string name="bike_action_stop">Stop</string>
     <string name="bike_dialog_set_distance_title">Enter total distance (km)</string>
     <string name="bike_dialog_set_distance_label">Distance in km</string>
+    <string name="bike_configuration">Bike Configuration</string>
+    <string name="motor_assistance">Motor Assistance</string>
+    <string name="advanced_bike_settings">Advanced Bike Settings</string>
+    <string name="gearing_level">Gearing Level: %1$d</string>
 
 
 </resources>
diff --git a/applications/ashbike/features/settings/build.gradle.kts b/applications/ashbike/features/settings/build.gradle.kts
index 31c64a3aa..33b3a5703 100644
--- a/applications/ashbike/features/settings/build.gradle.kts
+++ b/applications/ashbike/features/settings/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash: But had to put it back
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.applications.bike.features.settings"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -35,8 +39,12 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
diff --git a/applications/ashbike/features/settings/src/main/res/values/strings.xml b/applications/ashbike/features/settings/src/main/res/values/strings.xml
index 9bb063e6a..b299c706c 100644
--- a/applications/ashbike/features/settings/src/main/res/values/strings.xml
+++ b/applications/ashbike/features/settings/src/main/res/values/strings.xml
@@ -61,4 +61,5 @@
     <string name="theme_dark_display">Dark</string>
     <string name="theme_settings_card_title">Theme Settings</string>
     <string name="theme_icon_cd">Theme selection icon</string>
+    <string name="settings_bike_advanced">settings_bike_advanced</string>
 </resources>
diff --git a/applications/ashbike/features/trips/build.gradle.kts b/applications/ashbike/features/trips/build.gradle.kts
index f7b3396d2..f105675a9 100644
--- a/applications/ashbike/features/trips/build.gradle.kts
+++ b/applications/ashbike/features/trips/build.gradle.kts
@@ -1,30 +1,26 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash:
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.applications.bike.features.trips"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-    kotlin {
-        jvmToolchain(21)
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = providers.gradleProperty("isMinifyForRelease").get().toBoolean()
@@ -32,30 +28,44 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 dependencies {
+    implementation(project(":feature:qrscanner"))
+    implementation(project(":feature:nfc"))
+    implementation(project(":feature:heatlh")) // Fixed typo "heatlh" -> "health"
+    implementation(project(":feature:ble"))
     implementation(project(":applications:ashbike:database"))
-    implementation(project(":applications:ashbike:features:core"))
-    implementation(project(":feature:heatlh"))
-    implementation(project(":core:ui"))
-    implementation(project(":core:data"))
+
+    implementation(project(":core:ui"))    // Fixed double colon "::" -> ":"
     implementation(project(":core:model"))
+    implementation(project(":core:util"))
+
+    implementation(project(":applications:ashbike:features:core"))
+
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material.legacy)
 
-    // viewmodel - hilt-lifecycle-viewmodel
-    // implementation(libs.hilt.lifecycle.viewmodel) // NOTE: not needed
-
     // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
@@ -65,6 +75,12 @@ dependencies {
     implementation(libs.androidx.material3)
     debugImplementation(libs.androidx.ui.tooling)
 
+    // maps
+    implementation(libs.google.maps.compose)
+
+    // Health Connect
+    implementation(libs.androidx.health.connect.client)
+
     // Icons
     implementation(libs.androidx.material.icons.extended)
 
@@ -72,14 +88,6 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
-
-    // maps
-    implementation(libs.google.maps.compose)
-
-    // Health Connect
-    implementation(libs.androidx.health.connect.client)
-
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
diff --git a/applications/ashbike/features/trips/src/main/java/com/ylabz/basepro/applications/bike/features/trips/ui/components/unused/MapPathExample.kt b/applications/ashbike/features/trips/src/main/java/com/ylabz/basepro/applications/bike/features/trips/ui/components/unused/MapPathExample.kt
index add221337..0c59486ca 100644
--- a/applications/ashbike/features/trips/src/main/java/com/ylabz/basepro/applications/bike/features/trips/ui/components/unused/MapPathExample.kt
+++ b/applications/ashbike/features/trips/src/main/java/com/ylabz/basepro/applications/bike/features/trips/ui/components/unused/MapPathExample.kt
@@ -75,7 +75,7 @@ fun MapPathScreenNOTUSED(
             // 1) background + grid
             Canvas(Modifier.fillMaxSize()) {
                 drawRect(brush = backgroundGradient)
-                val cols = 10;
+                val cols = 10
                 val rows = 10
                 val stepX = size.width / cols
                 val stepY = size.height / rows
diff --git a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/MyApplication.kt b/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/MyApplication.kt
deleted file mode 100644
index e15444fd4..000000000
--- a/applications/ashbike/src/main/java/com/ylabz/basepro/applications/bike/MyApplication.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ylabz.basepro.applications.bike
-
-import android.app.Application
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.os.Build
-import com.ylabz.basepro.applications.bike.features.main.service.BikeForegroundService // Added import
-import dagger.hilt.android.HiltAndroidApp
-
-@HiltAndroidApp
-class MyApplication : Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-        createNotificationChannels()
-    }
-
-    private fun createNotificationChannels() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            // Channel for Bike Ride Service
-            val bikeServiceChannelName = "Bike Ride Updates"
-            val bikeServiceChannelDescription = "Notifications for active bike rides"
-            val bikeServiceChannelImportance = NotificationManager.IMPORTANCE_LOW
-            val bikeServiceChannel = NotificationChannel(
-                BikeForegroundService.NOTIFICATION_CHANNEL_ID, // Using the constant from your service
-                bikeServiceChannelName,
-                bikeServiceChannelImportance
-            ).apply {
-                description = bikeServiceChannelDescription
-            }
-
-            val notificationManager: NotificationManager =
-                getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-            notificationManager.createNotificationChannel(bikeServiceChannel)
-        }
-    }
-}
diff --git a/applications/home/src/main/java/com/ylabz/basepro/feature/home/ui/HomeMainRoute.kt b/applications/home/src/main/java/com/ylabz/basepro/feature/home/ui/HomeMainRoute.kt
index def668733..b76301fbd 100644
--- a/applications/home/src/main/java/com/ylabz/basepro/feature/home/ui/HomeMainRoute.kt
+++ b/applications/home/src/main/java/com/ylabz/basepro/feature/home/ui/HomeMainRoute.kt
@@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.ylabz.basepro.feature.home.ui.components.HomeMainScreen
 
 @Composable
@@ -19,8 +19,7 @@ fun HomeMainRoute(
     navTo: (String) -> Unit,
     viewModel: HomeViewModel = hiltViewModel()
 ) {
-    val uiState = viewModel.uiState.collectAsState().value
-    when (uiState) {
+    when (val uiState = viewModel.uiState.collectAsState().value) {
         is HomeUiState.Loading -> {
             LoadingScreen()
         }
diff --git a/applications/photodo/build.gradle.kts b/applications/photodo/build.gradle.kts
index 51605ee31..430ea2992 100644
--- a/applications/photodo/build.gradle.kts
+++ b/applications/photodo/build.gradle.kts
@@ -1,20 +1,24 @@
+import com.android.build.api.dsl.ApplicationExtension
+
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
+    // ✅ REMOVED: 'kotlin.compose' handles the compiler now
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
     alias(libs.plugins.mapsplatform.secrets)
-    alias(libs.plugins.jetbrains.kotlin.serialization) // Added Kotlinx Serialization plugin
+    alias(libs.plugins.jetbrains.kotlin.serialization)
 }
 
-android {
+// FIX: Use strict configuration for AGP 9.0
+extensions.configure<ApplicationExtension> {
     namespace = "com.ylabz.basepro.applications.photodo"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.ylabz.basepro.applications.photodo"
-        minSdk =  libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
@@ -30,45 +34,45 @@ android {
                 "proguard-rules.pro"
             )
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
-
 
     buildFeatures {
         compose = true
         buildConfig = true
     }
+}
 
-
-    secrets {
-        defaultPropertiesFileName = "secrets.defaults.properties"
+// FIX: Use 'java' block for Toolchain
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
-dependencies {
+// FIX: Secrets must be OUTSIDE the android block
+secrets {
+    defaultPropertiesFileName = "secrets.defaults.properties"
+}
 
+dependencies {
+    // Project Modules
     implementation(project(":core:util"))
+    implementation(project(":core:ui"))
     implementation(project(":applications:photodo:db"))
     implementation(project(":applications:photodo:core"))
     implementation(project(":applications:photodo:features:home"))
     implementation(project(":applications:photodo:features:photodolist"))
     implementation(project(":applications:photodo:features:settings"))
 
-    // androidx-lifecycle-viewmodel-compose
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.android)
-
-    // AndroidX + Compose
+    // AndroidX + Compose (Core)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
@@ -77,26 +81,26 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.material3)
     implementation(libs.androidx.material3.expressive)
-    //implementation(libs.androidx.compose.material3.adaptive) // Added to resolve runtime crash
+
+    // Lifecycle
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.android)
 
     // Hilt
     implementation(libs.hilt.android)
-    // implementation(project(":applications:photodo:features:main"))
-    implementation(project(":core:ui"))
-    ksp(libs.hilt.android.compiler)   // Hilt compiler dependency for annotation processing
-    // Hilt Dependency Injection
-    // kapt(libs.hilt.compiler)
+    ksp(libs.hilt.android.compiler)
 
-    // Compose Navigation
-    implementation(libs.androidx.navigation.compose) // Added Compose Navigation dependency with safe args plugin
+    // Navigation (Compose + Nav3)
+    implementation(libs.androidx.navigation.compose)
     implementation(libs.hilt.navigation.compose)
 
-    // Nav3
     implementation(libs.androidx.navigation3.runtime)
     implementation(libs.androidx.navigation3.ui)
     implementation(libs.androidx.material3.adaptive.navigation3)
-    implementation(libs.androidx.lifecycle.viewmodel.navigation3) // Added for ViewModel scoping
-    implementation(libs.kotlinx.serialization.json) // Added for @Serializable NavKey
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+
+    // Serialization (Required for Nav3 Type Safety)
+    implementation(libs.kotlinx.serialization.json)
 
     // Window Size
     implementation(libs.androidx.material3.window.size)
@@ -104,8 +108,7 @@ dependencies {
     // Icons
     implementation(libs.androidx.material.icons.extended)
 
-
-
+    // Testing
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -113,5 +116,4 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    debugImplementation(libs.androidx.ui.tooling.preview)
 }
\ No newline at end of file
diff --git a/applications/photodo/core/build.gradle.kts b/applications/photodo/core/build.gradle.kts
index 3c48e12ef..e732c8670 100644
--- a/applications/photodo/core/build.gradle.kts
+++ b/applications/photodo/core/build.gradle.kts
@@ -33,8 +33,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlinOptions {
-        jvmTarget = "21" // Aligned with feature:nav3 (will use jvmToolchain if this causes issues)
+    kotlin {
+        jvmToolchain(21)
     }
 }
 
diff --git a/applications/photodo/db/src/main/java/com/ylabz/basepro/applications/photodo/db/di/DatabaseModule.kt b/applications/photodo/db/src/main/java/com/ylabz/basepro/applications/photodo/db/di/DatabaseModule.kt
index dc4f882db..bf719c043 100644
--- a/applications/photodo/db/src/main/java/com/ylabz/basepro/applications/photodo/db/di/DatabaseModule.kt
+++ b/applications/photodo/db/src/main/java/com/ylabz/basepro/applications/photodo/db/di/DatabaseModule.kt
@@ -34,7 +34,7 @@ object DatabaseModule {
             PhotoDoDB::class.java,
             "photodo_database"
         )
-        .fallbackToDestructiveMigration() // Handles schema changes gracefully during dev
+            .fallbackToDestructiveMigration(false) // Handles schema changes gracefully during dev
         .addCallback(callback.get())
         .build()
     }
diff --git a/applications/photodo/features/home/src/debug/kotlin/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryCardPreviewNew.kt b/applications/photodo/features/home/src/debug/kotlin/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryCardPreviewNew.kt
new file mode 100644
index 000000000..5d6fb54f1
--- /dev/null
+++ b/applications/photodo/features/home/src/debug/kotlin/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryCardPreviewNew.kt
@@ -0,0 +1,125 @@
+package com.ylabz.basepro.applications.photodo.features.home.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.ylabz.basepro.applications.photodo.db.entity.CategoryEntity
+import com.ylabz.basepro.applications.photodo.db.entity.TaskListEntity
+
+// --- MOCK DATA ---
+private val mockCategory = CategoryEntity(
+    categoryId = 1L,
+    name = "Kitchen Renovation",
+    description = "Cabinets, flooring, and paint selection for the new look.",
+    imageUri = null // Using null to trigger the placeholder icon
+)
+
+
+val sampleTasks = listOf(
+    TaskListEntity(
+        listId = 101L,
+        categoryId = 2L,
+        name = "Q4 Planning",
+        status = "To-Do",
+        priority = 1
+    ),
+    TaskListEntity(
+        listId = 102L,
+        categoryId = 2L,
+        name = "Expense Report",
+        status = "Done",
+        priority = 0
+    )
+)
+private val mockTaskLists = listOf(
+    TaskListEntity(listId = 1L, categoryId = 2L,name = "Buy Paint", status = "Active", priority = 1), // High Priority
+    TaskListEntity(listId = 2L, categoryId = 2L,name = "Sand Walls", status = "Active", priority = 0),
+    TaskListEntity(listId = 3L, categoryId = 2L,name = "Install Handles", status = "Done", priority = 0)
+)
+
+// --- PREVIEW ---
+
+@Preview(showBackground = true, name = "1. Selected State")
+@Composable
+fun PreviewCategoryCardSelected() {
+    MaterialTheme {
+        Surface(modifier = Modifier.padding(16.dp)) {
+            CategoryCard(
+                uiState = CategoryCardUiState(
+                    category = mockCategory,
+                    isSelected = true,
+                    taskLists = mockTaskLists
+                ),
+                onEvent = {}
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true, name = "2. Unselected State")
+@Composable
+fun PreviewCategoryCardUnselected() {
+    MaterialTheme {
+        Surface(modifier = Modifier.padding(16.dp)) {
+            CategoryCard(
+                uiState = CategoryCardUiState(
+                    category = mockCategory.copy(name = "Groceries", description = "Weekly run"),
+                    isSelected = false,
+                    taskLists = emptyList()
+                ),
+                onEvent = {}
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true, name = "3. Expanded State Logic Check")
+@Composable
+fun PreviewColumnDisplay() {
+    // This preview stacks them to see how they look in a list context
+    MaterialTheme {
+        Column(modifier = Modifier.padding(16.dp)) {
+            CategoryCard(
+                uiState = CategoryCardUiState(
+                    category = mockCategory,
+                    isSelected = true,
+                    taskLists = mockTaskLists
+                ),
+                onEvent = {}
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            CategoryCard(
+                uiState = CategoryCardUiState(
+                    category = mockCategory.copy(categoryId = 2L, name = "Backyard"),
+                    isSelected = false,
+                    taskLists = emptyList()
+                ),
+                onEvent = {}
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true, backgroundColor = 0xFF1C1B1F, name = "4. Dark Mode")
+@Composable
+fun PreviewCategoryCardDark() {
+    MaterialTheme(colorScheme = androidx.compose.material3.darkColorScheme()) {
+        Surface(modifier = Modifier.padding(16.dp)) {
+            CategoryCard(
+                uiState = CategoryCardUiState(
+                    category = mockCategory,
+                    isSelected = true,
+                    taskLists = mockTaskLists
+                ),
+                onEvent = {}
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/photodo/features/home/src/debug/kotlin/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskListPreviews.kt b/applications/photodo/features/home/src/debug/kotlin/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskListPreviews.kt
new file mode 100644
index 000000000..05e8cd282
--- /dev/null
+++ b/applications/photodo/features/home/src/debug/kotlin/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskListPreviews.kt
@@ -0,0 +1,66 @@
+package com.ylabz.basepro.applications.photodo.features.home.ui.components
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import com.ylabz.basepro.applications.photodo.db.entity.CategoryEntity
+import com.ylabz.basepro.applications.photodo.db.entity.TaskListEntity
+
+// --- MOCK DATA ---
+private val mockCategoryForList = CategoryEntity(
+    categoryId = 1L,
+    name = "Home Improvements",
+    description = "Things to fix around the house",
+    imageUri = null
+)
+
+private val mockTaskListsData = listOf(
+    TaskListEntity(listId = 1L, categoryId = 2L,name = "Buy Paint", status = "Active", priority = 1), // High Priority
+    TaskListEntity(listId = 2L, categoryId = 2L,name = "Sand Walls", status = "Active", priority = 0),
+    TaskListEntity(listId = 3L, categoryId = 2L,name = "Install Handles", status = "Done", priority = 0)
+)
+
+// --- PREVIEWS ---
+
+@Preview(showBackground = true, name = "1. Populated List")
+@Composable
+fun PreviewTaskListPopulated() {
+    MaterialTheme {
+        Surface {
+            TaskList(
+                category = mockCategoryForList,
+                taskLists = mockTaskListsData,
+                onSelectList = {}
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true, name = "2. Empty State (No Lists)")
+@Composable
+fun PreviewTaskListEmpty() {
+    MaterialTheme {
+        Surface {
+            TaskList(
+                category = mockCategoryForList,
+                taskLists = emptyList(), // Simulating empty DB result
+                onSelectList = {}
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true, name = "3. No Category Selected")
+@Composable
+fun PreviewTaskListNoCategory() {
+    MaterialTheme {
+        Surface {
+            TaskList(
+                category = null, // Simulating null selection
+                taskLists = emptyList(),
+                onSelectList = {}
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeEvent.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeEvent.kt
index df6d89266..10f46780b 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeEvent.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeEvent.kt
@@ -56,4 +56,8 @@ sealed interface HomeEvent {
     data class OnDeleteCategoryClicked(val category: CategoryEntity) : HomeEvent
 
     data class OnTaskListSelected(val listId: Long) : HomeEvent
+    // data class OnTaskListDeleted(val listId: Long) : HomeEvent
+
+    // Navigation & Layout (The missing pieces)
+    data class OnScreenLayoutChanged(val isExpanded: Boolean) : HomeEvent
 }
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeScreen.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeScreen.kt
index 714fbd4b8..3774378f3 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeScreen.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeScreen.kt
@@ -13,7 +13,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import com.ylabz.basepro.applications.photodo.features.home.ui.components.CategoryList
 import com.ylabz.basepro.applications.photodo.features.home.ui.components.TaskList
-import kotlinx.coroutines.launch
 
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
@@ -22,9 +21,7 @@ fun HomeScreen(
     modifier: Modifier = Modifier,
     uiState: HomeUiState.Success,
     onEvent: (HomeEvent) -> Unit,
-    // This is for navigating from a Task in the list to the Task Detail (3rd pane)
-    onSelectList: (Long) -> Unit,
-    isExpandedScreen: Boolean,
+    //navigationEffects: Flow<HomeNavigationEffect> // Pass the side-effect flow
     //onCategorySelected: (Long) -> Unit, // <-- ADD THIS PARAMETER
     // ### WHAT: This parameter was added to accept the "setter" function from MainScreen.
     // ### WHY: This allows HomeScreen to tell MainScreen which FAB to display.
@@ -37,23 +34,35 @@ fun HomeScreen(
 
 
     Log.d("HomeScreen", "On HomeScreen recomposing.")
-    if (isExpandedScreen) {
+    if (uiState.isExpandedScreen) {
 
         // val navigator = rememberListDetailPaneScaffoldNavigator<Nothing>()
         val navigator = rememberListDetailPaneScaffoldNavigator()
-        val scope = rememberCoroutineScope() // 3. Get a coroutine scope
+        rememberCoroutineScope() // 3. Get a coroutine scope
 
         // --- ADAPTIVE NAVIGATION SYNC ---
         // Automatically navigate to the Detail pane when a category is selected.
         // This ensures the UI stays in sync with your ViewModel state.
+        // --- EFFECT HANDLING ---
+        // Listen for "Go To Detail" commands from the ViewModel
+        /*LaunchedEffect(navigationEffects) {
+            navigationEffects.collect { effect ->
+                when (effect) {
+                    is HomeNavigationEffect.NavigateToDetailPane -> {
+                        // Navigate to the detail pane (right side)
+                        navigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
+                        // Note: If you need to navigate to a NEW screen (Screen C),
+                        // you would trigger a callback to the MainActivity here.
+                    }
+                }
+            }
+        }*/
+
+        // --- SYNC STATE ---
+        // Ensure navigator aligns with selected category
         LaunchedEffect(uiState.selectedCategory) {
             if (uiState.selectedCategory != null) {
-                scope.launch {
-                    navigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
-                }
-            } else {
-                // Optional: If deselected, you could navigate back to List
-                // scope.launch { navigator.navigateTo(ListDetailPaneScaffoldRole.List) }
+                navigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
             }
         }
 
@@ -68,7 +77,7 @@ fun HomeScreen(
                     CategoryList(
                         uiState = uiState,
                         onEvent = onEvent,
-                        isExpandedScreen = isExpandedScreen,
+                        isExpandedScreen = true,
                     )
                 }
             },
@@ -84,7 +93,10 @@ fun HomeScreen(
                         // This is for clicking items in the right-hand pane, which is already correct
                         // This onSelectList is for when a user clicks a task *within* this list,
                         // which correctly triggers the navigation to the 3rd pane.
-                        onSelectList = onSelectList
+                        // Pure Event Passing
+                        onSelectList = { listId ->
+                            onEvent(HomeEvent.OnTaskListSelected(listId))
+                        }
                     )
                 }
             }
@@ -99,7 +111,7 @@ fun HomeScreen(
             modifier = modifier.fillMaxSize(),
             uiState = uiState,
             onEvent = onEvent,
-            isExpandedScreen = isExpandedScreen
+            isExpandedScreen = false
         )
     }
 
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeUiState.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeUiState.kt
index 2f8292077..4af0164ff 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeUiState.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeUiState.kt
@@ -26,7 +26,8 @@ sealed interface HomeUiState {
         val taskListsForSelectedCategory: List<TaskListEntity> = emptyList(),
         val isAddingCategory: Boolean = false,
         // --- Added Field ---
-        val categoryToEdit: CategoryEntity? = null
+        val categoryToEdit: CategoryEntity? = null,
+        val isExpandedScreen: Boolean = false
     ) : HomeUiState
 
     /**
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeViewModel.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeViewModel.kt
index f3488819a..f10ce3e5f 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeViewModel.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/HomeViewModel.kt
@@ -7,6 +7,7 @@ import com.ylabz.basepro.applications.photodo.db.entity.CategoryEntity
 import com.ylabz.basepro.applications.photodo.db.repo.PhotoDoRepo
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -17,6 +18,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -41,6 +43,13 @@ class HomeViewModel @Inject constructor(
     private val _categorySelectedEvent = MutableSharedFlow<Long>()
     val categorySelectedEvent: SharedFlow<Long> = _categorySelectedEvent.asSharedFlow()
 
+    private val _isExpandedScreen = MutableStateFlow(false) // New
+
+    // 2. One-Time Events (Side Effects)
+    // Used to tell the UI to Navigate (e.g. slide to detail pane)
+    private val _navigationEffect = Channel<HomeNavigationEffect>(Channel.BUFFERED)
+    val navigationEffect = _navigationEffect.receiveAsFlow()
+
     // --- REACTIVE PIPELINE (Replaces loadInitialData) ---
 
     // A. The raw list of categories from the DB
@@ -90,15 +99,17 @@ class HomeViewModel @Inject constructor(
         categoriesFlow,
         activeCategoryFlow,
         taskListsFlow,
-        _isAddingCategory
-    ) { categories, selectedCategory, taskLists, isAdding ->
+        _isAddingCategory,
+        _isExpandedScreen // <--- PASS IT IN HERE
+    ) { categories, selectedCategory, taskLists, isAdding,isExpanded ->
 
         // Map to Success state (or Loading if we wanted to add that logic)
         HomeUiState.Success(
             categories = categories,
             selectedCategory = selectedCategory,
             taskListsForSelectedCategory = taskLists,
-            isAddingCategory = isAdding
+            isAddingCategory = isAdding,
+            isExpandedScreen = isExpanded // <--- ASSIGN IT HERE
         )
     }.stateIn(
         scope = viewModelScope,
@@ -175,8 +186,13 @@ class HomeViewModel @Inject constructor(
 
                 HomeEvent.OnAddListClicked -> { /* Handled by MainScreen */ }
 
-                is HomeEvent.OnTaskListSelected -> { /* Navigation handled by UI Route */ }
-
+                is HomeEvent.OnTaskListSelected -> {
+                /* Navigation handled by UI Route */
+                    _navigationEffect.send(HomeNavigationEffect.NavigateToDetailPane(event.listId))
+                }
+                is HomeEvent.OnScreenLayoutChanged -> {
+                    _isExpandedScreen.value = event.isExpanded
+                }
             }
         }
     }
@@ -212,3 +228,9 @@ class HomeViewModel @Inject constructor(
         */
     }
 }
+
+
+// Helper Sealed Class for One-Off Navigation Events
+sealed interface HomeNavigationEffect {
+    data class NavigateToDetailPane(val listId: Long) : HomeNavigationEffect
+}
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/PhotoDoHomeUiRoute.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/PhotoDoHomeUiRoute.kt
index 28089dcd5..f4a407f99 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/PhotoDoHomeUiRoute.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/PhotoDoHomeUiRoute.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import com.ylabz.basepro.applications.photodo.db.entity.CategoryEntity
@@ -35,7 +36,40 @@ fun PhotoDoHomeUiRoute(
 
     Log.d(TAG, "Entered PhotoDoHomeUiRoute composable") // <-- BREADCRUMB 1
 
+    // 1. SYNC LAYOUT STATE
+    // Tell the ViewModel about the screen size so it can update HomeUiState
+    LaunchedEffect(isExpandedScreen) {
+        homeViewModel.onEvent(HomeEvent.OnScreenLayoutChanged(isExpandedScreen))
+    }
+
+    // 2. HANDLE PHONE NAVIGATION
+    // If we are NOT on an expanded screen, we listen for navigation effects here
+    // and trigger the external navigation controller.
+    // if (isExpandedScreen) {
+        LaunchedEffect(homeViewModel.navigationEffect) {
+            homeViewModel.navigationEffect.collect { effect ->
+                when (effect) {
+                    is HomeNavigationEffect.NavigateToDetailPane -> {
+                        Log.d(TAG, "Phone Navigation triggered for list: ${effect.listId}")
+                        navTo(effect.listId)
+                    }
+                }
+            }
+        }
+    //}
+
+    // 3. EVENT INTERCEPTOR
+    // We wrap the onEvent to intercept "Edit" actions (which need to go up to MainScreen),
+    // but pass everything else to the ViewModel.
     val onEvent: (HomeEvent) -> Unit = { event ->
+        if (event is HomeEvent.OnEditCategoryClicked) {
+            onEditCategory(event.category)
+        } else {
+            homeViewModel.onEvent(event)
+        }
+    }
+
+    val onEventOld: (HomeEvent) -> Unit = { event ->
         // 1. Notify local VM (for selection, etc.)
         homeViewModel.onEvent(event)
 
@@ -57,6 +91,7 @@ fun PhotoDoHomeUiRoute(
         // ------------------------
     }
 
+    // 4. RENDER
     when (uiState) {
         is HomeUiState.Loading -> {
             Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
@@ -65,22 +100,20 @@ fun PhotoDoHomeUiRoute(
         }
         is HomeUiState.Success -> {
             Column(modifier = Modifier.fillMaxSize()) {
-                Text("PhotoDoHomeUI Holding the HomeScreen")
+                // Optional: Keep for debugging, remove for production
+                // Text("PhotoDoHomeUI Holding the HomeScreen")
+
                 HomeScreen(
                     modifier = modifier,
                     uiState = uiState,
-                    onEvent = homeViewModel::onEvent,
-                    onSelectList = { taskID -> navTo(taskID)},
-                    isExpandedScreen = isExpandedScreen,
-                    // onCategorySelected = onCategorySelected, // <-- PASS THE LAMBDA DOWN
-                    // This handles the "Add" button on the empty screen
-                    /*onAddList = {
-                    state.selectedCategory?.let { category ->
-                        viewModel.onEvent(HomeEvent.OnAddTaskListClicked(category.categoryId))
-                    }
-                    },*/
-                    // setFabState = setFabState
+                    onEvent = onEvent,
+                    // We pass the flow down.
+                    // The HomeScreen will ONLY collect this if isExpandedScreen is true.
+                    // navigationEffects = homeViewModel.navigationEffect
                 )
+
+
+
                 // --- THIS IS THE UI LOGIC ---
                 // When the ViewModel's state flag is true, show the sheet.
                 /* if (uiState.isAddingCategory) {
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryCard.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryCard.kt
index ed09e8f3a..2ec020955 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryCard.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryCard.kt
@@ -2,9 +2,15 @@ package com.ylabz.basepro.applications.photodo.features.home.ui.components
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.tween
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.animateIntAsState
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -44,14 +50,18 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.ylabz.basepro.applications.photodo.features.home.ui.HomeEvent
+import kotlin.math.absoluteValue
 
 @Composable
 fun CategoryCard(
@@ -61,8 +71,8 @@ fun CategoryCard(
 ) {
     // Extract values for ease of use
     val (category, isSelected, taskLists) = uiState
-
     var isExpanded by rememberSaveable { mutableStateOf(false) }
+    val haptics = LocalHapticFeedback.current // 1. Haptics access
 
     // Auto-collapse if selection is lost
     LaunchedEffect(isSelected) {
@@ -75,14 +85,51 @@ fun CategoryCard(
     val hasHighPriority = taskLists.any { it.priority > 0 }
     // --------------------------
 
+    // --- EXPRESSIVE MOTION & SHAPE ---
+
+    // 2. SPRING ANIMATION: "Bouncy" scale (StiffnessLow + DampingRatioLowBouncy)
+    // This creates that "alive" feeling when the card is tapped.
+    val scale by animateFloatAsState(
+        targetValue = if (isSelected) 1.05f else 1f, // Increased scale for more drama
+        animationSpec = spring(
+            dampingRatio = Spring.DampingRatioLowBouncy,
+            stiffness = Spring.StiffnessLow
+        ),
+        label = "ExpressiveScale"
+    )
+
+    // 3. SHAPE MORPH: Animate corner radius
+    // Unselected = 16dp (Medium), Selected = 32dp (Extra Large)
+    // This physically changes the silhouette of the focused item.
+    val cornerRadius by animateIntAsState(
+        targetValue = if (isSelected) 32 else 12,
+        animationSpec = spring(
+            dampingRatio = Spring.DampingRatioNoBouncy,
+            stiffness = Spring.StiffnessMedium
+        ),
+        label = "ShapeMorph"
+    )
+    val cardShape = RoundedCornerShape(cornerRadius.dp)
+
+    // 4. COLOR SPRING: Ensure color changes are also fluid
     val containerColor by animateColorAsState(
-        targetValue = if (isSelected) MaterialTheme.colorScheme.surfaceContainerHigh else MaterialTheme.colorScheme.surfaceContainer,
-        animationSpec = tween(durationMillis = 300),
+        targetValue = if (isSelected) MaterialTheme.colorScheme.surfaceContainerHighest else MaterialTheme.colorScheme.surface,
+        animationSpec = spring(stiffness = Spring.StiffnessLow),
         label = "CardBackground"
     )
 
+    val borderStroke = if (isSelected) {
+        BorderStroke(2.dp, MaterialTheme.colorScheme.primary)
+    } else {
+        BorderStroke(0.dp, Color.Transparent)
+    }
+
+    // ---------------------------------
+
+    // --- POP VISUALS END ---
+
     val coverGradient = remember(category.name) {
-        val hash = category.name.hashCode()
+        val hash = category.name.hashCode().absoluteValue
         val hue = (hash % 360).toFloat()
         val color1 = Color.hsv(hue, 0.6f, 0.8f)
         val color2 = Color.hsv((hue + 40) % 360, 0.5f, 0.9f)
@@ -92,7 +139,16 @@ fun CategoryCard(
     ElevatedCard(
         modifier = modifier
             .fillMaxWidth()
-            .clickable { onEvent(HomeEvent.OnCategorySelected(category.categoryId)) },
+            .scale(scale)
+            .border(borderStroke, shape = cardShape) // Use animated shape
+            .clickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null // Remove default ripple if you want pure spring feel, or keep it
+            ) {
+                // Effects
+                haptics.performHapticFeedback(HapticFeedbackType.LongPress) // Physical feedback
+                onEvent(HomeEvent.OnCategorySelected(category.categoryId))
+            },
         shape = MaterialTheme.shapes.extraLarge,
         colors = CardDefaults.elevatedCardColors(containerColor = containerColor),
         elevation = CardDefaults.elevatedCardElevation(
@@ -101,7 +157,9 @@ fun CategoryCard(
     ) {
         Column {
             Row(
-                modifier = Modifier.fillMaxWidth().height(130.dp)
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(130.dp)
             ) {
                 // 1. COVER IMAGE
                 Box(
@@ -130,14 +188,20 @@ fun CategoryCard(
 
                 // 2. CONTENT
                 Column(
-                    modifier = Modifier.weight(1f).padding(12.dp)
+                    modifier = Modifier
+                        .weight(1f)
+                        .padding(12.dp)
                 ) {
                     // Title Row
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         Text(
                             text = category.name,
-                            style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
-                            color = MaterialTheme.colorScheme.onSurface,
+                            // 5. TYPOGRAPHY: Bigger and bolder title when selected
+                            style = if (isSelected)
+                                MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.ExtraBold)
+                            else
+                                MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.SemiBold),
+                            color = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface,
                             maxLines = 1,
                             overflow = TextOverflow.Ellipsis,
                             modifier = Modifier.weight(1f)
@@ -194,42 +258,60 @@ fun CategoryCard(
 
             // ... (Actions Row and Accordion remain the same as previous code) ...
             // I'll include the Actions Row here for completeness of the 'Column' block
-
-            Row(
-                modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp),
-                horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                IconButton(
-                    onClick = {
-                        if (!isSelected) onEvent(HomeEvent.OnCategorySelected(category.categoryId))
-                        isExpanded = !isExpanded
+// ACTIONS (Visible only on selection)
+            AnimatedVisibility(visible = isSelected) {
+                Column {
+                    HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f))
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 12.dp, vertical = 4.dp),
+                        horizontalArrangement = Arrangement.End,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        IconButton(
+                            onClick = {
+                                if (!isSelected) onEvent(HomeEvent.OnCategorySelected(category.categoryId))
+                                isExpanded = !isExpanded
+                            }
+                        ) {
+                            Icon(
+                                imageVector = if (isExpanded) Icons.Default.ArrowDropUp else Icons.Default.ArrowDropDown,
+                                contentDescription = "Expand",
+                                tint = MaterialTheme.colorScheme.primary
+                            )
+                        }
+                        Spacer(modifier = Modifier.weight(1f))
+                        IconButton(
+                            onClick = { onEvent(HomeEvent.OnEditCategoryClicked(category)) },
+                            modifier = Modifier.size(32.dp)
+                        ) {
+                            Icon(
+                                Icons.Default.Edit,
+                                "Edit",
+                                tint = MaterialTheme.colorScheme.primary,
+                                modifier = Modifier.size(20.dp)
+                            )
+                        }
+                        Spacer(modifier = Modifier.width(8.dp))
+                        IconButton(
+                            onClick = { onEvent(HomeEvent.OnDeleteCategoryClicked(category)) },
+                            modifier = Modifier.size(32.dp)
+                        ) {
+                            Icon(
+                                Icons.Default.Delete,
+                                "Delete",
+                                tint = MaterialTheme.colorScheme.error,
+                                modifier = Modifier.size(20.dp)
+                            )
+                        }
                     }
-                ) {
-                    Icon(
-                        imageVector = if (isExpanded) Icons.Default.ArrowDropUp else Icons.Default.ArrowDropDown,
-                        contentDescription = "Expand",
-                        tint = MaterialTheme.colorScheme.primary
-                    )
-                }
-                Spacer(modifier = Modifier.weight(1f))
-                IconButton(
-                    onClick = { onEvent(HomeEvent.OnEditCategoryClicked(category)) },
-                    modifier = Modifier.size(32.dp)
-                ) {
-                    Icon(Icons.Default.Edit, "Edit", tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(20.dp))
-                }
-                Spacer(modifier = Modifier.width(8.dp))
-                IconButton(
-                    onClick = { onEvent(HomeEvent.OnDeleteCategoryClicked(category)) },
-                    modifier = Modifier.size(32.dp)
-                ) {
-                    Icon(Icons.Default.Delete, "Delete", tint = MaterialTheme.colorScheme.error, modifier = Modifier.size(20.dp))
                 }
             }
 
 
             // ... (Accordion Section remains the same) ...
+            // ACTIONS (Visible only on selection)
             AnimatedVisibility(visible = isSelected && isExpanded) {
                 Column(
                     modifier = Modifier
@@ -249,7 +331,8 @@ fun CategoryCard(
                             Row(
                                 modifier = Modifier
                                     .fillMaxWidth()
-                                    .clickable { onEvent(HomeEvent.OnTaskListSelected(taskList.listId)) }                                    .padding(vertical = 8.dp),
+                                    .clickable { onEvent(HomeEvent.OnTaskListSelected(taskList.listId)) }
+                                    .padding(vertical = 8.dp),
                                 verticalAlignment = Alignment.CenterVertically
                             ) {
                                 Icon(
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryList.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryList.kt
index 0c7a51c78..eecb73e74 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryList.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryList.kt
@@ -53,7 +53,7 @@ fun CategoryList(
                 }
             } else {
                 // PHONE: Show expressive Cards
-                Column() {
+                Column {
                     Text("Cat Card")
                     CategoryCard(
                         // Construct the UI State object
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryListItem.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryListItem.kt
index bb99588db..5fa39d3de 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryListItem.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/CategoryListItem.kt
@@ -121,23 +121,23 @@ fun TrainlingContent(
 ) {
 
         // Compact Actions for Tablet
-        androidx.compose.foundation.layout.Row {
-            IconButton(onClick = { onEvent(HomeEvent.OnEditCategoryClicked(category)) }) {
-                Icon(
-                    imageVector = Icons.Default.Edit,
-                    contentDescription = "Edit",
-                    tint = if (isSelected) MaterialTheme.colorScheme.onPrimaryContainer
-                    else MaterialTheme.colorScheme.onSurface
-                )
-            }
-            IconButton(onClick = { onEvent(HomeEvent.OnDeleteCategoryClicked(category)) }) {
-                Icon(
-                    imageVector = Icons.Default.Delete,
-                    contentDescription = "Delete",
-                    tint = if (isSelected) MaterialTheme.colorScheme.onPrimaryContainer
-                    else MaterialTheme.colorScheme.error.copy(alpha = 0.7f)
-                )
-            }
+    Row {
+        IconButton(onClick = { onEvent(HomeEvent.OnEditCategoryClicked(category)) }) {
+            Icon(
+                imageVector = Icons.Default.Edit,
+                contentDescription = "Edit",
+                tint = if (isSelected) MaterialTheme.colorScheme.onPrimaryContainer
+                else MaterialTheme.colorScheme.onSurface
+            )
         }
+        IconButton(onClick = { onEvent(HomeEvent.OnDeleteCategoryClicked(category)) }) {
+            Icon(
+                imageVector = Icons.Default.Delete,
+                contentDescription = "Delete",
+                tint = if (isSelected) MaterialTheme.colorScheme.onPrimaryContainer
+                else MaterialTheme.colorScheme.error.copy(alpha = 0.7f)
+            )
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskList.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskList.kt
index befa560db..bd3b69476 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskList.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskList.kt
@@ -54,7 +54,7 @@ fun TaskList(
                     onAddClick = {}//onAddList
                 )
             } else {
-                Column() {
+                Column {
                     // Log that the grid is being displayed
                     Text("Source: TaskList.kt -- inside the else")
                     Log.d(TAG, "Displaying ${taskLists.size} task lists in a grid.")
diff --git a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskListItem.kt b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskListItem.kt
index 024cd2c33..8b02d69e1 100644
--- a/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskListItem.kt
+++ b/applications/photodo/features/home/src/main/java/com/ylabz/basepro/applications/photodo/features/home/ui/components/TaskListItem.kt
@@ -23,7 +23,7 @@ fun TaskListItem(
     onClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Column() {
+    Column {
         Text("Source: TaskListItem.kt")
         ElevatedCard(
             modifier = modifier
diff --git a/applications/photodo/features/photodolist/build.gradle.kts b/applications/photodo/features/photodolist/build.gradle.kts
index b4863685e..fa47da5f6 100644
--- a/applications/photodo/features/photodolist/build.gradle.kts
+++ b/applications/photodo/features/photodolist/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.android.build.api.dsl.LibraryExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -6,7 +10,7 @@ plugins {
     alias(libs.plugins.ksp)
 }
 
-android {
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.vbasepro.applications.photodo.photodolist"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
@@ -36,8 +40,13 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// 2. Configure Kotlin (Separately)
+// Use specific task configuration which is the safest way in 2024+
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
     }
 }
 
diff --git a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailEvents.kt b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailEvents.kt
index 6481dc6df..1b9a48c7d 100644
--- a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailEvents.kt
+++ b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailEvents.kt
@@ -2,12 +2,15 @@ package com.ylabz.basepro.applications.photodo.features.photodolist.ui.detail
 
 import android.net.Uri
 import com.ylabz.basepro.applications.photodo.db.entity.TaskItemEntity
+import com.ylabz.basepro.applications.photodo.db.entity.TaskListEntity
 
 /**
  * Defines the events that can be triggered from the PhotoDoDetail screen.
  */
 sealed interface PhotoDoDetailEvent {
 
+    data class OnEditList(val taskList: TaskListEntity) : PhotoDoDetailEvent
+
     /**
      * Event triggered when the user saves a new photo from the camera.
      * @param uri The URI of the saved photo.
diff --git a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailViewModel.kt b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailViewModel.kt
index c505530f8..22e8b8195 100644
--- a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailViewModel.kt
+++ b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/PhotoDoDetailViewModel.kt
@@ -45,7 +45,7 @@ class PhotoDoDetailViewModel @Inject constructor(
     fun loadTaskDetails(id: Long) {
         if (id == 0L) {
             Log.e(TAG, "Invalid listId (0), cannot load details.")
-            _uiState.update { it.copy(loadState = DetailLoadState.Error("Invalid Task ID")) }
+            _uiState.update { it.copy(loadState = Error("Invalid Task ID")) }
             return
         }
         if (id == this.listId) {
@@ -61,7 +61,7 @@ class PhotoDoDetailViewModel @Inject constructor(
             photoDoRepo.getTaskListWithPhotos(id)
                 .catch { e ->
                     Log.e(TAG, "Error loading task details", e)
-                    _uiState.update { it.copy(loadState = DetailLoadState.Error(e.message ?: "Unknown error")) }
+                    _uiState.update { it.copy(loadState = Error(e.message ?: "Unknown error")) }
                 }
                 .collect { taskListWithPhotos ->
                     if (taskListWithPhotos != null) {
@@ -75,7 +75,7 @@ class PhotoDoDetailViewModel @Inject constructor(
                         }
                     } else {
                         _uiState.update {
-                            it.copy(loadState = DetailLoadState.Error("Task not found"))
+                            it.copy(loadState = Error("Task not found"))
                         }
                     }
                 }
@@ -184,7 +184,12 @@ class PhotoDoDetailViewModel @Inject constructor(
                 }
             }
 
-
+            is PhotoDoDetailEvent.OnEditList -> {
+                Log.d(TAG, "Editing task list: ${event.taskList.name}")
+                viewModelScope.launch {
+                    //photoDoRepo.updateTaskList(event.taskList)
+                }
+            }//TODO()
         }
     }
 }
\ No newline at end of file
diff --git a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/components/DetailCard.kt b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/components/DetailCard.kt
index b6361378a..78e1fa2be 100644
--- a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/components/DetailCard.kt
+++ b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/detail/components/DetailCard.kt
@@ -1,6 +1,13 @@
 package com.ylabz.basepro.applications.photodo.features.photodolist.ui.detail.components
 
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -9,22 +16,34 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 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.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.CameraAlt
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
 import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -32,159 +51,348 @@ import androidx.compose.runtime.remember
 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.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import com.ylabz.basepro.applications.photodo.db.entity.PhotoEntity
 import com.ylabz.basepro.applications.photodo.db.entity.TaskListWithPhotos
 import com.ylabz.basepro.applications.photodo.features.photodolist.ui.detail.PhotoDoDetailEvent
 
 @Composable
 fun DetailCard(
     modifier: Modifier = Modifier,
-    taskListWithPhotos: TaskListWithPhotos, // UI State for this component
-    onEvent: (PhotoDoDetailEvent) -> Unit,  // Single Event Handler
+    taskListWithPhotos: TaskListWithPhotos,
+    onEvent: (PhotoDoDetailEvent) -> Unit
 ) {
-    // --- Local State for the "New Item" text field ---
+    val (taskList, photos, items) = taskListWithPhotos
     var newItemText by remember { mutableStateOf("") }
+    val scrollState = rememberScrollState()
+    val haptics = LocalHapticFeedback.current
 
     Column(
         modifier = modifier
             .fillMaxSize()
-            .verticalScroll(rememberScrollState())
-            .padding(horizontal = 16.dp),
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+            .verticalScroll(scrollState)
+            .padding(horizontal = 16.dp, vertical = 24.dp),
+        verticalArrangement = Arrangement.spacedBy(24.dp)
     ) {
-        // --- 1. HEADER INFO ---
-        ElevatedCard(modifier = Modifier.fillMaxWidth()) {
-            Column(Modifier.padding(16.dp)) {
-                Text(
-                    text = taskListWithPhotos.taskList.name,
-                    style = MaterialTheme.typography.headlineMedium,
-                    color = MaterialTheme.colorScheme.onSurface
-                )
-                if (!taskListWithPhotos.taskList.notes.isNullOrBlank()) {
-                    Spacer(Modifier.height(8.dp))
-                    Text(
-                        text = taskListWithPhotos.taskList.notes!!,
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
-                }
-            }
-        }
-
-        // --- 2. CHECKLIST ---
-        Text(
-            text = "Checklist",
-            style = MaterialTheme.typography.titleLarge,
-            color = MaterialTheme.colorScheme.primary
+        // --- 1. HERO HEADER ---
+        HeroHeaderCard(
+            title = taskList.name,
+            notes = taskList.notes,
+            onEditClick = { onEvent(PhotoDoDetailEvent.OnEditList(taskList)) }
         )
 
-        ElevatedCard(modifier = Modifier.fillMaxWidth()) {
-            Column {
-                if (taskListWithPhotos.items.isEmpty()) {
-                    Text(
-                        text = "No items added.",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        modifier = Modifier.padding(16.dp)
-                    )
-                } else {
-                    taskListWithPhotos.items.forEach { item ->
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 8.dp, vertical = 4.dp),
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            Checkbox(
-                                checked = item.isChecked,
+        // --- 2. CHECKLIST SECTION ---
+        Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+            SectionTitle(text = "Checklist")
+
+            ElevatedCard(
+                shape = RoundedCornerShape(24.dp),
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Column(modifier = Modifier.padding(16.dp)) {
+                    if (items.isEmpty()) {
+                        EmptyStateMessage(text = "No items yet. Add one below!")
+                    } else {
+                        items.forEach { item ->
+                            ExpressiveChecklistItem(
+                                text = item.text,
+                                isChecked = item.isChecked,
                                 onCheckedChange = { isChecked ->
-                                    // Trigger Event
+                                    haptics.performHapticFeedback(HapticFeedbackType.ContextClick)
                                     onEvent(PhotoDoDetailEvent.OnItemCheckedChange(item, isChecked))
+                                },
+                                onDelete = {
+                                    haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                                    onEvent(PhotoDoDetailEvent.OnDeleteItem(item))
                                 }
                             )
-                            Text(
-                                text = item.text,
-                                style = MaterialTheme.typography.bodyLarge,
-                                modifier = Modifier.weight(1f)
-                            )
+                            Spacer(modifier = Modifier.height(8.dp))
+                        }
+                    }
 
-                            // --- ADDED DELETE BUTTON ---
-                            IconButton(
-                                onClick = { onEvent(PhotoDoDetailEvent.OnDeleteItem(item)) }
-                            ) {
-                                Icon(
-                                    imageVector = Icons.Default.Delete,
-                                    contentDescription = "Delete Item",
-                                    tint = MaterialTheme.colorScheme.error.copy(alpha = 0.7f)
-                                )
-                            }
-                            // ---------------------------
+                    Spacer(modifier = Modifier.height(16.dp))
 
+                    // --- NEW ITEM INPUT ---
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        OutlinedTextField(
+                            value = newItemText,
+                            onValueChange = { newItemText = it },
+                            placeholder = { Text("Add new task...") },
+                            modifier = Modifier.weight(1f),
+                            shape = RoundedCornerShape(16.dp),
+                            singleLine = true,
+                            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                            keyboardActions = KeyboardActions(onDone = {
+                                if (newItemText.isNotBlank()) {
+                                    onEvent(PhotoDoDetailEvent.OnAddItemClicked(newItemText))
+                                    newItemText = ""
+                                }
+                            }),
+                            colors = TextFieldDefaults.colors(
+                                focusedIndicatorColor = Color.Transparent,
+                                unfocusedIndicatorColor = Color.Transparent,
+                                focusedContainerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                                unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer
+                            )
+                        )
+
+                        Spacer(Modifier.width(12.dp))
 
+                        FilledIconButton(
+                            onClick = {
+                                if (newItemText.isNotBlank()) {
+                                    haptics.performHapticFeedback(HapticFeedbackType.ContextClick)
+                                    onEvent(PhotoDoDetailEvent.OnAddItemClicked(newItemText))
+                                    newItemText = ""
+                                }
+                            },
+                            modifier = Modifier.size(48.dp)
+                        ) {
+                            Icon(Icons.Default.Add, contentDescription = "Add Item")
                         }
-                        HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f))
                     }
                 }
+            }
+        }
 
-                // --- ADD ITEM ROW ---
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(16.dp),
-                    verticalAlignment = Alignment.CenterVertically
+        // --- 3. PHOTOS SECTION (UPDATED UI) ---
+        Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+            // New Header Row with Add Button
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                SectionTitle(text = "Photos", modifier = Modifier.padding(bottom = 0.dp))
+                IconButton(
+                    onClick = {
+                        haptics.performHapticFeedback(HapticFeedbackType.ContextClick)
+                        onEvent(PhotoDoDetailEvent.OnCameraClick)
+                    }
                 ) {
-                    OutlinedTextField(
-                        value = newItemText,
-                        onValueChange = { newItemText = it },
-                        label = { Text("New Item") },
-                        modifier = Modifier.weight(1f),
-                        singleLine = true
+                    Icon(
+                        imageVector = Icons.Default.CameraAlt,
+                        contentDescription = "Add Photo",
+                        tint = MaterialTheme.colorScheme.primary
                     )
+                }
+            }
 
-                    Spacer(Modifier.width(8.dp))
+            LazyRow(
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+                contentPadding = PaddingValues(horizontal = 4.dp, vertical = 8.dp)
+            ) {
+                // REMOVED: The large "Add Photo" card item is gone.
 
-                    IconButton(
-                        onClick = {
-                            if (newItemText.isNotBlank()) {
-                                onEvent(PhotoDoDetailEvent.OnAddItemClicked(newItemText))
-                                newItemText = "" // Clear input after adding
-                            }
+                // Photo List
+                items(photos, key = { it.photoId }) { photo ->
+                    PhotoItem(
+                        photo = photo,
+                        onDeleteClick = {
+                            // Correctly calls the event from your system code
+                            onEvent(PhotoDoDetailEvent.OnDeletePhoto(photo.photoId))
                         }
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Add,
-                            contentDescription = "Add Item",
-                            tint = MaterialTheme.colorScheme.primary
-                        )
-                    }
+                    )
                 }
             }
         }
 
-        // --- 3. PHOTOS ---
-        Text(
-            text = "Photos",
-            style = MaterialTheme.typography.titleLarge,
-            color = MaterialTheme.colorScheme.primary
+        Spacer(Modifier.height(80.dp))
+    }
+}
+
+// ==========================================
+//        SUB-COMPONENTS
+// ==========================================
+
+@Composable
+fun PhotoItem(
+    photo: PhotoEntity,
+    onDeleteClick: () -> Unit
+) {
+    Box(
+        modifier = Modifier
+            .size(100.dp)
+            .clip(RoundedCornerShape(20.dp))
+            .background(MaterialTheme.colorScheme.surfaceContainer)
+    ) {
+        // --- FIX: USE COIL TO LOAD THE IMAGE ---
+        AsyncImage(
+            model = photo.uri, // Assuming your PhotoEntity has a 'uri' string field
+            contentDescription = "Task photo",
+            contentScale = ContentScale.Crop,
+            modifier = Modifier.fillMaxSize()
         )
+        // ---------------------------------------
 
-        LazyRow(
-            horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 4.dp)
+        // Delete Button Overlay
+        Box(
+            modifier = Modifier
+                .align(Alignment.TopEnd)
+                .padding(4.dp)
+                .size(24.dp)
+                .clip(CircleShape)
+                .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.7f))
+                .clickable(onClick = onDeleteClick),
+            contentAlignment = Alignment.Center
         ) {
-            item {
-                AddPhotoCard(onClick = { onEvent(PhotoDoDetailEvent.OnCameraClick) }) // Trigger Event
+            Icon(
+                imageVector = Icons.Default.Close,
+                contentDescription = "Delete photo",
+                modifier = Modifier.size(14.dp),
+                tint = MaterialTheme.colorScheme.onSurface
+            )
+        }
+    }
+}
+
+@Composable
+fun HeroHeaderCard(title: String, notes: String?, onEditClick: () -> Unit) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+
+    val scale by animateFloatAsState(
+        targetValue = if (isPressed) 0.98f else 1f,
+        label = "heroScale"
+    )
+
+    ElevatedCard(
+        modifier = Modifier
+            .fillMaxWidth()
+            .scale(scale)
+            .clickable(interactionSource = interactionSource, indication = null) { },
+        shape = RoundedCornerShape(28.dp),
+        elevation = CardDefaults.elevatedCardElevation(defaultElevation = 4.dp)
+    ) {
+        Column(Modifier.padding(24.dp)) {
+            Row(
+                verticalAlignment = Alignment.Top,
+                horizontalArrangement = Arrangement.SpaceBetween,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Column(modifier = Modifier.weight(1f)) {
+                    Text(
+                        text = title,
+                        style = MaterialTheme.typography.headlineMedium.copy(
+                            fontWeight = FontWeight.ExtraBold,
+                            letterSpacing = (-0.5).sp
+                        ),
+                        color = MaterialTheme.colorScheme.onSurface
+                    )
+                }
+                IconButton(
+                    onClick = onEditClick,
+                    modifier = Modifier.background(
+                        MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.5f),
+                        CircleShape
+                    )
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Edit,
+                        contentDescription = "Edit List",
+                        tint = MaterialTheme.colorScheme.onPrimaryContainer
+                    )
+                }
             }
-            items(taskListWithPhotos.photos, key = { it.photoId }) { photo ->
-                PhotoItem(
-                    photo = photo,
-                    onDeleteClick = {
-                        // onEvent(PhotoDoDetailEvent.OnDeletePhotoClicked(photo.photoId)) // Trigger Event
-                    }
+
+            if (!notes.isNullOrBlank()) {
+                Spacer(Modifier.height(12.dp))
+                Text(
+                    text = notes,
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
             }
         }
+    }
+}
+
+@Composable
+fun ExpressiveChecklistItem(
+    text: String,
+    isChecked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+    onDelete: () -> Unit
+) {
+    val backgroundColor by animateColorAsState(
+        targetValue = if (isChecked) MaterialTheme.colorScheme.surfaceContainerHigh else MaterialTheme.colorScheme.surface,
+        label = "rowColor"
+    )
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(12.dp))
+            .background(backgroundColor)
+            .clickable { onCheckedChange(!isChecked) }
+            .padding(12.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Checkbox(
+            checked = isChecked,
+            onCheckedChange = null,
+            colors = CheckboxDefaults.colors(
+                checkedColor = MaterialTheme.colorScheme.primary,
+                uncheckedColor = MaterialTheme.colorScheme.outline
+            )
+        )
+        Spacer(modifier = Modifier.width(12.dp))
+        Text(
+            text = text,
+            style = MaterialTheme.typography.bodyLarge.copy(
+                textDecoration = if (isChecked) TextDecoration.LineThrough else null
+            ),
+            color = if (isChecked) MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f) else MaterialTheme.colorScheme.onSurface,
+            modifier = Modifier.weight(1f),
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis
+        )
+        IconButton(
+            onClick = onDelete,
+            modifier = Modifier.size(32.dp),
+            colors = IconButtonDefaults.iconButtonColors(
+                contentColor = MaterialTheme.colorScheme.error.copy(alpha = 0.7f)
+            )
+        ) {
+            Icon(Icons.Default.Delete, contentDescription = "Delete", modifier = Modifier.size(20.dp))
+        }
+    }
+}
 
-        Spacer(Modifier.height(80.dp))
+// REMOVED: ExpressiveAddPhotoCard is no longer needed.
+
+@Composable
+fun SectionTitle(text: String, modifier: Modifier = Modifier) {
+    Text(
+        text = text,
+        style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+        color = MaterialTheme.colorScheme.primary,
+        modifier = modifier.padding(start = 4.dp, bottom = 4.dp)
+    )
+}
+
+@Composable
+fun EmptyStateMessage(text: String) {
+    Box(
+        modifier = Modifier.fillMaxWidth().padding(16.dp),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            text = text,
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
     }
 }
\ No newline at end of file
diff --git a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/list/PhotoDoListViewModel.kt b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/list/PhotoDoListViewModel.kt
index 1dcaa8be8..7214ce402 100644
--- a/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/list/PhotoDoListViewModel.kt
+++ b/applications/photodo/features/photodolist/src/main/java/com/ylabz/basepro/applications/photodo/features/photodolist/ui/list/PhotoDoListViewModel.kt
@@ -57,7 +57,7 @@ open class PhotoDoListViewModel @Inject constructor(
     }
 
     fun onEvent(event: PhotoDoListEvent) {
-        val currentCategoryId = _categoryId.value ?: return
+        _categoryId.value ?: return
 
         when (event) {
             /*is PhotoDoListEvent.OnDeleteAllTasksClicked -> {
diff --git a/applications/photodo/features/settings/build.gradle.kts b/applications/photodo/features/settings/build.gradle.kts
index 0b4a27807..ccd6989eb 100644
--- a/applications/photodo/features/settings/build.gradle.kts
+++ b/applications/photodo/features/settings/build.gradle.kts
@@ -35,8 +35,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21 // Aligned with feature:nav3
         targetCompatibility = JavaVersion.VERSION_21 // Aligned with feature:nav3
     }
-    kotlinOptions {
-        jvmTarget = "21" // Aligned with feature:nav3 (will use jvmToolchain if this causes issues)
+    kotlin {
+        jvmToolchain(21)
     }
 }
 
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MainActivity.kt b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MainActivity.kt
index 84478b636..10a65e8a1 100644
--- a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MainActivity.kt
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MainActivity.kt
@@ -52,7 +52,7 @@ class MainActivity : ComponentActivity() {
 // This Greeting composable is no longer used by MainActivity
 @Composable
 fun Greeting(name: String, modifier: Modifier = Modifier) {
-    val navController = rememberNavController()
+    rememberNavController()
     Surface(
         modifier = Modifier.fillMaxSize(),
         color = MaterialTheme.colorScheme.background
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MyApplication.kt b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MyApplication.kt
index e394901ad..53a251044 100644
--- a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MyApplication.kt
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/MyApplication.kt
@@ -6,10 +6,4 @@ import dagger.hilt.android.HiltAndroidApp
 @HiltAndroidApp
 class MyApplication : Application() {
 
-    override fun onCreate() {
-        super.onCreate()
-        // Coming soon!
-        //createNotificationChannels()
-    }
-
 }
\ No newline at end of file
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/Layout.md b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/Layout.md
new file mode 100644
index 000000000..ced06b14a
--- /dev/null
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/Layout.md
@@ -0,0 +1,71 @@
+Based on the code provided in `MainScreen.kt`, here is a conceptual preview of how your UI is laid out for both **Compact (Phone)** and **Expanded (Tablet/Desktop)** modes.
+
+### 1\. Compact Layout (Phone / Portrait)
+
+In this mode, the app uses a standard bottom navigation flow. Notably, your **Debug Stack UI** is attached to the bottom bar area.
+
+```text
++-------------------------------------------------+
+|  [TopAppBar]                                    |
+|  < Back   Title (e.g., "PhotoDo")       [Edit]  |
++-------------------------------------------------+
+|                                                 |
+|                                                 |
+|                                                 |
+|               [Main Content Area]               |
+|        (NavGraph: Home / List / Detail)         |
+|                                                 |
+|                                                 |
+|                                         [FAB]   |
+|                                       ( + )     |
++-------------------------------------------------+
+|  [HomeBottomBar] (Home | Tasks | Settings)      |
++-------------------------------------------------+
+|  [DebugStackUi] (Black Bar: Stack/Category info)| <--- Placed below/inside BottomBar
++-------------------------------------------------+
+```
+
+**Key Layout Details:**
+
+* **Navigation:** Controlled by `HomeBottomBar` at the bottom.
+* **Debug UI:** The `DebugStackUi` is nested inside the `bottomBar` slot's `Column`. It will appear attached to the bottom of the navigation icons.
+* **Content:** The `appContent` fills the space between the top bar and the bottom navigation assembly.
+
+-----
+
+### 2\. Expanded Layout (Tablet / Landscape)
+
+In this mode, the app shifts to a side navigation rail. The **Debug Stack UI** moves to the top of the content area.
+
+```text
++---+---------------------------------------------+
+| N |  [TopAppBar]                                |
+| A |  Title (e.g., "Task Lists")         [Trash] |
+| V |---------------------------------------------|
+|   |  [DebugStackUi] (Collapsible Debug Info)    | <--- Placed at the top of content
+| R |---------------------------------------------|
+| A |                                             |
+| I |                                             |
+| L |                                             |
+|   |            [Main Content Area]              |
+|   |      (Adaptive List/Detail Strategy)        |
+| H |      Pane 1: Categories | Pane 2: Tasks     |
+| O |                                             |
+| M |                                             |
+| E |                                     [FAB]   |
+|   |                                     ( + )   |
++---+---------------------------------------------+
+```
+
+**Key Layout Details:**
+
+* **Navigation:** `HomeNavigationRail` is fixed on the **Left**.
+* **Debug UI:** The `DebugStackUi` is the first element in the content `Column`, placing it directly **under the Top App Bar**.
+* **Content:** The `appContent` uses `Modifier.fillMaxSize()` to take up all remaining space below the debug bar.
+* **Double Padding Fix:** Your recent fix ensures `appContent` doesn't have double padding, so it should sit flush against the Debug UI.
+
+### 3\. Logic Highlights
+
+* **Smart Tab Selection:** The tab selection (`currentTopLevelKey`) automatically updates based on the backstack state (`backStack.lastOrNull()`). If you are viewing a "Task List", the "Tasks" tab will highlight even if you navigated there from a different flow.
+* **Fold Awareness:** The `LaunchedEffect(isExpandedScreen)` block detects if the device is folded (switching from Expanded to Compact). If this happens, it resets the navigation stack to the Root (Home) to prevent UI glitches where a Detail pane might get stuck without context.
+* **Dynamic FAB:** The FAB (`FabMain`) changes its icon and action based on the current destination in the `NavGraph` (e.g., "Add Category" on Home vs "Add Item" on Detail), as passed up via `setFabState`.
\ No newline at end of file
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/demo/navigation/FabActionTest.kt b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/demo/navigation/FabActionTest.kt
index ee02da1f1..56cf6d7fb 100644
--- a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/demo/navigation/FabActionTest.kt
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/demo/navigation/FabActionTest.kt
@@ -105,7 +105,7 @@ fun TestFabInApp() {
 
     Scaffold(
         floatingActionButton = {
-            com.ylabz.basepro.applications.photodo.ui.demo.navigation.ExpandingFabMenu(menuItems)
+            ExpandingFabMenu(menuItems)
         }
     ) { innerPadding ->
         Box(
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/PhotoDoAppNav3.kt b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/demo/navigation/PhotoDoAppNav3.kt
similarity index 93%
rename from applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/PhotoDoAppNav3.kt
rename to applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/demo/navigation/PhotoDoAppNav3.kt
index a27a2d593..0b3665176 100644
--- a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/PhotoDoAppNav3.kt
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/demo/navigation/PhotoDoAppNav3.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.applications.photodo.ui.navigation.main // Change this to your package name
+package com.ylabz.basepro.applications.photodo.ui.demo.navigation // Change this to your package name
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -51,8 +51,7 @@ import kotlinx.serialization.Transient
 
 // --- STEP 1: DEFINE DESTINATIONS (UPDATED) ---
 @Serializable
-sealed class AppScreen(val title: String) : NavKey {
-    @Transient
+private sealed class AppScreen(val title: String) : NavKey {
     abstract val icon: ImageVector
 
     @Serializable
@@ -86,7 +85,7 @@ sealed class AppScreen(val title: String) : NavKey {
 private val topLevelScreens = listOf(AppScreen.Home, AppScreen.Search, AppScreen.Profile)
 
 // Updated Saver to handle all AppScreen types.
-val AppScreenSaver = Saver<AppScreen, String>(
+private val AppScreenSaver = Saver<AppScreen, String>(
     save = { it.title },
     restore = { title -> topLevelScreens.find { it.title == title } ?: AppScreen.Home }
 )
@@ -96,13 +95,13 @@ val AppScreenSaver = Saver<AppScreen, String>(
 @OptIn(ExperimentalMaterial3WindowSizeClassApi::class, ExperimentalMaterial3AdaptiveApi::class)
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
-fun SimpleAdaptiveBottomBar() {
+private fun SimpleAdaptiveBottomBar() {
     val activity = LocalActivity.current as Activity
     val windowSizeClass = calculateWindowSizeClass(activity)
     val isExpandedScreen = windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact
 
     // The back stack now holds the generic NavKey type to accommodate different screen types.
-    val backStack = rememberNavBackStack<NavKey>(AppScreen.Home)
+    val backStack = rememberNavBackStack(AppScreen.Home)
     var currentTab: AppScreen by rememberSaveable(stateSaver = AppScreenSaver) {
         mutableStateOf(AppScreen.Home)
     }
@@ -151,7 +150,7 @@ fun SimpleAdaptiveBottomBar() {
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
-fun AppContent(
+private fun AppContent(
     backStack: NavBackStack<NavKey>,
     sceneStrategy: ListDetailSceneStrategy<NavKey>
 ) {
@@ -184,7 +183,7 @@ fun AppContent(
 }
 
 @Composable
-fun AppBottomBar(currentTab: AppScreen, onNavigate: (AppScreen) -> Unit) {
+private fun AppBottomBar(currentTab: AppScreen, onNavigate: (AppScreen) -> Unit) {
     NavigationBar {
         topLevelScreens.forEach { screen ->
             val isSelected = currentTab.title == screen.title
@@ -199,7 +198,7 @@ fun AppBottomBar(currentTab: AppScreen, onNavigate: (AppScreen) -> Unit) {
 }
 
 @Composable
-fun AppNavigationRail(currentTab: AppScreen, onNavigate: (AppScreen) -> Unit) {
+private fun AppNavigationRail(currentTab: AppScreen, onNavigate: (AppScreen) -> Unit) {
     NavigationRail {
         topLevelScreens.forEach { screen ->
             val isSelected = currentTab.title == screen.title
@@ -216,7 +215,7 @@ fun AppNavigationRail(currentTab: AppScreen, onNavigate: (AppScreen) -> Unit) {
 // --- STEP 4: ADD NEW SCREEN COMPOSABLES ---
 
 @Composable
-fun ListScreen(onItemClick: (Int) -> Unit) {
+private fun ListScreen(onItemClick: (Int) -> Unit) {
     Column(
         modifier = Modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -231,14 +230,14 @@ fun ListScreen(onItemClick: (Int) -> Unit) {
 }
 
 @Composable
-fun DetailScreen(id: Int) {
+private fun DetailScreen(id: Int) {
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
         Text(text = "Detail for item #$id", style = MaterialTheme.typography.headlineLarge)
     }
 }
 
 @Composable
-fun ScreenContent(name: String) {
+private fun ScreenContent(name: String) {
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
         Text(text = name, style = MaterialTheme.typography.headlineLarge)
     }
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/MainScreen.kt b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/MainScreen.kt
index 5ac3eaef7..3c0a50d33 100644
--- a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/MainScreen.kt
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/MainScreen.kt
@@ -1,7 +1,5 @@
 package com.ylabz.basepro.applications.photodo.ui.navigation.main
 
-// --- THIS IS THE CORRECT, REAL IMPORT ---
-// --- END ---
 import FabMain
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -74,17 +72,12 @@ fun MainScreen(
     val windowSizeClass = calculateWindowSizeClass(activity)
     val isExpandedScreen = windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact
 
-
     // 1. COLLECT THE STATE from the single source of truth
     val uiState by mainScreenViewModel.uiState.collectAsStateWithLifecycle()
     val scope = rememberCoroutineScope()
 
-
     // --- Navigation State ---
-    // NOTE: **Bottom Navigation State**
-    // The actual navigation history for the NavDisplay.
-    val backStack = rememberNavBackStack<NavKey>(PhotoDoNavKeys.HomeFeedKey)
-    // NOTE: **Adaptive Navigation State**
+    val backStack = rememberNavBackStack(PhotoDoNavKeys.HomeFeedKey)
     val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>()
 
     val currentListId by remember {
@@ -94,50 +87,17 @@ fun MainScreen(
         }
     }
 
-    /*
-    val backStack = rememberNavBackStack(PhotoDoNavKeys.HomeFeedKey)
-    // 2. Use the *real* function from the 'adaptive-navigation3' library
-    val sceneStrategy = rememberListDetailSceneStrategy<NavKey>()
-    */
-
-
     // --- Bottom Sheet State ---
     val modalSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     val showBottomSheet = uiState.currentSheet != BottomSheetType.NONE
 
-
-    // val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    // --- Top Bar State ---
+    // --- Top Bar & FAB State ---
     var topBar: (@Composable (TopAppBarScrollBehavior) -> Unit) by remember { mutableStateOf({}) }
-    val setTopBar: (@Composable (TopAppBarScrollBehavior) -> Unit) -> Unit = { topBar = it }
-    // -- Fix this
-    //var topBar: @Composable () -> Unit by remember { mutableStateOf({}) }
-    //var fabState: FabStateMenu? by remember { mutableStateOf(null) }
-
     // 1. Define the state for the FAB. It's nullable.
     var currentFabState by remember { mutableStateOf<FabState?>(null) }
 
-
     // --- Back Stack Management ---
-
-    //NOTE: **Top-Level Navigation State**
-    // (`currentTopLevelKey`): This tracks which main section of the app the user is in (e.g., "Home," "Tasks," or "Settings")
-    // The currently selected top-level tab. `rememberSaveable` ensures this state survives process death.
-    /* var currentTopLevelKey: NavKey by rememberSaveable(stateSaver = NavKeySaver) {
-        mutableStateOf(PhotoDoNavKeys.HomeFeedKey)
-    }*/
-
-    /*var currentTopLevelKey: NavKey by remember(backStack) {
-        mutableStateOf(
-            backStack.lastOrNull { entry: NavKey ->
-                TopLevelDestination.entries.any { dest -> dest.key::class == entry::class }
-            } ?: PhotoDoNavKeys.HomeFeedKey
-        )
-    }*/
-
     // --- FIX: SMART TAB SELECTION ---
-    // 1. Check the TOP of the stack (Are we looking at a TaskList?)
-    // 2. If not, check the ROOT of the stack (Where did we start?)
     val currentTopLevelKey by remember {
         derivedStateOf {
             val top = backStack.lastOrNull()
@@ -155,42 +115,18 @@ fun MainScreen(
             findTab(top) ?: findTab(root) ?: PhotoDoNavKeys.HomeFeedKey
         }
     }
-    // --------------------------------
-
-    // 1. Observe the categories from the HomeViewModel (you'll need to expose them or the HomeUiState)
-    // Ideally, MainScreenViewModel should hold this "global" state, but for now, let's assume
-    // you can check if the ID is valid.
-
-    // A simpler fix for now: Make the default nullable and handle the null case.
-    // var lastSelectedCategoryId by rememberSaveable { mutableStateOf<Long?>(null) }
-
-    // Remember the last category ID the user interacted with. Default to 1L since we know it has data.
-    // --- Remembered State for "Add List" ---
-    // var lastSelectedCategoryId by rememberSaveable { mutableLongStateOf(1L) }
 
     // --- Navigation Handler ---
-    // =================================================================
-    // START OF FIX
-    // =================================================================
     val onNavigate: (NavKey) -> Unit = { navKey ->
-        // NAV_LOG: Log top-level tab navigation click
         Log.d(TAG, "NAVIGATION -- onNavigate triggered with navKey: ${navKey::class.simpleName}")
 
-        // When navigating via BottomBar/Rail, if the target is the List tab,
-        // use the last selected category ID instead of the hardcoded one.
         val keyToNavigate: NavKey = if (navKey is PhotoDoNavKeys.TaskListKey) {
             if (uiState.lastSelectedCategoryId != null) {
-                Log.d(TAG, "NAVIGATION -START-  -> List tab clicked. Overriding to last selected categoryId: ${uiState.lastSelectedCategoryId}")
-                // Read from the uiState instead of the local variable
-                // CHECK: Do we have a valid category ID?
                 PhotoDoNavKeys.TaskListKey(uiState.lastSelectedCategoryId!!)
             } else {
-                Log.d(TAG, "NAVIGATION --  -> List tab clicked, but no category is selected. Aborting navigation.")
-                // Abort navigation by returning null
                 PhotoDoNavKeys.TaskListKey(null)
             }
         } else {
-            Log.d(TAG, "NAVIGATION --  -> Tab is not TaskListKey, using original key.")
             navKey
         }
 
@@ -206,43 +142,12 @@ fun MainScreen(
                 backStack.subList(1, backStack.size).clear()
             }
         }
-
-        /*if (keyToNavigate != null) {
-            // --- THIS IS THE FIX ---
-            // Check if we are *already* at the root of the stack with this *exact* key.
-            // backStack.firstOrNull() checks the current root.
-            val isAlreadyAtRoot = backStack.firstOrNull() == keyToNavigate && backStack.size == 1
-
-            if (!isAlreadyAtRoot) {
-                // This block now correctly handles:
-                // 1. Switching to a new tab.
-                // 2. Popping to the root of the *current* tab (e.g., from a detail screen).
-                // 3. Switching between two keys of the *same* class (e.g., TaskListKey(2) -> TaskListKey(5)).
-                Log.d(TAG, "NAVIGATION --  -> Navigating to ${keyToNavigate::class.simpleName}. Replacing stack.")
-                currentTopLevelKey = keyToNavigate
-                backStack.replaceAll(keyToNavigate) // Clear history when switching tabs or popping to root
-            } else {
-                // We are already at the root of the correct tab, so do nothing.
-                Log.d(TAG, "NAVIGATION --  -> Already on top-level tab ${keyToNavigate::class.simpleName} at root. No change.")
-            }
-            // --- END OF FIX ---
-
-            // NAV_LOG: Log navigation
-            Log.d(TAG, "NAVIGATION -DONE- onNavigate triggered with navKey: ${navKey::class.simpleName}")
-        } else {
-            Log.d(TAG, "NAVIGATION -- Aborted.")
-        } */
     }
-    // =================================================================
-    // END OF FIX
-    // =================================================================
 
     // A key that forces recomposition when the back stack changes.
-    // CORRECTED KEY: This now uses derivedStateOf to be state-aware.
     val backStackKey by remember {
         derivedStateOf {
             backStack.joinToString("-") { navKey ->
-                Log.d(TAG, "NAVIGATION -RECOMPOSITION- onNavigate triggered with navKey: ${navKey::class.simpleName}")
                 when (navKey) {
                     is PhotoDoNavKeys.TaskListKey -> "TaskList(${navKey.categoryId})"
                     else -> navKey.javaClass.simpleName
@@ -252,111 +157,135 @@ fun MainScreen(
     }
 
     // --- FIX: RESET STACK ON FOLD For Testing ---
-    // When the device is folded (Expanded -> Compact), we force the stack
-    // back to the root. This ensures the user sees the "List" (Categories)
-    // instead of getting stuck on the "Detail" (Task List).
-    // --- FIX: RESET STACK ON FOLD ---
     LaunchedEffect(isExpandedScreen) {
         if (!isExpandedScreen) {
-            // LOGGING: See exactly what is in the stack when you fold
             Log.d(TAG, "Fold Detected. Current Stack Size: ${backStack.size}")
-            backStack.forEachIndexed { index, key ->
-                Log.d(TAG, "Stack [$index]: ${key::class.simpleName}")
-            }
-
             if (backStack.size > 1) {
                 Log.d(TAG, "Resetting stack to Root (Home).")
-                // Correctly keep the first item (Home), remove the rest (Details)
                 backStack.subList(1, backStack.size).clear()
-            } else {
-                Log.d(TAG, "Stack size is 1. Already at Root (or Navigation was incorrect).")
             }
         }
     }
 
-    // NAV_LOG: Log the current back stack state before rendering AppContent
     Log.d(TAG, "BackStack state before AppContent: $backStackKey")
 
-    // --- 4. Define the app content ONCE ---
-    // This is the NavGraph that contains all the screens
-    val appContent = @Composable { modifier: Modifier ->
-        key(backStackKey) {
-            if (backStack.isNotEmpty()) {
-                PhotoDoNavGraph(
-                    modifier = modifier,
-                    backStack = backStack,
-                    sceneStrategy = listDetailStrategy,
-                    isExpandedScreen = isExpandedScreen,
-                    scrollBehavior = scrollBehavior,
-                    setTopBar = { topBar = { it(scrollBehavior) } },
-                    // THIS IS WHERE THE FUNCTION IS CREATED AND PASSED DOWN
-                    setFabState = { newFabState -> currentFabState = newFabState },
-                    // setFabState = { fabState = it },
-                    onCategorySelected = { categoryId ->
-                        // NAV_LOG: Log when the last selected category ID is updated
-                        Log.d(TAG, "onCategorySelected callback triggered. Updating lastSelectedCategoryId to: $categoryId")
-                        mainScreenViewModel.onEvent(MainScreenEvent.OnCategorySelected(categoryId))
-                    },
-                    // Pass the ACTIONS down.
-                    onEvent = mainScreenViewModel::onEvent
+    // --- RENDER CONTENT ---
+    // We pass the "NavGraph" as a lambda to the stateless content
+    MainScreenContent(
+        isExpandedScreen = isExpandedScreen,
+        uiState = uiState,
+        currentTopLevelKey = currentTopLevelKey,
+        currentFabState = currentFabState,
+        backStackKey = backStackKey,
+        currentListId = currentListId,
+        scrollBehavior = scrollBehavior,
+        topBar = topBar,
+        onNavigate = onNavigate,
+        onEvent = mainScreenViewModel::onEvent,
+        content = { modifier ->
+            // The actual Navigation Graph
+            key(backStackKey) {
+                if (backStack.isNotEmpty()) {
+                    PhotoDoNavGraph(
+                        modifier = modifier,
+                        backStack = backStack,
+                        sceneStrategy = listDetailStrategy,
+                        isExpandedScreen = isExpandedScreen,
+                        scrollBehavior = scrollBehavior,
+                        setTopBar = { topBar = { it(scrollBehavior) } },
+                        setFabState = { newFabState -> currentFabState = newFabState },
+                        onCategorySelected = { categoryId ->
+                            Log.d(TAG, "onCategorySelected callback triggered. Updating lastSelectedCategoryId to: $categoryId")
+                            mainScreenViewModel.onEvent(MainScreenEvent.OnCategorySelected(categoryId))
+                        },
+                        onEvent = mainScreenViewModel::onEvent
+                    )
+                }
+            }
+        }
+    )
 
+    // --- BOTTOM SHEETS ---
+    if (showBottomSheet) {
+        ModalBottomSheet(
+            onDismissRequest = {
+                mainScreenViewModel.onEvent(MainScreenEvent.OnBottomSheetDismissed)
+            },
+            sheetState = modalSheetState
+        ) {
+            when (uiState.currentSheet) {
+                BottomSheetType.ADD_CATEGORY -> {
+                    AddCategoryBottomSheet(
+                        uiState = uiState,
+                        onEvent = mainScreenViewModel::onEvent
+                    )
+                }
+                BottomSheetType.ADD_LIST -> {
+                    AddListSheet(
+                        state = uiState,
+                        onEvent = mainScreenViewModel::onEvent
+                    )
+                }
+                BottomSheetType.ADD_ITEM -> AddItemBottomSheet(
+                    onAddClick = {
+                        Log.d(TAG, "Adding Item (Photo) - Not yet implemented")
+                        scope.launch { modalSheetState.hide() }.invokeOnCompletion {
+                            mainScreenViewModel.onEvent(MainScreenEvent.OnBottomSheetDismissed)
+                        }
+                    }
                 )
+                BottomSheetType.NONE -> {}
             }
         }
     }
+}
 
-    /**
-     *Explanation of the Comments:
-     * Main Block Comment: This provides a high-level overview of what the entire if/else statement is for, explaining that it's the central piece of the adaptive UI.
-     * Expanded Layout Comment: This comment specifically describes the "if" part of the logic, explaining why a Row and HomeNavigationRail are used for larger screens.
-     * Compact Layout Comment: This describes the "else" block, clarifying that a standard Scaffold with a HomeBottomBar is the appropriate choice for smaller, vertical screens like phones.
-     * These comments should make the code much easier for other developers (and your future self!) to understand at a glance.
-     */
-
-    /**
-     * ---------------------------------------------------------------------------------
-     * ADAPTIVE UI SCAFFOLDING
-     * ---------------------------------------------------------------------------------
-     * This logic block is the core of the app's adaptive layout. It checks the
-     * 'isExpandedScreen' boolean to determine the device's screen size category
-     * (calculated using Material 3's WindowSizeClass).
-     *
-     * - For EXPANDED screens (like tablets or desktops), it creates a side-by-side
-     * layout using a Row, placing a NavigationRail on the left and the main
-     * app content on the right.
-     *
-     * - For COMPACT screens (like most phones in portrait mode), it uses a standard
-     * Scaffold with a HomeBottomBar at the bottom for navigation.
-     *
-     * This approach ensures the UI is optimized for different form factors, providing
-     * an intuitive user experience on any device.
-     * ---------------------------------------------------------------------------------
-     */
+/**
+ * ---------------------------------------------------------------------------------
+ * STATELESS COMPOSABLE: MainScreenContent
+ * ---------------------------------------------------------------------------------
+ * This extracted composable handles the ADAPTIVE UI SCAFFOLDING layout.
+ * It separates the layout logic (Row vs Column) from the ViewModel and State logic.
+ *
+ * This allows for:
+ * 1. Previews (by passing mock state).
+ * 2. Easier testing.
+ * 3. Fixing layout bugs (like double padding) in one place.
+ * ---------------------------------------------------------------------------------
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainScreenContent(
+    isExpandedScreen: Boolean,
+    uiState: MainScreenUiState, // Ensure this matches your actual State class name
+    currentTopLevelKey: NavKey,
+    currentFabState: FabState?,
+    backStackKey: String,
+    currentListId: String?,
+    scrollBehavior: TopAppBarScrollBehavior,
+    topBar: @Composable (TopAppBarScrollBehavior) -> Unit,
+    onNavigate: (NavKey) -> Unit,
+    onEvent: (MainScreenEvent) -> Unit,
+    content: @Composable (Modifier) -> Unit
+) {
     if (isExpandedScreen) {
-    // **Expanded Layout: Show Navigation Rail**
+        // **Expanded Layout: Show Navigation Rail**
         Row(modifier = Modifier.fillMaxSize()) {
             HomeNavigationRail(
                 currentTopLevelKey = currentTopLevelKey,
                 onNavigate = onNavigate
-                /* onNavigate = { key ->
-                    if (key::class != currentTopLevelKey::class) {
-                        currentTopLevelKey = key
-                        backStack.replace(key)
-                    }
-                }*/
             )
             Scaffold(
-                // **Expanded Layout: Show Bottom Bar**
                 modifier = Modifier
                     .weight(1f)
                     .nestedScroll(scrollBehavior.nestedScrollConnection),
                 topBar = { topBar(scrollBehavior) },
                 floatingActionButton = {
-                    // 7. Render the FAB from the VM state
                     FabMain(fabState = currentFabState)
                 }
             ) { padding ->
                 Column(
+                    // 1. This padding handles the TopBar offset correctly
                     modifier = Modifier.padding(padding)
                 ) {
                     DebugStackUi(
@@ -365,12 +294,17 @@ fun MainScreen(
                         currentListId = currentListId,
                         currentFabState = currentFabState
                     )
-                    appContent(Modifier.padding(padding))
+
+                    // --- FIX: NO PADDING HERE ---
+                    // The parent Column is already padded. passing Modifier.fillMaxSize()
+                    // ensures the content fills the remaining space without adding
+                    // a second layer of padding.
+                    content(Modifier.fillMaxSize())
                 }
             }
         }
     } else {
-// **Compact Layout: Show Bottom Bar**
+        // **Compact Layout: Show Bottom Bar**
         Scaffold(
             modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
             topBar = { topBar(scrollBehavior) },
@@ -379,12 +313,6 @@ fun MainScreen(
                     HomeBottomBar(
                         currentTopLevelKey = currentTopLevelKey,
                         onNavigate = onNavigate
-                        /*onNavigate = { key ->
-                        if (key::class != currentTopLevelKey::class) {
-                            currentTopLevelKey = key
-                            backStack.replaceTop(key)
-                        }
-                    }*/
                     )
                     // Add the new collapsible debug UI
                     DebugStackUi(
@@ -396,97 +324,25 @@ fun MainScreen(
                 }
             },
             floatingActionButton = {
-                // 7. Render the FAB from the VM state
                 FabMain(fabState = currentFabState)
             }
         ) { padding ->
-            appContent(Modifier.padding(padding))
-        }
-    }
-// --- END OF YOUR CORRECT LAYOUT LOGIC ---
-
-// --- END OF YOUR CORRECT LAYOUT LOGIC ---
-// G. SHOW BOTTOM SHEETS based on the collected state
-    if (showBottomSheet) {
-        ModalBottomSheet(
-            onDismissRequest = {
-                mainScreenViewModel.onEvent(MainScreenEvent.OnBottomSheetDismissed)
-            },
-            sheetState = modalSheetState
-        ) {
-            when (uiState.currentSheet) {
-                // --- UPDATED: CLEAN CALL SITE ---
-                BottomSheetType.ADD_CATEGORY -> {
-                    AddCategoryBottomSheet(
-                        uiState = uiState,
-                        onEvent = mainScreenViewModel::onEvent
-                    )
-                }
-                // --------------------------------
-
-                // --- UPDATED CALL SITE ---
-                BottomSheetType.ADD_LIST -> {
-                    AddListSheet(
-                        state = uiState,
-                        onEvent = mainScreenViewModel::onEvent
-                    )
-                }
-                // -------------------------
-
-                /*BottomSheetType.ADD_LIST -> AddListBottomSheet(
-                    onDismiss = { mainScreenViewModel.onEvent(MainScreenEvent.OnBottomSheetDismissed) },
-                    onSaveList = { title: String, description: String ->
-                        // --- NEW LOGIC ---
-                        // Get the current category ID from the ViewModel's state
-                        val currentCategoryId = uiState.lastSelectedCategoryId
-
-                        // 1. Send the save event with all necessary data
-                        if (currentCategoryId != null) {
-                            // YES: Unwrap it (smart cast to Long) and send the event
-                            mainScreenViewModel.onEvent(
-                                MainScreenEvent.OnSaveList(
-                                    title = title,
-                                    description = description,
-                                    categoryId = currentCategoryId
-                                )
-                            )
-                        } else {
-                            // NO: Do not send the event. Show an error or log it.
-                            Log.e("MainScreen", "Cannot save list. No category selected.")
-
-                            // 2. Dismiss the sheet (or use the onDismiss handler)
-                            mainScreenViewModel.onEvent(MainScreenEvent.OnBottomSheetDismissed)
-                            // --- END NEW LOGIC ---
-                        }
-                    }
-                )*/
-
-                BottomSheetType.ADD_ITEM -> AddItemBottomSheet(
-                    onAddClick = {
-                        Log.d(TAG, "Adding Item (Photo) - Not yet implemented")
-                        scope.launch { modalSheetState.hide() }.invokeOnCompletion {
-                            mainScreenViewModel.onEvent(MainScreenEvent.OnBottomSheetDismissed)
-                        }
-                    }
-                )
-
-                BottomSheetType.NONE -> {}
-            }
+            // In compact mode, we DO need to pass the padding down, because
+            // the content is a direct child of Scaffold, not wrapped in a padded Column.
+            content(Modifier.padding(padding))
         }
     }
 }
 
-
-
 @Composable
 fun AddItemBottomSheet(onAddClick: () -> Unit) {
     Text("Add Item Bottom Sheet")
 }
-// Helper extension functions
 
+// Helper extension functions
 fun <T : Any> MutableList<T>.replaceAll(item: T) {
     clear(); add(item)
 }
 fun <T : Any> MutableList<T>.replaceTop(item: T) {
     if (isNotEmpty()) this[lastIndex] = item else add(item)
-}
+}
\ No newline at end of file
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/PhotoDoNavGraph.kt b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/PhotoDoNavGraph.kt
index f2e0e911d..c58858cc8 100644
--- a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/PhotoDoNavGraph.kt
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/PhotoDoNavGraph.kt
@@ -246,7 +246,7 @@ fun PhotoDoNavGraph(
              */
             entry<PhotoDoNavKeys.TaskListDetailKey>(metadata = ListDetailSceneStrategy.detailPane()) { detailKey ->
                 // Call the extracted composable, passing in the necessary state.
-                Column() {
+                Column {
                     Text (" PhotoDoNavGraph.kt --- Fab needs to be set here")
                     DetailEntry(
                         modifier = Modifier, // <-- FIX #9: Remove the modifier to prevent double padding
diff --git a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/entries/HomeEntry.kt b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/entries/HomeEntry.kt
index fbc79819d..62504de74 100644
--- a/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/entries/HomeEntry.kt
+++ b/applications/photodo/src/main/java/com/ylabz/basepro/applications/photodo/ui/navigation/main/entries/HomeEntry.kt
@@ -87,27 +87,26 @@ fun HomeEntry(
             // 1. Notify the MainScreen's ViewModel (which stores lastSelectedCategoryId)
             onCategorySelected(categoryId)
 
-            val newTaskListKey = PhotoDoNavKeys.HomeTaskListKey(categoryId)
+            // 2. TABLET LOGIC (Split Screen)
+            // On a big screen, we DO want to update the right-hand pane immediately.
+            if (isExpandedScreen) {
+                Log.d(TAG, "Tablet: Updating detail pane for Category $categoryId")
 
-            // 2. CRITICAL STEP: Clear all existing drill-down items (Columns 2 and 3).
-            // This prevents bloat when switching categories (Family -> Shopping).
-            // Navigate (Always add to stack on explicit click)
-            if (backStack.size > 1) {
-                Log.d(TAG, "Category Selected. Resetting stack from size ${backStack.size}.")
-                // Remove everything after the first item (HomeFeedKey).
-                backStack.subList(1, backStack.size).clear()
-            }
-            // backStack.add(newTaskListKey) clicking on a category should never show an Item
-            // 3. Add the new TaskListKey. This adds Column 2 content.
-            // Log.d(TAG, "Adding new TaskListKey($categoryId) to backStack.")
-            if (!isExpandedScreen) {
-                // 2. Create the destination Key (The root of the Tasks tab)
-                val taskTabKey = PhotoDoNavKeys.TaskListKey(categoryId)
-
-                // 3. SWITCH TABS: Clear the stack and start fresh with the Task List
-                backStack.clear()
-                backStack.add(taskTabKey)
+                val newTaskListKey = PhotoDoNavKeys.HomeTaskListKey(categoryId)
+
+                // Clear previous drill-downs to avoid stacking multiple detail panes
+                if (backStack.size > 1) {
+                    backStack.subList(1, backStack.size).clear()
+                }
+
+                // Show the new list on the right
+                backStack.add(newTaskListKey)
             }
+
+            // 3. PHONE LOGIC (Closed)
+            // We do NOTHING here.
+            // We removed the `if (!isExpandedScreen) { backStack.add(...) }` block.
+            // Result: User stays on Home, Card highlights, no forced jump.
         }
     }
     // ----------------------
@@ -247,12 +246,13 @@ fun HomeEntry(
 
         onCategoryClick = { categoryId ->
             // ... (Keep existing logic) ...
+            // ONLY trigger the event. Do NOT manipulate backStack here.
             homeViewModel.onEvent(HomeEvent.OnCategorySelected(categoryId))
-            if (!isExpandedScreen) {
+            /*if (!isExpandedScreen) {
                 val newTaskListKey = PhotoDoNavKeys.TaskListKey(categoryId)
                 if (backStack.size > 1) { backStack.subList(1, backStack.size).clear() }
                 backStack.add(newTaskListKey)
-            }
+            }*/
         },
 
         // --- IMPLEMENT NEW CALLBACK ---
@@ -270,7 +270,7 @@ fun HomeEntry(
                 "Step3: Navigating from Task List Item to Detail Screen with listId: $listId"
             )
 
-            val currentTop = backStack.lastOrNull()
+            backStack.lastOrNull()
 
             // 1. Create the key for the final detail screen (Pane 3).
             val detailKey = PhotoDoNavKeys.TaskListDetailKey(listId.toString())
diff --git a/applications/rxdigita/features/medlist/src/main/java/com/zoewave/basepro/applications/rxdigita/features/medlist/ui/MedListUiRoute.kt b/applications/rxdigita/features/medlist/src/main/java/com/zoewave/basepro/applications/rxdigita/features/medlist/ui/MedListUiRoute.kt
index 741fb0fcd..891f8c7fb 100644
--- a/applications/rxdigita/features/medlist/src/main/java/com/zoewave/basepro/applications/rxdigita/features/medlist/ui/MedListUiRoute.kt
+++ b/applications/rxdigita/features/medlist/src/main/java/com/zoewave/basepro/applications/rxdigita/features/medlist/ui/MedListUiRoute.kt
@@ -4,7 +4,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 
 
 @Composable
@@ -13,9 +13,7 @@ fun MedListUiRoute(
     navTo: (String) -> Unit,
     viewModel: MedListViewModel = hiltViewModel()
 ) {
-    val uiState = viewModel.uiState.collectAsState().value
-
-    when (uiState) {
+    when (val uiState = viewModel.uiState.collectAsState().value) {
         is MedListUiState.Loading -> {
             Text(modifier = modifier, text = "Loading MedList Feature...")
         }
diff --git a/applications/rxdigita/features/settings/build.gradle.kts b/applications/rxdigita/features/settings/build.gradle.kts
index 0ce776497..829a096e0 100644
--- a/applications/rxdigita/features/settings/build.gradle.kts
+++ b/applications/rxdigita/features/settings/build.gradle.kts
@@ -1,17 +1,20 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.android) // ✅ KEEP THIS (Ignore the warning)
     alias(libs.plugins.kotlin.compose)
-    // alias(libs.plugins.hilt.gradle)
+    alias(libs.plugins.hilt.gradle)    // ✅ UNCOMMENTED (Required for Hilt)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.zoewave.basepro.applications.rxdigita.features.settings"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk =  libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,24 +27,27 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works better with built-in Kotlin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
 dependencies {
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material.legacy)
@@ -49,21 +55,23 @@ dependencies {
     // Compose
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons.extended)
     debugImplementation(libs.androidx.ui.tooling)
 
     // Hilt
     implementation(libs.hilt.android)
+    // Note: This dependency looks like it belongs to a different app ("ashbike").
+    // If this is a copy-paste error, you might want to remove it.
+    // If you are sharing code between apps, keep it.
     implementation(project(":applications:ashbike:features:main"))
+
     implementation(project(":core:ui"))
-    ksp(libs.hilt.android.compiler)   // Hilt compiler dependency for annotation processing
-    // Hilt Dependency Injection
-    // kapt(libs.hilt.compiler)
+    ksp(libs.hilt.android.compiler)
 
     // Compose Navigation
-    implementation(libs.androidx.navigation.compose) // Added Compose Navigation dependency with safe args plugin
+    implementation(libs.androidx.navigation.compose)
     implementation(libs.hilt.navigation.compose)
 
-
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/applications/rxdigita/features/settings/src/main/java/com/zoewave/basepro/applications/rxdigita/features/settings/ui/SettingsUiRoute.kt b/applications/rxdigita/features/settings/src/main/java/com/zoewave/basepro/applications/rxdigita/features/settings/ui/SettingsUiRoute.kt
index ebf593c8c..a8ea0c761 100644
--- a/applications/rxdigita/features/settings/src/main/java/com/zoewave/basepro/applications/rxdigita/features/settings/ui/SettingsUiRoute.kt
+++ b/applications/rxdigita/features/settings/src/main/java/com/zoewave/basepro/applications/rxdigita/features/settings/ui/SettingsUiRoute.kt
@@ -20,9 +20,7 @@ fun SettingsUiRoute(
     viewModel: SettingsViewModel = hiltViewModel()
     // Add other ViewModels like NfcViewModel, BluetoothLeViewModel if needed for rxdigita settings
 ) {
-    val uiState = viewModel.uiState.collectAsState().value
-
-    when (uiState) {
+    when (val uiState = viewModel.uiState.collectAsState().value) {
         is SettingsUiState.Loading -> {
             Text(modifier = modifier, text = "Loading Settings for RxDigita...")
         }
diff --git a/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/MyApplication.kt b/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/MyApplication.kt
index 2db18bbdb..9f82c4ea5 100644
--- a/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/MyApplication.kt
+++ b/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/MyApplication.kt
@@ -4,6 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class MyApplication : Application() {
-
-}
+class MyApplication : Application()
diff --git a/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/ui/navigation/main/TopBarForCurrentRoute.kt b/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/ui/navigation/main/TopBarForCurrentRoute.kt
index cc2ffd1c1..fb49b36d5 100644
--- a/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/ui/navigation/main/TopBarForCurrentRoute.kt
+++ b/applications/rxdigita/src/main/java/com/zoewave/basepro/applications/rxdigita/ui/navigation/main/TopBarForCurrentRoute.kt
@@ -16,9 +16,7 @@ import com.ylabz.basepro.core.ui.BikeScreen
 @Composable
 fun TopBarForCurrentRoute(navController: NavHostController) {
     val backStack by navController.currentBackStackEntryAsState()
-    val route = backStack?.destination?.route
-
-    when (route) {
+    when (val route = backStack?.destination?.route) {
         BikeScreen.HomeBikeScreen.route -> AppTopBar(title = "AshBike")
         BikeScreen.TripBikeScreen.route -> AppTopBar(title = "Trips")
         BikeScreen.SettingsBikeScreen.route -> AppTopBar(title = "Settings")
diff --git a/applications/rxtrack/build.gradle.kts b/applications/rxtrack/build.gradle.kts
index d0c53b19d..b49dba5c8 100644
--- a/applications/rxtrack/build.gradle.kts
+++ b/applications/rxtrack/build.gradle.kts
@@ -1,19 +1,20 @@
+import com.android.build.api.dsl.ApplicationExtension
+
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
     alias(libs.plugins.mapsplatform.secrets)
 }
 
-android {
+// FIX: Use strict configuration for AGP 9.0
+extensions.configure<ApplicationExtension> {
     namespace = "com.rxdigita.basepro.applications.rxtrack"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.rxdigita.basepro.applications.rxtrack"
-        minSdk =  libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
@@ -29,77 +30,69 @@ android {
                 "proguard-rules.pro"
             )
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
 
     buildFeatures {
         compose = true
         buildConfig = true
     }
+}
 
-
-    secrets {
-        defaultPropertiesFileName = "secrets.defaults.properties"
+// FIX: Use 'java' block for Toolchain (works better with strict AGP 9)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
+}
 
+// FIX: Secrets must be OUTSIDE the android block
+secrets {
+    defaultPropertiesFileName = "secrets.defaults.properties"
 }
 
 dependencies {
-
+    // Project Modules
     implementation(project(":core:util"))
+    implementation(project(":core:ui"))
     implementation(project(":applications:rxtrack:features:main"))
     implementation(project(":applications:rxtrack:features:medlist"))
     implementation(project(":applications:rxtrack:features:settings"))
 
+    // ⚠️ CHECK THIS: This looks like a copy-paste error from your other app.
+    // If RxTrack shouldn't depend on AshBike, remove this line:
+    implementation(project(":applications:ashbike:features:main"))
+
+    // AndroidX Core & Lifecycle
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.activity.compose)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.ui)
-    implementation(libs.androidx.ui.graphics)
-    implementation(libs.androidx.material3)
-
-    // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
 
-    // AndroidX + Compose
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.activity.compose)
+    // Compose
     implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.material3)
-
-    // Hilt
-    implementation(libs.hilt.android)
-    implementation(project(":applications:ashbike:features:main"))
-    implementation(project(":core:ui"))
-    ksp(libs.hilt.android.compiler)   // Hilt compiler dependency for annotation processing
-    // Hilt Dependency Injection
-    // kapt(libs.hilt.compiler)
-
-    // Compose Navigation
-    implementation(libs.androidx.navigation.compose) // Added Compose Navigation dependency with safe args plugin
-    implementation(libs.hilt.navigation.compose)
-
-    // Icons
     implementation(libs.androidx.material.icons.extended)
 
+    // Navigation
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.hilt.navigation.compose)
 
+    // Hilt
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.android.compiler)
 
-
+    // Testing
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -107,5 +100,5 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    debugImplementation(libs.androidx.ui.tooling.preview)
+    // Removed duplicate preview (ui.tooling includes preview logic)
 }
\ No newline at end of file
diff --git a/applications/rxtrack/features/medlist/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/medlist/ui/MedListUiRoute.kt b/applications/rxtrack/features/medlist/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/medlist/ui/MedListUiRoute.kt
index 28f5f55d2..4c41594f1 100644
--- a/applications/rxtrack/features/medlist/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/medlist/ui/MedListUiRoute.kt
+++ b/applications/rxtrack/features/medlist/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/medlist/ui/MedListUiRoute.kt
@@ -4,7 +4,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 
 
 @Composable
@@ -13,9 +13,7 @@ fun MedListUiRoute(
     navTo: (String) -> Unit,
     viewModel: MedListViewModel = hiltViewModel()
 ) {
-    val uiState = viewModel.uiState.collectAsState().value
-
-    when (uiState) {
+    when (val uiState = viewModel.uiState.collectAsState().value) {
         is MedListUiState.Loading -> {
             Text(modifier = modifier, text = "Loading MedList Feature...")
         }
diff --git a/applications/rxtrack/features/settings/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/settings/ui/SettingsUiRoute.kt b/applications/rxtrack/features/settings/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/settings/ui/SettingsUiRoute.kt
index 1e85a1e2c..613e21a15 100644
--- a/applications/rxtrack/features/settings/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/settings/ui/SettingsUiRoute.kt
+++ b/applications/rxtrack/features/settings/src/main/java/com/rxdigita/basepro/applications/rxtrack/features/settings/ui/SettingsUiRoute.kt
@@ -4,7 +4,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 
 // TODO: You'''ll need to define the properties for Success if it'''s a data class, or adjust its usage.
 sealed interface SettingsUiState {
@@ -20,9 +20,7 @@ fun SettingsUiRoute(
     viewModel: SettingsViewModel = hiltViewModel()
     // Add other ViewModels like NfcViewModel, BluetoothLeViewModel if needed for rxdigita settings
 ) {
-    val uiState = viewModel.uiState.collectAsState().value
-
-    when (uiState) {
+    when (val uiState = viewModel.uiState.collectAsState().value) {
         is SettingsUiState.Loading -> {
             Text(modifier = modifier, text = "Loading Settings for RxDigita...")
         }
diff --git a/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/MyApplication.kt b/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/MyApplication.kt
index f09db72b2..43edfefc9 100644
--- a/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/MyApplication.kt
+++ b/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/MyApplication.kt
@@ -4,6 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class MyApplication : Application() {
-
-}
+class MyApplication : Application()
diff --git a/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/ui/navigation/main/TopBarForCurrentRoute.kt b/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/ui/navigation/main/TopBarForCurrentRoute.kt
index c292b549d..d8323b6a9 100644
--- a/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/ui/navigation/main/TopBarForCurrentRoute.kt
+++ b/applications/rxtrack/src/main/java/com/rxdigita/basepro/applications/rxtrack/ui/navigation/main/TopBarForCurrentRoute.kt
@@ -16,9 +16,7 @@ import com.ylabz.basepro.core.ui.BikeScreen
 @Composable
 fun TopBarForCurrentRoute(navController: NavHostController) {
     val backStack by navController.currentBackStackEntryAsState()
-    val route = backStack?.destination?.route
-
-    when (route) {
+    when (val route = backStack?.destination?.route) {
         BikeScreen.HomeBikeScreen.route -> AppTopBar(title = "AshBike")
         BikeScreen.TripBikeScreen.route -> AppTopBar(title = "Trips")
         BikeScreen.SettingsBikeScreen.route -> AppTopBar(title = "Settings")
diff --git a/commands.txt b/commands.txt
new file mode 100644
index 000000000..6cc51e7e3
--- /dev/null
+++ b/commands.txt
@@ -0,0 +1,2 @@
+adb shell am broadcast -a com.ylabz.ashbike.SIM_BIKE --ez connected true --ei battery 90
+adb shell am broadcast -a com.ylabz.ashbike.SIM_BIKE --ez connected false
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
index eb240c804..f14f99e58 100644
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@@ -89,6 +89,7 @@ dependencies {
 
     // Health Connect
     implementation(libs.androidx.health.connect.client)
+    implementation(libs.androidx.health.services.client)
 
     // maps
     implementation(libs.google.maps.compose)
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/di/BikeDataModule.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/di/BikeDataModule.kt
new file mode 100644
index 000000000..8382d8ea5
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/di/BikeDataModule.kt
@@ -0,0 +1,20 @@
+package com.ylabz.basepro.core.data.di
+
+import com.ylabz.basepro.core.data.repository.bike.BikeRepository
+import com.ylabz.basepro.core.data.repository.bike.BikeRepositoryImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class BikeDataModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindBikeRepository(
+        impl: BikeRepositoryImpl
+    ): BikeRepository
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/di/BikeModule.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/di/BikeModule.kt
index e7d8160ac..450410533 100644
--- a/core/data/src/main/java/com/ylabz/basepro/core/data/di/BikeModule.kt
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/di/BikeModule.kt
@@ -1,8 +1,8 @@
 package com.ylabz.basepro.core.data.di
 
-import com.ylabz.basepro.core.data.repository.bikeConnectivity.BikeConnectivityRepository
-import com.ylabz.basepro.core.data.repository.bikeConnectivity.BikeConnectivityRepositoryImpl
-import com.ylabz.basepro.core.data.repository.bikeConnectivity.DemoBikeConnectivityRepositoryImpl
+import com.ylabz.basepro.core.data.repository.bike.BikeConnectivityRepository
+import com.ylabz.basepro.core.data.repository.bike.BikeConnectivityRepositoryImpl
+import com.ylabz.basepro.core.data.repository.bike.DemoBikeConnectivityRepositoryImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/di/GlucoseModule.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/di/GlucoseModule.kt
new file mode 100644
index 000000000..ae0d3855c
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/di/GlucoseModule.kt
@@ -0,0 +1,27 @@
+package com.ylabz.basepro.core.data.di
+
+// Note the specific imports
+import com.ylabz.basepro.core.data.repository.sensor.glucose.BleGlucoseRepository
+import com.ylabz.basepro.core.data.repository.sensor.glucose.GlucoseRepository
+import com.ylabz.basepro.core.data.repository.sensor.glucose.LibreNfcRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object GlucoseModule {
+
+    @Provides
+    @Singleton
+    fun provideGlucoseRepository(
+        // You can inject both implementations if you need a switching logic
+        bleRepo: BleGlucoseRepository,
+        libreRepo: LibreNfcRepository
+    ): GlucoseRepository {
+        // For now, returning Libre as the primary source
+        return libreRepo
+    }
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeHealthRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeHealthRepository.kt
index 551d46138..1da0cee0d 100644
--- a/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeHealthRepository.kt
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeHealthRepository.kt
@@ -2,7 +2,7 @@ package com.ylabz.basepro.core.data.fake.sleep
 
 import com.ylabz.basepro.core.model.health.SleepSessionData
 
-class FakeHealthRepository() {
+class FakeHealthRepository {
     val fakeData = FakeSleepSessionData().getFakeSleepData()
 
     // Sample fake data for sleep sessions
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeSleepSessionData.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeSleepSessionData.kt
index 3a4c9251c..764f05355 100644
--- a/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeSleepSessionData.kt
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/fake/sleep/FakeSleepSessionData.kt
@@ -7,7 +7,7 @@ import java.time.Instant
 import java.time.ZoneOffset
 import java.util.UUID
 
-class FakeSleepSessionData() {
+class FakeSleepSessionData {
 
     fun getFakeSleepData(): List<SleepSessionData> {
         return listOf(
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/ BikeConnectivityRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/ BikeConnectivityRepository.kt
similarity index 93%
rename from core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/ BikeConnectivityRepository.kt
rename to core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/ BikeConnectivityRepository.kt
index b5e4ef892..0eeefba86 100644
--- a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/ BikeConnectivityRepository.kt	
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/ BikeConnectivityRepository.kt	
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.core.data.repository.bikeConnectivity
+package com.ylabz.basepro.core.data.repository.bike
 
 import com.ylabz.basepro.core.model.bike.BikeMotorData
 import kotlinx.coroutines.flow.Flow
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/BikeConnectivityRepositoryImpl.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeConnectivityRepositoryImpl.kt
similarity index 95%
rename from core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/BikeConnectivityRepositoryImpl.kt
rename to core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeConnectivityRepositoryImpl.kt
index 6a746f712..e992d47f1 100644
--- a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/BikeConnectivityRepositoryImpl.kt
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeConnectivityRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.core.data.repository.bikeConnectivity
+package com.ylabz.basepro.core.data.repository.bike
 
 import android.util.Log
 import com.ylabz.basepro.core.model.bike.BikeMotorData
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeRepository.kt
new file mode 100644
index 000000000..e79919139
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeRepository.kt
@@ -0,0 +1,36 @@
+package com.ylabz.basepro.core.data.repository.bike
+
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+import com.ylabz.basepro.core.model.bike.SuspensionState
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+
+interface BikeRepository {
+    // --- READ-ONLY STREAMS (The "What") ---
+    // Observed by Phone UI and Glass UI
+    val rideInfo: StateFlow<BikeRideInfo>
+    val currentGear: StateFlow<Int>
+    val suspensionState: StateFlow<SuspensionState>
+
+    // Connection Status
+    val isBikeConnected: Flow<Boolean>      // Bike Bluetooth Connection
+    // --- GLASS STATES (Updated for 3-State Logic) ---
+    val isGlassConnected: StateFlow<Boolean>     // 1. Hardware plugged in?
+    val isGlassSessionActive: StateFlow<Boolean> // 2. Projection App running?
+
+    // --- ACTIONS (The "How") ---
+    // Called by ViewModels (Phone/Glass) to change physical state
+    suspend fun gearUp()
+    suspend fun gearDown()
+    suspend fun setGear(gear: Int)
+    suspend fun toggleSuspension()
+
+    // --- SYSTEM UPDATES ---
+    // Called by Services (BikeForegroundService / GlassService) to update raw data
+    suspend fun updateRideInfo(info: BikeRideInfo)
+    // NFC -2- BLE
+    suspend fun updateConnectionState(isConnected: Boolean)
+    // Glass Updates
+    suspend fun updateGlassConnectionState(isConnected: Boolean)
+    suspend fun updateGlassSessionState(isActive: Boolean) // <--- NEW
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeRepositoryImpl.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeRepositoryImpl.kt
new file mode 100644
index 000000000..952f519d4
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/BikeRepositoryImpl.kt
@@ -0,0 +1,110 @@
+package com.ylabz.basepro.core.data.repository.bike
+
+import android.util.Log
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+import com.ylabz.basepro.core.model.bike.SuspensionState
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton // CRITICAL: Ensures the state survives across Screens and Services
+class BikeRepositoryImpl @Inject constructor() : BikeRepository {
+
+    // 1. The Simulator lives here (Single Instance)
+    private val demoSimulator = DemoModeSimulator()
+
+    // --- 1. RIDE INFO (Speed, Distance, GPS) ---
+    private val _rideInfo = MutableStateFlow(BikeRideInfo.initial())
+    override val rideInfo = _rideInfo.asStateFlow()
+
+
+    /**
+     * This is the "Heartbeat" of the app.
+     * It is called ~1 time per second by BikeForegroundService.
+     */
+    override suspend fun updateRideInfo(info: BikeRideInfo) {
+        // This is called ~1 time per second by BikeForegroundService
+        Log.d("DEBUG_PATH", "2. REPO: Received speed ${info.currentSpeed}. Emitting...") // <--- ADD THIS
+        _rideInfo.emit(info) // or info if you prefer real data
+
+    }
+
+    // --- 2. GEARS ---
+    private val _currentGear = MutableStateFlow(1)
+    override val currentGear = _currentGear.asStateFlow()
+
+    override suspend fun gearUp() {
+        if (_currentGear.value < 12) {
+            _currentGear.emit(_currentGear.value + 1)
+            // TODO: Send bluetooth command: bikeBluetoothService.writeCharacteristic(...)
+        }
+    }
+
+    override suspend fun gearDown() {
+        if (_currentGear.value > 1) {
+            _currentGear.emit(_currentGear.value - 1)
+        }
+    }
+
+    override suspend fun setGear(gear: Int) {
+        if (gear in 1..12) {
+            _currentGear.emit(gear)
+        }
+    }
+
+    // --- 3. SUSPENSION ---
+    private val _suspensionState = MutableStateFlow(SuspensionState.OPEN)
+    override val suspensionState = _suspensionState.asStateFlow()
+
+    override suspend fun toggleSuspension() {
+        val nextState = when (_suspensionState.value) {
+            SuspensionState.OPEN -> SuspensionState.TRAIL
+            SuspensionState.TRAIL -> SuspensionState.LOCK
+            SuspensionState.LOCK -> SuspensionState.OPEN
+        }
+        _suspensionState.emit(nextState)
+    }
+
+    // --- 4. CONNECTIONS ---
+    private val _isConnected = MutableStateFlow(false)
+    override val isBikeConnected = _isConnected.asStateFlow()
+
+    // This is called from BikeForegroundService
+    // NFC -2- BLE Connection State
+    override suspend fun updateConnectionState(isConnected: Boolean) {
+        _isConnected.emit(isConnected)
+    }
+
+
+    // --- 5. GLASS STATE (Updated) ---
+    // Hardware State (Plugged in?)
+    private val _isGlassConnected = MutableStateFlow(false)
+    override val isGlassConnected = _isGlassConnected.asStateFlow()
+
+    // Software State (App Running?)
+    private val _isGlassSessionActive = MutableStateFlow(false)
+    override val isGlassSessionActive = _isGlassSessionActive.asStateFlow()
+
+    override suspend fun updateGlassConnectionState(isConnected: Boolean) {
+        Log.d("DEBUG_GLASS", "1. Repo: Hardware Connection Changed -> $isConnected") // <--- LOG
+        _isGlassConnected.emit(isConnected)
+
+        // Logic: If hardware is unplugged, the session must be dead.
+        if (!isConnected) {
+            Log.d("DEBUG_GLASS", "1. Repo: Hardware Disconnect -> Forcing Session FALSE") // <--- LOG
+            _isGlassSessionActive.emit(false)
+        }
+    }
+
+    override suspend fun updateGlassSessionState(isActive: Boolean) {
+        Log.d("DEBUG_GLASS", "1. Repo: Session State Request -> $isActive. (Hardware Connected: ${_isGlassConnected.value})") // <--- LOG
+
+        // We only allow setting active to true if hardware is actually connected
+        if (isActive && !_isGlassConnected.value) {
+            Log.w("DEBUG_GLASS", "1. Repo: REJECTED Session Active. Hardware is disconnected.") // <--- LOG            _isGlassSessionActive.emit(false)
+            return
+        }
+        _isGlassSessionActive.emit(isActive)
+    }
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/DemoBikeConnectivityRepositoryImpl.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/DemoBikeConnectivityRepositoryImpl.kt
similarity index 95%
rename from core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/DemoBikeConnectivityRepositoryImpl.kt
rename to core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/DemoBikeConnectivityRepositoryImpl.kt
index b837141d4..045379610 100644
--- a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bikeConnectivity/DemoBikeConnectivityRepositoryImpl.kt
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/DemoBikeConnectivityRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.core.data.repository.bikeConnectivity
+package com.ylabz.basepro.core.data.repository.bike
 
 import android.util.Log
 import com.ylabz.basepro.core.model.bike.BikeMotorData
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/DemoModeSimulator.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/DemoModeSimulator.kt
new file mode 100644
index 000000000..41307a34e
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/bike/DemoModeSimulator.kt
@@ -0,0 +1,44 @@
+package com.ylabz.basepro.core.data.repository.bike
+
+import com.ylabz.basepro.core.model.bike.BikeRideInfo
+import kotlin.random.Random
+
+/**
+ * ISOLATED DEMO LOGIC
+ * Keeps the main ViewModel clean. Delete this class (or stop calling it) after the video.
+ */
+class DemoModeSimulator {
+
+    private var demoToggle = false
+    private var demoBattery = 105
+
+    /**
+     * Takes real GPS data and overlays fake Bike connection data.
+     */
+    fun process(originalInfo: BikeRideInfo): BikeRideInfo {
+        // 1. Flip Connection State
+        demoToggle = !demoToggle
+
+        // 2. Logic when connected (Drain Battery)
+        if (demoToggle) {
+            demoBattery -= 5
+            if (demoBattery < 0) demoBattery = 100
+        }
+
+        // 3. Random Motor Power (210W - 290W)
+        val randomMotor = if (demoToggle) {
+            Random.nextInt(210, 290).toFloat()
+        } else {
+            0f
+        }
+
+        // 4. Return the merged data
+        return originalInfo.copy(
+            isBikeConnected = demoToggle,
+            batteryLevel = if (demoToggle) demoBattery else null,
+            motorPower = randomMotor,
+            // IMPORTANT: We preserve the real GPS speed/distance
+            currentSpeed = originalInfo.currentSpeed
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/STRUCT.md b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/STRUCT.md
new file mode 100644
index 000000000..0b39116c9
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/STRUCT.md
@@ -0,0 +1,20 @@
+com.ylabz.basepro.core.data.repository
+├── bike
+│   ├── BikeRepository.kt
+│   └── BikeRepositoryImpl.kt
+├── sensor
+│   ├── HeartRateRepository.kt          <-- Interface
+│   ├── BleHeartRateRepository.kt       <-- Phone Implementation
+│   └── WearHealthHeartRateRepository.kt <-- Watch Implementation (The file you just moved)
+└── weather
+└── WeatherRepo.kt
+
+com.ylabz.basepro.core.data.repository.sensor
+├── heart
+│   ├── HeartRateRepository.kt          (Interface)
+│   ├── BleHeartRateRepository.kt       (Phone implementation)
+│   └── WearHealthHeartRateRepository.kt (Watch implementation)
+└── glucose
+├── GlucoseRepository.kt            (Interface)
+├── BleGlucoseRepository.kt         (Standard Bluetooth)
+└── LibreNfcRepository.kt           (Abbott Libre specific)
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/WearHealthHeartRateRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/WearHealthHeartRateRepository.kt
new file mode 100644
index 000000000..442ffdfed
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/WearHealthHeartRateRepository.kt
@@ -0,0 +1,87 @@
+package com.ylabz.basepro.core.data.repository.sensor
+
+import android.content.Context
+import android.util.Log
+import androidx.health.services.client.HealthServices
+import androidx.health.services.client.MeasureCallback
+import androidx.health.services.client.data.Availability
+import androidx.health.services.client.data.DataPointContainer
+import androidx.health.services.client.data.DataType
+import androidx.health.services.client.data.DeltaDataType
+import androidx.health.services.client.unregisterMeasureCallback
+import com.ylabz.basepro.core.data.repository.sensor.heart.HeartRateRepository
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.runBlocking
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Shared implementation for accessing Wear OS wrist sensors.
+ * This lives in core:data so ANY Wear app (AshBike, DrunkWatch, etc) can use it.
+ */
+@Singleton
+class WearHealthHeartRateRepository @Inject constructor(
+    @ApplicationContext private val context: Context
+) : HeartRateRepository {
+
+    override val heartRate: Flow<Int> = callbackFlow {
+        Log.d("WearHealthRepo", "Initializing Heart Rate Flow")
+
+        // Safety Check: If this code accidentally runs on a Phone, this might throw.
+        // In a real app, you might wrap this in a try-catch or hardware check.
+        val healthClient = HealthServices.getClient(context)
+        val measureClient = healthClient.measureClient
+
+        val callback = object : MeasureCallback {
+            override fun onAvailabilityChanged(dataType: DeltaDataType<*, *>, availability: Availability) {
+                // Handle sensor availability changes (e.g. ACQUIRING vs ACQUIRED)
+            }
+
+            override fun onDataReceived(data: DataPointContainer) {
+                val heartRateSamples = data.getData(DataType.HEART_RATE_BPM)
+                // Get the newest sample
+                val latest = heartRateSamples.lastOrNull()
+                if (latest != null) {
+                    val bpm = latest.value.toInt()
+                    // Send to the flow
+                    trySend(bpm)
+                }
+            }
+        }
+
+        Log.d("WearHealthRepo", "Registering Listener...")
+
+        // 1. Registration is a suspend function, so we simply call it.
+        // We catch errors here in case the device doesn't support the sensor.
+        try {
+            measureClient.registerMeasureCallback(DataType.HEART_RATE_BPM, callback)
+            Log.d("WearHealthRepo", "Listener Registered")
+        } catch (e: Exception) {
+            Log.e("WearHealthRepo", "Registration failed", e)
+            close(e) // Close flow if we can't register
+        }
+
+        // 2. awaitClose keeps the flow alive until the collector stops listening.
+        awaitClose {
+            Log.d("WearHealthRepo", "Unregistering Listener")
+
+            // 3. CRITICAL FIX: 'awaitClose' is synchronous, but 'unregister' is suspend.
+            // We use runBlocking here to bridge the gap.
+            // This is safe because we force this whole flow to run on Dispatchers.IO below.
+            runBlocking {
+                try {
+                    measureClient.unregisterMeasureCallback(DataType.HEART_RATE_BPM, callback)
+                } catch (e: Exception) {
+                    Log.e("WearHealthRepo", "Unregister failed", e)
+                }
+            }
+        }
+    }
+        // 4. Force execution on IO thread so runBlocking doesn't freeze the main UI
+        .flowOn(Dispatchers.IO)
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/BleGlucoseRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/BleGlucoseRepository.kt
new file mode 100644
index 000000000..d1805df59
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/BleGlucoseRepository.kt
@@ -0,0 +1,69 @@
+package com.ylabz.basepro.core.data.repository.sensor.glucose
+
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothGattCharacteristic
+import android.content.Context
+import android.util.Log
+import com.ylabz.basepro.core.model.health.GlucoseReading
+import com.ylabz.basepro.core.model.health.GlucoseSource
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import java.time.Instant
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BleGlucoseRepository @Inject constructor(
+    @ApplicationContext private val context: Context
+    // Inject your BluetoothLeRepository or Scanner here
+) : GlucoseRepository {
+
+    companion object {
+        // Standard Bluetooth SIG Glucose Service
+        val GLUCOSE_SERVICE_UUID: UUID = UUID.fromString("00001808-0000-1000-8000-00805f9b34fb")
+        val GLUCOSE_MEASUREMENT_CHAR: UUID = UUID.fromString("00002a18-0000-1000-8000-00805f9b34fb")
+    }
+
+    @SuppressLint("MissingPermission")
+    override val glucoseReadings: Flow<GlucoseReading> = callbackFlow {
+        // TODO: Use your existing BluetoothManager to connect to the device.
+        // This is the logic that runs inside 'onCharacteristicChanged'
+
+        fun parseGlucoseMeasurement(characteristic: BluetoothGattCharacteristic) {
+            val data = characteristic.value
+            if (data != null && data.isNotEmpty()) {
+                // 1. Parse Flags (First byte)
+                val flags = data[0].toInt()
+                val timeOffsetPresent = (flags and 0x01) != 0
+                val typeAndLocationPresent = (flags and 0x02) != 0
+                val concentrationUnitKgL =
+                    (flags and 0x04) != 0 // 0 = kg/L (mmol/L), 1 = mol/L (mg/dL) in some specs, check GLP spec carefully.
+
+                // 2. Parse Value (Standard GLP defines SFLOAT at byte 10 or 12 depending on flags)
+                // Simplified SFLOAT parsing for demo:
+                val glucoseValue =
+                    characteristic.getFloatValue(BluetoothGattCharacteristic.FORMAT_SFLOAT, 1)
+
+                // 3. Emit
+                trySend(
+                    GlucoseReading(
+                        valueMgDl = glucoseValue,
+                        timestamp = Instant.now(),
+                        source = GlucoseSource.BLE_STANDARD
+                    )
+                )
+            }
+        }
+
+        // Dummy emit for structure
+        Log.d("BleGlucoseRepo", "Listening for Standard Glucose Service 0x1808")
+        awaitClose { /* Disconnect */ }
+    }
+
+    override suspend fun scanSensor() {
+        // BLE usually pushes data; manual scan might trigger a re-connect attempt.
+    }
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/GlucoseRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/GlucoseRepository.kt
new file mode 100644
index 000000000..8c914a39e
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/GlucoseRepository.kt
@@ -0,0 +1,16 @@
+package com.ylabz.basepro.core.data.repository.sensor.glucose
+
+import com.ylabz.basepro.core.model.health.GlucoseReading
+import kotlinx.coroutines.flow.Flow
+
+interface GlucoseRepository {
+    /**
+     * A continuous stream of glucose readings.
+     */
+    val glucoseReadings: Flow<GlucoseReading>
+
+    /**
+     * Trigger a manual scan (e.g., for NFC).
+     */
+    suspend fun scanSensor()
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/LibreNfcRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/LibreNfcRepository.kt
new file mode 100644
index 000000000..eefa929c7
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/glucose/LibreNfcRepository.kt
@@ -0,0 +1,69 @@
+package com.ylabz.basepro.core.data.repository.sensor.glucose
+
+import android.nfc.Tag
+import android.nfc.tech.NfcV
+import android.util.Log
+import com.ylabz.basepro.core.data.repository.nfc.NfcRepository
+import com.ylabz.basepro.core.model.health.GlucoseReading
+import com.ylabz.basepro.core.model.health.GlucoseSource
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.mapNotNull
+import java.time.Instant
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LibreNfcRepository @Inject constructor(
+    private val nfcRepository: NfcRepository // Use your existing NFC repo
+) : GlucoseRepository {
+
+    override val glucoseReadings: Flow<GlucoseReading> = nfcRepository.scannedDataFlow
+        .mapNotNull { rawDataString ->
+            // In your real implementation, 'nfcRepository' should probably emit the raw 'Tag' object
+            // or a ByteArray, not just a String, to be useful for Libre.
+            parseLibreData(rawDataString)
+        }
+
+    override suspend fun scanSensor() {
+        // NFC requires user action (tapping phone to sensor)
+        Log.i("LibreRepository", "Waiting for user to tap sensor...")
+    }
+
+    private fun parseLibreData(data: String): GlucoseReading {
+        // --- LIBRE PROTOCOL IMPLEMENTATION ---
+        // 1. The Libre uses ISO 15693 (NfcV).
+        // 2. You need to send specific commands (0x02 read blocks) to read the memory.
+        // 3. The memory is ENCRYPTED on Libre 2/3.
+
+        // This is where you would integrate logic from open source projects
+        // if you have the rights/keys to do so.
+
+        Log.w("LibreRepository", "Received NFC Data. Decryption required.")
+
+        // Return null or a mock value for now
+        return GlucoseReading(
+            valueMgDl = 110f, // Mock value
+            timestamp = Instant.now(),
+            source = GlucoseSource.LIBRE_NFC,
+            trendArrow = "STABLE"
+        )
+    }
+
+    // Helper to read raw NfcV (If you update your NfcRepository to pass the Tag)
+    fun readRawMemory(tag: Tag): ByteArray? {
+        val nfcV = NfcV.get(tag)
+        return try {
+            nfcV.connect()
+            val cmd = byteArrayOf(
+                0x00.toByte(), // Flags
+                0x20.toByte(), // Read Single Block Command
+                0x00.toByte()  // Block number (0)
+            )
+            nfcV.transceive(cmd)
+        } catch (e: Exception) {
+            null
+        } finally {
+            nfcV.close()
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/heart/BleHeartRateRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/heart/BleHeartRateRepository.kt
new file mode 100644
index 000000000..30b834a01
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/heart/BleHeartRateRepository.kt
@@ -0,0 +1,70 @@
+package com.ylabz.basepro.core.data.repository.sensor.heart
+
+import android.util.Log
+import com.ylabz.basepro.core.data.repository.sensor.heart.HeartRateRepository
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.random.Random
+
+/**
+ * Reference implementation for Mobile (Phone) Heart Rate.
+ *
+ * PROD NOTE: In a production environment, this class would inject a BluetoothLeScanner
+ * or GATT Manager to connect to physical devices (Polar, Wahoo, etc) and read
+ * the standard Heart Rate Measurement characteristic (UUID 0x2A37).
+ *
+ * CURRENT: Simulates a realistic heart rate curve for development/emulator use.
+ *
+ * How to upgrade to Real BLE later
+ * When you are ready to implement actual Bluetooth connectivity, you would replace the flow { ... } block with a callbackFlow.
+ *
+ * Inject: BluetoothAdapter / BluetoothManager.
+ *
+ * Scan: Scan for devices advertising service UUID 180D (Heart Rate).
+ *
+ * Connect: device.connectGatt(...).
+ *
+ * Subscribe: Enable notifications on characteristic 2A37.
+ *
+ * Emit: In onCharacteristicChanged, parse the byte array and call trySend(bpm).
+ *
+ */
+@Singleton
+class BleHeartRateRepository @Inject constructor() : HeartRateRepository {
+
+    override val heartRate: Flow<Int> = flow {
+        Log.d("BleHeartRateRepo", "Starting Heart Rate Simulation (Phone Mode)")
+
+        // Start at resting heart rate
+        var currentBpm = 70
+        // Trend determines if HR is generally rising (exercise) or falling (rest)
+        var trend = 1
+
+        while (true) {
+            emit(currentBpm)
+
+            // Standard BLE sensors update roughly once per second
+            delay(1000)
+
+            // Calculate simulation physics
+            // 1. Add small random noise (+/- 0 to 2 bpm)
+            val noise = Random.nextInt(0, 3)
+
+            // 2. Apply trend
+            if (Random.nextBoolean()) {
+                currentBpm += (trend * noise)
+            }
+
+            // 3. Keep within realistic bounds for a "Ride"
+            // If we hit 150, start cooling down. If we hit 60, start warming up.
+            if (currentBpm >= 150) {
+                trend = -1
+            } else if (currentBpm <= 60) {
+                trend = 1
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/heart/HeartRateRepository.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/heart/HeartRateRepository.kt
new file mode 100644
index 000000000..f3c194910
--- /dev/null
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/sensor/heart/HeartRateRepository.kt
@@ -0,0 +1,15 @@
+package com.ylabz.basepro.core.data.repository.sensor.heart
+
+import kotlinx.coroutines.flow.Flow
+
+/**
+ * Abstract source of Heart Rate data.
+ * Implementations will differ for Phone (BLE) vs Watch (Health Services).
+ */
+interface HeartRateRepository {
+    /**
+     * Emits the current heart rate in BPM.
+     * Returns 0 or throws exception if disconnected/unavailable.
+     */
+    val heartRate: Flow<Int>
+}
\ No newline at end of file
diff --git a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/weather/DemoWeatherRepoImpl.kt b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/weather/DemoWeatherRepoImpl.kt
index e5dbb0dca..87cfe26b8 100644
--- a/core/data/src/main/java/com/ylabz/basepro/core/data/repository/weather/DemoWeatherRepoImpl.kt
+++ b/core/data/src/main/java/com/ylabz/basepro/core/data/repository/weather/DemoWeatherRepoImpl.kt
@@ -16,7 +16,7 @@ import javax.inject.Singleton
 @Singleton
 class DemoWeatherRepoImpl @Inject constructor() : WeatherRepo {
 
-    override suspend fun openCurrentWeatherByCity(location: String): OpenWeatherResponse? {
+    override suspend fun openCurrentWeatherByCity(location: String): OpenWeatherResponse {
         // Ignore location, return a demo response
         return demoResponse(lat = 0.0, lon = 0.0, name = location)
     }
@@ -24,7 +24,7 @@ class DemoWeatherRepoImpl @Inject constructor() : WeatherRepo {
     override suspend fun openCurrentWeatherByCoords(
         lat: Double,
         lon: Double
-    ): OpenWeatherResponse? {
+    ): OpenWeatherResponse {
         // Return a demo response for the given coords
         return demoResponse(lat = lat, lon = lon, name = "Demoville")
     }
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index 6e5e6130c..df76bfb7c 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -1,28 +1,32 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // ✅ REMOVED: AGP 9.0 Built-in Kotlin handles compilation.
+    // alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.gradle) // ✅ ADDED: Required for Hilt
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration for AGP 9.0
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.probase.core.data"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
-
+        minSdk = libs.versions.minSdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false // providers.gradleProperty("isMinifyForRelease").get().toBoolean()
+            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
         // This debug block ensures a fast development cycle
         debug {
@@ -34,31 +38,34 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
 dependencies {
+    implementation(project(":core:model"))
+    // implementation(project(":applications:ashbike:database"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material.legacy)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
 
     // Hilt Dependency Injection
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
-
 
     // Room
     implementation(libs.room.runtime)
     implementation(libs.room.ktx)
     ksp(libs.room.compiler)
+
+    // Testing
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
 }
\ No newline at end of file
diff --git a/core/model/src/main/java/com/ylabz/basepro/core/model/bike/BikeRideInfo.kt b/core/model/src/main/java/com/ylabz/basepro/core/model/bike/BikeRideInfo.kt
index f8ae8ae28..e90172cac 100644
--- a/core/model/src/main/java/com/ylabz/basepro/core/model/bike/BikeRideInfo.kt
+++ b/core/model/src/main/java/com/ylabz/basepro/core/model/bike/BikeRideInfo.kt
@@ -5,6 +5,7 @@ import com.ylabz.basepro.core.model.location.GpsFix // Added import
 import com.ylabz.basepro.core.model.weather.BikeWeatherInfo
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentMapOf
 
 enum class RideState {
     NotStarted,
@@ -48,7 +49,36 @@ data class BikeRideInfo(
     val lastGpsUpdateTime: Long = 0L,
     val gpsUpdateIntervalMillis: Long = 0L,
     val ridePath: List<GpsFix> = emptyList() // Added ridePath field
-)
+) {
+    // --- ADD THIS COMPANION OBJECT ---
+    companion object {
+        fun initial(): BikeRideInfo {
+            return BikeRideInfo(
+                location = null,
+                currentSpeed = 0.0,
+                averageSpeed = 0.0,
+                maxSpeed = 0.0,
+                currentTripDistance = 0f,
+                totalTripDistance = null,
+                remainingDistance = null,
+                elevationGain = 0.0,
+                elevationLoss = 0.0,
+                caloriesBurned = 0,
+                rideDuration = "00:00",
+                settings = persistentMapOf(), // Requires kotlinx.collections.immutable dependency
+                heading = 0f,
+                elevation = 0.0,
+                isBikeConnected = false,
+                heartbeat = null,
+                batteryLevel = null,
+                motorPower = null,
+                rideState = RideState.NotStarted,
+                bikeWeatherInfo = null,
+                ridePath = emptyList()
+            )
+        }
+    }
+}
 
 
 // Represents basic health information (e.g., from Google Health Connect).
diff --git a/core/model/src/main/java/com/ylabz/basepro/core/model/bike/SuspensionState.kt b/core/model/src/main/java/com/ylabz/basepro/core/model/bike/SuspensionState.kt
new file mode 100644
index 000000000..db94af6cd
--- /dev/null
+++ b/core/model/src/main/java/com/ylabz/basepro/core/model/bike/SuspensionState.kt
@@ -0,0 +1,7 @@
+package com.ylabz.basepro.core.model.bike
+
+enum class SuspensionState(val label: String) {
+    OPEN("Open"),   // Soft / Plush
+    TRAIL("Trail"), // Medium / Mixed
+    LOCK("Lock")    // Hard / Efficient
+}
\ No newline at end of file
diff --git a/core/model/src/main/java/com/ylabz/basepro/core/model/health/GlucoseReading.kt b/core/model/src/main/java/com/ylabz/basepro/core/model/health/GlucoseReading.kt
new file mode 100644
index 000000000..8c287573f
--- /dev/null
+++ b/core/model/src/main/java/com/ylabz/basepro/core/model/health/GlucoseReading.kt
@@ -0,0 +1,17 @@
+package com.ylabz.basepro.core.model.health
+
+import java.time.Instant
+
+data class GlucoseReading(
+    val valueMgDl: Float,      // Glucose in mg/dL
+    val timestamp: Instant,
+    val source: GlucoseSource,
+    val trendArrow: String? = null // e.g., "RISING", "STABLE" (Common in Libre)
+)
+
+enum class GlucoseSource {
+    BLE_STANDARD,
+    LIBRE_NFC,
+    LIBRE_BLE,
+    SIMULATOR
+}
\ No newline at end of file
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 2af5bc6eb..4db717c33 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -47,6 +47,8 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
+    implementation(libs.androidx.material.icons.extended)
+
 
     // Compose
     implementation(platform(libs.androidx.compose.bom))
diff --git a/core/util/build.gradle.kts b/core/util/build.gradle.kts
index 14c2f2843..c3981ea08 100644
--- a/core/util/build.gradle.kts
+++ b/core/util/build.gradle.kts
@@ -1,14 +1,18 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash:
     alias(libs.plugins.kotlin.android)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.core.util"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -21,29 +25,32 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
         // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
 dependencies {
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material.legacy)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-
 }
\ No newline at end of file
diff --git a/feature/alarm/build.gradle.kts b/feature/alarm/build.gradle.kts
index 16eac4786..77fa432fc 100644
--- a/feature/alarm/build.gradle.kts
+++ b/feature/alarm/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.alarm"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,19 +28,24 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
         // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -57,13 +66,12 @@ dependencies {
     // Compose
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons.extended)
 
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
-
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
@@ -71,5 +79,4 @@ dependencies {
 
     // Preview
     debugImplementation(libs.androidx.ui.tooling)
-
 }
\ No newline at end of file
diff --git a/feature/alarm/src/main/java/com/ylabz/basepro/feature/alarm/ui/AlarmRoute.kt b/feature/alarm/src/main/java/com/ylabz/basepro/feature/alarm/ui/AlarmRoute.kt
index 241fe7c06..7c97c5d70 100644
--- a/feature/alarm/src/main/java/com/ylabz/basepro/feature/alarm/ui/AlarmRoute.kt
+++ b/feature/alarm/src/main/java/com/ylabz/basepro/feature/alarm/ui/AlarmRoute.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import com.ylabz.basepro.core.model.alarm.ProAlarm
 import com.ylabz.basepro.feature.alarm.ui.components.AlarmSuccessScreen
diff --git a/feature/ble/build.gradle.kts b/feature/ble/build.gradle.kts
index 85474d3b6..d38be49ca 100644
--- a/feature/ble/build.gradle.kts
+++ b/feature/ble/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash: But we need it back
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.ble"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,19 +28,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -57,12 +65,12 @@ dependencies {
     // Compose
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons.extended)
 
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Permissions
     implementation(libs.google.accompanist.permissions)
@@ -70,7 +78,7 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
+
     // Preview
     debugImplementation(libs.androidx.ui.tooling)
-
 }
\ No newline at end of file
diff --git a/feature/ble/src/main/java/com/ylabz/basepro/feature/ble/ui/BluetoothLeRoute.kt b/feature/ble/src/main/java/com/ylabz/basepro/feature/ble/ui/BluetoothLeRoute.kt
index 9321001d9..59128f6f1 100644
--- a/feature/ble/src/main/java/com/ylabz/basepro/feature/ble/ui/BluetoothLeRoute.kt
+++ b/feature/ble/src/main/java/com/ylabz/basepro/feature/ble/ui/BluetoothLeRoute.kt
@@ -14,7 +14,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import com.ylabz.basepro.feature.ble.ui.components.BluetoothLeSuccessScreen
diff --git a/feature/camera/build.gradle.kts b/feature/camera/build.gradle.kts
index 65f438d26..e43fa398d 100644
--- a/feature/camera/build.gradle.kts
+++ b/feature/camera/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash:
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.camera"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,19 +28,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -56,10 +64,10 @@ dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
 
-    // Permissions
+    // Permissions (Accompanist is deprecated but keeping for compatibility if used)
     implementation(libs.google.accompanist.permissions)
 
-    // Add Camera
+    // CameraX
     implementation(libs.androidx.camera.core)
     implementation(libs.androidx.camera.camera2)
     implementation(libs.androidx.camera.lifecycle)
@@ -71,15 +79,13 @@ dependencies {
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
-
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
+
+    // Preview
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.tooling.preview)
-
-
 }
diff --git a/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/CameraUIRoute.kt b/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/CameraUIRoute.kt
index f8d079713..95fe356df 100644
--- a/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/CameraUIRoute.kt
+++ b/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/CameraUIRoute.kt
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.ylabz.basepro.feature.camera.ui.components.SimpleCameraCaptureWithImagePreview
 
 @Composable
@@ -21,8 +21,7 @@ fun CameraUIRoute(
     navTo: (String) -> Unit,
     viewModel: CamViewModel = hiltViewModel()
 ) {
-    val uiState = viewModel.uiState.collectAsState().value
-    when (uiState) {
+    when (val uiState = viewModel.uiState.collectAsState().value) {
         is CamUIState.Loading -> {
             LoadingScreen()
         }
diff --git a/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/components/SimpleCameraCaptureWithImagePreview.kt b/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/components/SimpleCameraCaptureWithImagePreview.kt
index 56f32d326..2be1be750 100644
--- a/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/components/SimpleCameraCaptureWithImagePreview.kt
+++ b/feature/camera/src/main/java/com/ylabz/basepro/feature/camera/ui/components/SimpleCameraCaptureWithImagePreview.kt
@@ -1,7 +1,5 @@
 package com.ylabz.basepro.feature.camera.ui.components
 
-// import androidx.compose.ui.viewinterop.AndroidView // No longer needed
-// import androidx.lifecycle.LifecycleOwner // Replaced with LocalLifecycleOwner
 import android.content.Context
 import android.graphics.BitmapFactory
 import android.net.Uri
@@ -16,6 +14,7 @@ import androidx.camera.core.ImageCaptureException
 import androidx.camera.core.Preview
 import androidx.camera.core.SurfaceRequest
 import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.lifecycle.awaitInstance
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -42,6 +41,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
@@ -49,23 +49,6 @@ import com.ylabz.basepro.feature.camera.ui.CamEvent
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Locale
-// import androidx.compose.ui.tooling.preview.Preview as ComposePreview
-
-// import java.util.concurrent.Executors // No longer needed
-
-/**
- * CameraXViewfinder Composable: Instead of using AndroidView to embed a PreviewView,
- * you can directly use the CameraXViewfinder Composable in your Jetpack Compose UI.
- *
- * This Composable handles the complexities of displaying the camera feed, including rotation,
- * scaling, and managing the Surface lifecycle.
- *
- * A new artifact, camera-compose is released for the CameraX Viewfinder Compose Adapter which displays
- * a Preview stream from a CameraX SurfaceRequest from camera-core. (I8666e)
- *
- * Added a new composable, CameraXViewfinder, which acts as an idiomatic composable that adapts CameraX
- * SurfaceRequests for the composable Viewfinder. (I4770f)
- */
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
@@ -75,33 +58,40 @@ fun SimpleCameraCaptureWithImagePreview(
     navTo: (String) -> Unit,
 ) {
     val context = LocalContext.current
-    val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current
-    val cameraProviderFuture = remember { ProcessCameraProvider.getInstance(context) }
+    val lifecycleOwner = LocalLifecycleOwner.current
 
-    // This state will hold the SurfaceRequest from the Preview's SurfaceProvider
-    var surfaceRequest by remember { mutableStateOf<SurfaceRequest?>(null) }
+    // 1. Permission State (Accompanist 0.37.2)
+    val cameraPermissionState = rememberPermissionState(android.Manifest.permission.CAMERA)
+
+    // 2. Camera Use Cases (Hoisted)
+    // We remember these so they survive recompositions and can be accessed by the rotation listener
+    val previewUseCase = remember { Preview.Builder().build() }
+    val imageCaptureUseCase = remember { ImageCapture.Builder().build() }
 
-    var imageCapture: ImageCapture? by remember { mutableStateOf(null) }
+    // 3. State for the CameraXViewfinder
+    var surfaceRequest by remember { mutableStateOf<SurfaceRequest?>(null) }
     var savedImageUri by remember { mutableStateOf<Uri?>(null) }
 
-    // Track rotation using OrientationEventListener
+    // 4. Orientation Logic (Keeps photos upright)
     val orientationEventListener = remember {
         object : OrientationEventListener(context) {
             override fun onOrientationChanged(orientation: Int) {
+                if (orientation == ORIENTATION_UNKNOWN) return
+
                 val rotation = when (orientation) {
                     in 45..134 -> Surface.ROTATION_270
                     in 135..224 -> Surface.ROTATION_180
                     in 225..314 -> Surface.ROTATION_90
                     else -> Surface.ROTATION_0
                 }
-                imageCapture?.targetRotation = rotation
+
+                // Update the capture use case dynamically
+                imageCaptureUseCase.targetRotation = rotation
             }
         }
     }
 
-    // Accompanist permission state for CAMERA
-    val cameraPermissionState = rememberPermissionState(android.Manifest.permission.CAMERA)
-
+    // Effect: Request Permission if not granted
     LaunchedEffect(Unit) {
         if (!cameraPermissionState.status.isGranted) {
             cameraPermissionState.launchPermissionRequest()
@@ -109,118 +99,115 @@ fun SimpleCameraCaptureWithImagePreview(
     }
 
     if (cameraPermissionState.status.isGranted) {
-        // Initializing CameraX Preview and ImageCapture
-        LaunchedEffect(cameraProviderFuture, lifecycleOwner) {
-            val cameraProvider = cameraProviderFuture.get()
-
-            // Build the Preview use case
-            val preview = Preview.Builder().build()
-
-            // **This is the key change:**
-            // Set the SurfaceProvider on the Preview use case, using the main executor.
-            preview.setSurfaceProvider(ContextCompat.getMainExecutor(context)) { request ->
+        // Effect: Bind Camera Lifecycle
+        LaunchedEffect(lifecycleOwner) {
+            // Await the camera provider (Suspends, doesn't block)
+            val cameraProvider = ProcessCameraProvider.awaitInstance(context)
+            // Set up the preview use case
+            previewUseCase.surfaceProvider = null
+
+            // Connect the Preview UseCase to the Viewfinder surface
+            previewUseCase.setSurfaceProvider(ContextCompat.getMainExecutor(context)) { request ->
                 surfaceRequest = request
             }
 
             val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
-            imageCapture = ImageCapture.Builder().build()
 
-            // Bind the use cases to the camera
-            cameraProvider.unbindAll() // Ensure no other use cases are bound
-            cameraProvider.bindToLifecycle(
-                lifecycleOwner,
-                cameraSelector,
-                preview, // The Preview use case
-                imageCapture // The ImageCapture use case
-            )
+            try {
+                cameraProvider.unbindAll()
+                cameraProvider.bindToLifecycle(
+                    lifecycleOwner,
+                    cameraSelector,
+                    previewUseCase,
+                    imageCaptureUseCase
+                )
+            } catch (e: Exception) {
+                Log.e("CameraCapture", "Binding failed", e)
+            }
         }
 
-        // Enable/Disable OrientationEventListener
+        // Effect: Manage Orientation Listener
         DisposableEffect(Unit) {
             orientationEventListener.enable()
-            onDispose {
-                orientationEventListener.disable()
-            }
+            onDispose { orientationEventListener.disable() }
         }
 
-        Column(modifier = Modifier
-            .padding(paddingValues)
-            .fillMaxSize()) {
+        Column(
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxSize()
+        ) {
+            // 5. The Camera Preview
             Box(modifier = Modifier.weight(1f)) {
-                // Use the new CameraXViewfinder Composable
-                // It will recompose when surfaceRequest changes.
                 surfaceRequest?.let { request ->
+                    // The new Compose-native viewfinder from androidx.camera:camera-compose
                     CameraXViewfinder(
                         surfaceRequest = request,
-                        modifier = Modifier
-                            // Removed redundant padding
-                            .fillMaxSize()
+                        modifier = Modifier.fillMaxSize()
                     )
                 }
             }
 
             // Capture Button
-            Button(onClick = {
-                imageCapture?.let { capture ->
+            Button(
+                onClick = {
                     val photoFile = createFile(context)
                     val outputOptions = ImageCapture.OutputFileOptions.Builder(photoFile).build()
 
-                    capture.takePicture(
+                    imageCaptureUseCase.takePicture(
                         outputOptions,
                         ContextCompat.getMainExecutor(context),
                         object : ImageCapture.OnImageSavedCallback {
                             override fun onImageSaved(output: ImageCapture.OutputFileResults) {
                                 savedImageUri = Uri.fromFile(photoFile)
-                                Log.d("CameraCapture", "Image saved in: $savedImageUri")
+                                Log.d("CameraCapture", "Saved: $savedImageUri")
                                 onEvent(
                                     CamEvent.AddItem(
                                         name = "Photo",
                                         description = "Captured Image",
-                                        imgPath = savedImageUri.toString() // Store the path
+                                        imgPath = savedImageUri.toString()
                                     )
                                 )
-                                //navTo("list_screen")
                             }
 
                             override fun onError(exception: ImageCaptureException) {
-                                Log.e("CameraCapture", "Image capture failed", exception)
+                                Log.e("CameraCapture", "Error: ${exception.message}", exception)
                             }
                         }
                     )
-                }
-            }, modifier = Modifier.fillMaxWidth()) {
+                },
+                modifier = Modifier.fillMaxWidth()
+            ) {
                 BasicText("Capture Photo")
             }
 
-            // Display the captured image if it exists
+            // Preview Thumbnail
             savedImageUri?.let { uri ->
                 Spacer(modifier = Modifier.height(16.dp))
                 CapturedImagePreview(imageUri = uri)
             }
         }
     } else {
-        // Show message if permission is not granted
-        Column(modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center) {
-            BasicText("Camera permission is required to use the camera")
+        // Permission Denied State
+        Column(
+            modifier = Modifier.fillMaxSize(),
+            verticalArrangement = Arrangement.Center
+        ) {
+            BasicText("Camera permission required.")
             Button(onClick = { cameraPermissionState.launchPermissionRequest() }) {
                 BasicText("Grant Permission")
             }
         }
     }
-
-    // No longer need the DisposableEffect to shut down the executor
 }
 
-// Function to create a file in external storage (with your robust fallback)
-private fun createFile(context: Context): File {
-    val mediaDir = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
-        ?: context.filesDir
+// --- Helpers ---
 
+private fun createFile(context: Context): File {
+    val mediaDir = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: context.filesDir
     val outputDir = File(mediaDir, "CameraX").apply { mkdirs() }
-
     val fileName = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss-SSS", Locale.US)
         .format(System.currentTimeMillis()) + ".jpg"
-
     return File(outputDir, fileName)
 }
 
@@ -229,9 +216,7 @@ fun CapturedImagePreview(imageUri: Uri) {
     val context = LocalContext.current
     var bitmap by remember { mutableStateOf<android.graphics.Bitmap?>(null) }
 
-    // Load the image from the file
     LaunchedEffect(imageUri) {
-        // **FIX:** Use a '.use' block to automatically close the InputStream
         context.contentResolver.openInputStream(imageUri)?.use { inputStream ->
             bitmap = BitmapFactory.decodeStream(inputStream)
         }
@@ -240,7 +225,7 @@ fun CapturedImagePreview(imageUri: Uri) {
     bitmap?.let {
         Image(
             painter = BitmapPainter(it.asImageBitmap()),
-            contentDescription = null,
+            contentDescription = "Captured Image",
             modifier = Modifier
                 .fillMaxWidth()
                 .height(250.dp)
@@ -249,7 +234,6 @@ fun CapturedImagePreview(imageUri: Uri) {
         )
     }
 }
-
 /*@ComposePreview(showBackground = true)
 @Composable
 fun SimpleComposablePreview() {
diff --git a/feature/heatlh/build.gradle.kts b/feature/heatlh/build.gradle.kts
index 4f7504bba..b60c153cf 100644
--- a/feature/heatlh/build.gradle.kts
+++ b/feature/heatlh/build.gradle.kts
@@ -1,18 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash:
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
-    namespace = "com.ylabz.basepro.feature.heatlh"
+// FIX: Use 'configure<LibraryExtension>' for strict AGP 9.0 compatibility
+extensions.configure<LibraryExtension> {
+    namespace = "com.ylabz.basepro.feature.health" // Fixed typo: "heatlh" -> "health"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
-
+        minSdk = libs.versions.minSdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
@@ -24,19 +27,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -56,13 +63,13 @@ dependencies {
     // Compose
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons.extended)
     debugImplementation(libs.androidx.ui.tooling)
 
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Health Connect
     implementation(libs.androidx.health.connect.client)
diff --git a/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/HealthRoute.kt b/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/HealthRoute.kt
index d26f9b7f7..64bbbd406 100644
--- a/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/HealthRoute.kt
+++ b/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/HealthRoute.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.util.Log
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -33,8 +32,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.health.connect.client.HealthConnectClient
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.ylabz.basepro.feature.heatlh.R
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import com.ylabz.basepro.feature.health.R
 import com.ylabz.basepro.feature.heatlh.ui.components.ErrorScreen
 
 @Composable
diff --git a/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/components/SessionDetailScreen.kt b/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/components/SessionDetailScreen.kt
index f1bed299f..ee39e99f1 100644
--- a/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/components/SessionDetailScreen.kt
+++ b/feature/heatlh/src/main/java/com/ylabz/basepro/feature/heatlh/ui/components/SessionDetailScreen.kt
@@ -27,7 +27,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.ylabz.basepro.core.data.service.health.ExerciseSessionData
 import com.ylabz.basepro.feature.heatlh.ui.HealthViewModel
diff --git a/feature/listings/build.gradle.kts b/feature/listings/build.gradle.kts
index 01f090c1e..0151744ff 100644
--- a/feature/listings/build.gradle.kts
+++ b/feature/listings/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.listings"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -21,26 +25,29 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
 
     buildTypes {
         release {
-            isMinifyEnabled = false // providers.gradleProperty("isMinifyForRelease").get().toBoolean()
+            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
 }
 
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 dependencies {
     implementation(project(":core:database"))
 
@@ -48,9 +55,6 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.material.legacy)
 
-    // viewmodel - hilt-lifecycle-viewmodel
-    // implementation(libs.hilt.lifecycle.viewmodel) // NOTE: not needed
-
     // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
@@ -58,14 +62,13 @@ dependencies {
     // Compose
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons.extended)
     debugImplementation(libs.androidx.ui.tooling)
 
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
-    implementation(libs.hilt.android) // Changed from implementation
+    implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
-
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
diff --git a/feature/listings/src/main/java/com/ylabz/basepro/feature/listings/ui/components/DetailsRoute.kt b/feature/listings/src/main/java/com/ylabz/basepro/feature/listings/ui/components/DetailsRoute.kt
index 676e5c690..dc921e29d 100644
--- a/feature/listings/src/main/java/com/ylabz/basepro/feature/listings/ui/components/DetailsRoute.kt
+++ b/feature/listings/src/main/java/com/ylabz/basepro/feature/listings/ui/components/DetailsRoute.kt
@@ -1,4 +1,4 @@
-package com.ylabz.basepro.listings.ui.components
+package com.ylabz.basepro.feature.listings.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
diff --git a/feature/maps/build.gradle.kts b/feature/maps/build.gradle.kts
index 242a756d3..2fae46296 100644
--- a/feature/maps/build.gradle.kts
+++ b/feature/maps/build.gradle.kts
@@ -1,16 +1,20 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.maps"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -23,21 +27,24 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
+}
 
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 dependencies {
@@ -46,9 +53,6 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.material.legacy)
 
-    // viewmodel - hilt-lifecycle-viewmodel
-    // implementation(libs.hilt.lifecycle.viewmodel) // NOTE: not needed
-
     // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
@@ -62,7 +66,6 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // maps
     implementation(libs.google.maps.compose)
diff --git a/feature/maps/src/main/java/com/ylabz/basepro/feature/maps/ui/MapUIRoute.kt b/feature/maps/src/main/java/com/ylabz/basepro/feature/maps/ui/MapUIRoute.kt
index e195da8d6..e309031cc 100644
--- a/feature/maps/src/main/java/com/ylabz/basepro/feature/maps/ui/MapUIRoute.kt
+++ b/feature/maps/src/main/java/com/ylabz/basepro/feature/maps/ui/MapUIRoute.kt
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.ylabz.basepro.feature.maps.ui.components.ErrorScreen
 import com.ylabz.basepro.feature.maps.ui.components.LoadingScreen
 
diff --git a/feature/material3/build.gradle.kts b/feature/material3/build.gradle.kts
index 121f0eab9..53d114aab 100644
--- a/feature/material3/build.gradle.kts
+++ b/feature/material3/build.gradle.kts
@@ -1,6 +1,9 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
@@ -8,12 +11,13 @@ plugins {
     alias(libs.plugins.jetbrains.kotlin.serialization)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.material3"
     compileSdk = 36
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -26,19 +30,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -49,8 +57,6 @@ dependencies {
     implementation(project(":core:ui"))
     implementation(project(":core:util"))
 
-
-
     implementation(libs.androidx.navigation3.ui)
     implementation(libs.androidx.navigation3.runtime)
     implementation(libs.androidx.lifecycle.viewmodel.navigation3)
@@ -65,7 +71,6 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Compose
     implementation(platform(libs.androidx.compose.bom))
@@ -80,7 +85,7 @@ dependencies {
     implementation("androidx.compose.material3.adaptive:adaptive-navigation:1.2.0-beta01")*/
 
     // implementation(libs.androidx.material3)
-    // implementation(libs.androidx.material3.adaptive) // <-- This line is now active
+    // implementation(libs.androidx.material3.adaptive)
     implementation(libs.androidx.material3.adaptive.navigation3)
     debugImplementation(libs.androidx.ui.tooling)
 
diff --git a/feature/ml/build.gradle.kts b/feature/ml/build.gradle.kts
index 5d35feca7..c65070092 100644
--- a/feature/ml/build.gradle.kts
+++ b/feature/ml/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.ml"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,19 +28,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -59,7 +67,6 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
@@ -77,7 +84,6 @@ dependencies {
     implementation(libs.androidx.camera.lifecycle)
     implementation(libs.androidx.camera.view)
 
-
     // Preview
     debugImplementation(libs.androidx.ui.tooling)
 
diff --git a/feature/nav3/build.gradle.kts b/feature/nav3/build.gradle.kts
index b53a166c9..c8ce240f3 100644
--- a/feature/nav3/build.gradle.kts
+++ b/feature/nav3/build.gradle.kts
@@ -1,6 +1,9 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
@@ -8,7 +11,8 @@ plugins {
     alias(libs.plugins.jetbrains.kotlin.serialization)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.nav3"
     compileSdk = 36
 
@@ -37,8 +41,12 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
diff --git a/feature/nfc/build.gradle.kts b/feature/nfc/build.gradle.kts
index e4a298878..c4a6255f8 100644
--- a/feature/nfc/build.gradle.kts
+++ b/feature/nfc/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash:
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.nfc"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,19 +28,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -46,6 +54,10 @@ dependencies {
     implementation(project(":core:ui"))
     implementation(project(":core:util"))
 
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material.legacy)
+
     // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
@@ -53,17 +65,15 @@ dependencies {
     // Compose
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3)
+    debugImplementation(libs.androidx.ui.tooling)
 
     // Icons
     implementation(libs.androidx.material.icons.extended)
 
-
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
-    debugImplementation(libs.androidx.ui.tooling)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Permissions
     implementation(libs.google.accompanist.permissions)
@@ -71,13 +81,4 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-    // Preview
-    debugImplementation(libs.androidx.ui.tooling)
-
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material.legacy)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
 }
\ No newline at end of file
diff --git a/feature/nfc/src/main/java/com/ylabz/basepro/feature/nfc/ui/NfcUiRoute.kt b/feature/nfc/src/main/java/com/ylabz/basepro/feature/nfc/ui/NfcUiRoute.kt
index 959681a58..f87f9b927 100644
--- a/feature/nfc/src/main/java/com/ylabz/basepro/feature/nfc/ui/NfcUiRoute.kt
+++ b/feature/nfc/src/main/java/com/ylabz/basepro/feature/nfc/ui/NfcUiRoute.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.ylabz.basepro.feature.nfc.ui.components.screens.ErrorScreen
 import com.ylabz.basepro.feature.nfc.ui.components.screens.LoadingScreen
 import com.ylabz.basepro.feature.nfc.ui.components.screens.NfcAppScreen
diff --git a/feature/places/src/main/java/com/ylabz/basepro/feature/places/ui/CoffeeShopUIRoute.kt b/feature/places/src/main/java/com/ylabz/basepro/feature/places/ui/CoffeeShopUIRoute.kt
index ca99fe693..7d3eef216 100644
--- a/feature/places/src/main/java/com/ylabz/basepro/feature/places/ui/CoffeeShopUIRoute.kt
+++ b/feature/places/src/main/java/com/ylabz/basepro/feature/places/ui/CoffeeShopUIRoute.kt
@@ -17,7 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.ylabz.basepro.feature.places.ui.components.CoffeeShopList
 
 @Composable
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
index 364f79b65..e3564e3c9 100644
--- a/feature/settings/build.gradle.kts
+++ b/feature/settings/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.settings"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,19 +28,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
diff --git a/feature/settings/src/main/java/com/ylabz/basepro/feature/settings/ui/SettingsUiRoute.kt b/feature/settings/src/main/java/com/ylabz/basepro/feature/settings/ui/SettingsUiRoute.kt
index 66873cb51..36edbe417 100644
--- a/feature/settings/src/main/java/com/ylabz/basepro/feature/settings/ui/SettingsUiRoute.kt
+++ b/feature/settings/src/main/java/com/ylabz/basepro/feature/settings/ui/SettingsUiRoute.kt
@@ -3,7 +3,7 @@ package com.ylabz.basepro.feature.settings.ui
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.ylabz.basepro.feature.settings.ui.components.ErrorScreen
 import com.ylabz.basepro.feature.settings.ui.components.LoadingScreen
 import com.ylabz.basepro.feature.settings.ui.components.SettingsCompose
@@ -15,9 +15,7 @@ fun SettingsUiRoute(
     navTo: (String) -> Unit,
     viewModel: SettingsViewModel = hiltViewModel()
 ) {
-    val uiState = viewModel.uiState.collectAsState().value
-
-    when (uiState) {
+    when (val uiState = viewModel.uiState.collectAsState().value) {
         is SettingsUiState.Loading -> {
             LoadingScreen()
         }
diff --git a/feature/wearos/drunkwatch/build.gradle.kts b/feature/wearos/drunkwatch/build.gradle.kts
index 245d8196b..5cf9316df 100644
--- a/feature/wearos/drunkwatch/build.gradle.kts
+++ b/feature/wearos/drunkwatch/build.gradle.kts
@@ -1,18 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.wearos.drunkwatch"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         minSdk = 35
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
@@ -24,25 +27,30 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
+
     buildFeatures {
         compose = true
     }
 }
 
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 dependencies {
     implementation(project(":core:data"))
     implementation(project(":core:model"))
@@ -50,39 +58,43 @@ dependencies {
 
     implementation(libs.androidx.core.ktx)
 
-    // not for wearOS
-    //implementation(libs.androidx.appcompat)
-    //implementation(libs.material)
-
     // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
 
-    // Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.material3)
-    debugImplementation(libs.androidx.ui.tooling)
-    // WearOS
-    // implementation(libs.androidx.wear.compose.material) <--- what is this?
-    implementation(libs.androidx.wear.tooling.preview)
-    implementation(libs.horologist.compose.tools)
-
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Health Connect
     implementation(libs.androidx.health.connect.client)
 
+    // Wear OS System Dependencies
     implementation(libs.google.play.services.wearable)
+
+    // --- COMPOSE FOR WEAR OS ---
+    implementation(platform(libs.androidx.compose.bom))
+
+    // UI Graphics/Tooling
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
-    debugImplementation(libs.androidx.ui.tooling)
-    implementation(libs.androidx.wear.compose.material)
-    //implementation(libs.androidx.wear.compose.foundation)
     implementation(libs.androidx.wear.tooling.preview)
+    debugImplementation(libs.androidx.ui.tooling)
+
+    // Material 3 for Wear OS (The modern standard)
+    implementation(libs.androidx.wear.compose.material3)
+
+    // Tools
+    implementation(libs.horologist.compose.tools)
+
+    // --- YOUR QUESTION: "what is this?" ---
+    // implementation(libs.androidx.wear.compose.material)
+    // ANSWER: This is the OLD Material 2 library for Wear OS.
+    // Since you are using 'wear.compose.material3' above, you do NOT need this.
+
+    // Mobile Material 3 (Optional: remove if you only want Wear-specific components)
+    implementation(libs.androidx.material3)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
diff --git a/feature/wearos/health/build.gradle.kts b/feature/wearos/health/build.gradle.kts
index 292ecd513..3f8039296 100644
--- a/feature/wearos/health/build.gradle.kts
+++ b/feature/wearos/health/build.gradle.kts
@@ -1,12 +1,16 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.wearos.health"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
@@ -24,25 +28,30 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
+
     buildFeatures {
         compose = true
     }
 }
 
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 dependencies {
     implementation(project(":core:data"))
     implementation(project(":core:model"))
@@ -58,32 +67,37 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
 
-    // Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.material3)
-    debugImplementation(libs.androidx.ui.tooling)
-    // WearOS
-    // implementation(libs.androidx.wear.compose.material) <--- what is this?
-    implementation(libs.androidx.wear.tooling.preview)
-    implementation(libs.horologist.compose.tools)
-
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Health Connect
     implementation(libs.androidx.health.connect.client)
 
+    // Wear OS System Dependencies
     implementation(libs.google.play.services.wearable)
+
+    // --- COMPOSE FOR WEAR OS ---
+    implementation(platform(libs.androidx.compose.bom))
+
+    // UI Graphics/Tooling
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
     debugImplementation(libs.androidx.ui.tooling)
-    implementation(libs.androidx.wear.compose.material)
-    //implementation(libs.androidx.wear.compose.foundation)
+
+    // Material 3 for Wear OS (Use this instead of legacy material)
+    implementation(libs.androidx.wear.compose.material3)
+
+    // Wear specific tooling (Preview support)
     implementation(libs.androidx.wear.tooling.preview)
 
+    // Tools
+    implementation(libs.horologist.compose.tools)
+
+    // Mobile Material 3 (Optional for Wear OS, but kept if you share UI components)
+    implementation(libs.androidx.material3)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/feature/wearos/home/build.gradle.kts b/feature/wearos/home/build.gradle.kts
index cb7fbcd79..665947b67 100644
--- a/feature/wearos/home/build.gradle.kts
+++ b/feature/wearos/home/build.gradle.kts
@@ -1,12 +1,16 @@
+import com.android.build.api.dsl.ApplicationExtension
+
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use 'configure<ApplicationExtension>' because this is an Application module
+extensions.configure<ApplicationExtension> {
     namespace = "com.ylabz.basepro.feature.wearos.home"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
@@ -16,7 +20,6 @@ android {
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"
-
     }
 
     buildTypes {
@@ -27,23 +30,28 @@ android {
                 "proguard-rules.pro"
             )
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
+
     buildFeatures {
         compose = true
     }
 }
 
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 dependencies {
     implementation(project(":core:data"))
     implementation(project(":core:model"))
@@ -52,39 +60,38 @@ dependencies {
     implementation(project(":feature:wearos:sleepwatch"))
     implementation(project(":feature:wearos:drunkwatch"))
 
-
+    // Wear OS System
     implementation(libs.google.play.services.wearable)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.core.splashscreen)
+
+    // Compose & UI
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
-    debugImplementation(libs.androidx.ui.tooling)
     implementation(libs.androidx.wear.compose.material3)
     implementation(libs.androidx.wear.compose.navigation)
-    //implementation(libs.androidx.wear.compose.foundation)
     implementation(libs.androidx.wear.tooling.preview)
-    implementation(libs.androidx.activity.compose)
 
+    // Horologist (Google's Wear OS helpers)
     implementation(libs.horologist.compose.tools)
     implementation(libs.horologist.compose.layout)
     implementation(libs.horologist.tiles)
     implementation(libs.horologist.composables)
     implementation(libs.horologist.compose.material)
 
+    // Tiles & Complications
+    implementation(libs.androidx.tiles)
+    implementation(libs.androidx.tiles.material)
+    implementation(libs.androidx.tiles.tooling.preview)
+    implementation(libs.androidx.watchface.complications.data.source.ktx)
 
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
-
 
-    implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.tiles)
-    implementation(libs.androidx.tiles.material)
-    implementation(libs.androidx.tiles.tooling.preview)
-    implementation(libs.horologist.compose.tools)
-    implementation(libs.horologist.tiles)
-    implementation(libs.androidx.watchface.complications.data.source.ktx)
+    // Testing & Debugging
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
diff --git a/feature/wearos/sleepwatch/build.gradle.kts b/feature/wearos/sleepwatch/build.gradle.kts
index f4b18cebf..6b86b9c5b 100644
--- a/feature/wearos/sleepwatch/build.gradle.kts
+++ b/feature/wearos/sleepwatch/build.gradle.kts
@@ -1,12 +1,16 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
+    // REMOVE this to fix the AGP 9.0 crash:
+    // alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.wearos.sleepwatch"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
@@ -24,25 +28,30 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
-    }
+
     buildFeatures {
         compose = true
     }
 }
 
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 dependencies {
     implementation(project(":core:data"))
     implementation(project(":core:model"))
@@ -50,40 +59,41 @@ dependencies {
 
     implementation(libs.androidx.core.ktx)
 
-    // not for wearOS
-    //implementation(libs.androidx.appcompat)
-    //implementation(libs.material)
-
     // androidx-lifecycle-viewmodel-compose
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.viewmodel.android)
 
-    // Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.material3)
-    debugImplementation(libs.androidx.ui.tooling)
-    // WearOS
-    // implementation(libs.androidx.wear.compose.material) <--- what is this?
-    implementation(libs.androidx.wear.tooling.preview)
-    implementation(libs.horologist.compose.tools)
-
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
 
     // Health Connect
     implementation(libs.androidx.health.connect.client)
 
+    // Wear OS System Dependencies
     implementation(libs.google.play.services.wearable)
+
+    // --- COMPOSE FOR WEAR OS ---
+    implementation(platform(libs.androidx.compose.bom))
+
+    // UI Graphics/Tooling
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
     debugImplementation(libs.androidx.ui.tooling)
-    implementation(libs.androidx.wear.compose.material)
-    //implementation(libs.androidx.wear.compose.foundation)
+
+    // Material 3 for Wear OS (The modern standard)
+    implementation(libs.androidx.wear.compose.material3)
+
+    // Wear specific tooling (Preview support)
     implementation(libs.androidx.wear.tooling.preview)
 
+    // Tools
+    implementation(libs.horologist.compose.tools)
+
+    // Mobile Material 3 (Optional for Wear OS, but kept if you share UI components)
+    implementation(libs.androidx.material3)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/feature/weather/build.gradle.kts b/feature/weather/build.gradle.kts
index d9412c929..8ff947c16 100644
--- a/feature/weather/build.gradle.kts
+++ b/feature/weather/build.gradle.kts
@@ -1,17 +1,21 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     alias(libs.plugins.android.library)
+    // REMOVE this to fix the AGP 9.0 crash:
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.gradle)
     alias(libs.plugins.ksp)
 }
 
-android {
+// FIX: Use strict configuration to avoid deprecation warnings
+extensions.configure<LibraryExtension> {
     namespace = "com.ylabz.basepro.feature.weather"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt() // UPDATED
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -24,19 +28,23 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            consumerProguardFiles("proguard-rules.pro") // Added this line
+            consumerProguardFiles("proguard-rules.pro")
         }
-        // This debug block ensures a fast development cycle
         debug {
             isMinifyEnabled = false
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    kotlin {
-        jvmToolchain(21)
+}
+
+// FIX: Use 'java' block for Toolchain (works without the kotlin-android plugin)
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -63,19 +71,16 @@ dependencies {
     // Icons
     implementation(libs.androidx.material.icons.extended)
 
-
     // Hilt Dependency Injection
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.android)
-    implementation(libs.google.play.services.maps)
-    // implementation((libs.play.services.location))
     ksp(libs.hilt.android.compiler)
-    // kapt(libs.hilt.compiler)
+
+    // Google Play Services
+    implementation(libs.google.play.services.maps)
+    // implementation(libs.play.services.location)
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-
-    // Preview
-    debugImplementation(libs.androidx.ui.tooling)
 }
\ No newline at end of file
diff --git a/feature/weather/src/main/java/com/ylabz/basepro/feature/weather/ui/WeatherUiRoute.kt b/feature/weather/src/main/java/com/ylabz/basepro/feature/weather/ui/WeatherUiRoute.kt
index e33622618..a212c8a75 100644
--- a/feature/weather/src/main/java/com/ylabz/basepro/feature/weather/ui/WeatherUiRoute.kt
+++ b/feature/weather/src/main/java/com/ylabz/basepro/feature/weather/ui/WeatherUiRoute.kt
@@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.ylabz.basepro.feature.weather.ui.components.WeatherScreen
 
 
diff --git a/gradle.properties b/gradle.properties
index f597bbf7f..caee118d9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,8 @@ isMinifyForRelease=true
 isShrinkResources=true
 # Project-wide SDK versions
 COMPILE_SDK_VERSION=34
-TARGET_SDK_VERSION=34
\ No newline at end of file
+TARGET_SDK_VERSION=34
+
+# REMOVE WHEN POSSIBLE (AGP 9.0)
+android.builtInKotlin=false
+android.newDsl=false
\ No newline at end of file
diff --git a/gradle/libs.versions.fix.toml b/gradle/libs.versions.fix.toml
index fc73b8609..3b97b7dbd 100644
--- a/gradle/libs.versions.fix.toml
+++ b/gradle/libs.versions.fix.toml
@@ -268,7 +268,6 @@ androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profi
 # Core Android & Kotlin Plugins
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 
 # Jetpack Compose Plugin
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5819748d4..c14a2452c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,15 +6,15 @@
 
 [versions]
 # Build & SDK Configuration
-agp = "8.13.1"                  # Android Gradle Plugin version
+agp = "9.0.0"                  # Android Gradle Plugin version
 compileSdk = "36"               # Android Compile SDK version
 targetSdk = "35"                # Android Target SDK version
 minSdk = "34"                   # Android Minimum SDK version
 
 # Kotlin & Related Tools
-kotlin = "2.2.20"               # Kotlin programming language version
-ksp = "2.2.20-2.0.3"            # Kotlin Symbol Processing API version
-kotlinxSerializationCore = "1.9.0"  # Kotlinx Serialization library version (used for core and json)
+kotlin = "2.3.0"               # Kotlin programming language version
+ksp = "2.3.3"                   # Kotlin Symbol Processing API version
+kotlinxSerializationCore = "1.10.0"  # Kotlinx Serialization library version (used for core and json)
 immutableCollections = "0.4.0"  # Kotlinx Immutable Collections library version
 
 # AndroidX - Core & AppCompat
@@ -22,42 +22,42 @@ coreKtx = "1.17.0"              # AndroidX Core KTX, Kotlin extensions for Andro
 appCompat = "1.7.1"             # AndroidX AppCompat, for backward-compatible versions of Android components
 
 # AndroidX - Lifecycle
-lifecycle = "2.9.3"             # AndroidX Lifecycle components (ViewModel, LiveData, Runtime)
-lifecycleService = "2.9.3"      # AndroidX Lifecycle Service component
+lifecycle = "2.10.0"             # AndroidX Lifecycle components (ViewModel, LiveData, Runtime)
+lifecycleService = "2.10.0"      # AndroidX Lifecycle Service component
 
 # AndroidX - Activity
-activityCompose = "1.11.0"      # AndroidX Activity Compose, for Jetpack Compose in Activities
+activityCompose = "1.12.2"      # AndroidX Activity Compose, for Jetpack Compose in Activities
 
 # AndroidX - Navigation (old and we need to remove)
-androidxNavigation = "2.9.4"    # AndroidX Navigation component (Compose)
+androidxNavigation = "2.9.6"    # AndroidX Navigation component (Compose)
 # # AndroidX - Navigation (Nav3)
-nav3Core = "1.0.0-alpha10"      # Navigation 3 Core libraries version
-lifecycleViewmodelNav3 = "2.10.0-alpha04" # Navigation 3 ViewModel support
-material3AdaptiveNav3 = "1.0.0-alpha03" # Navigation 3 Material3 Adaptive Layouts (Snapshot)
+nav3Core = "1.0.0"      # Navigation 3 Core libraries version
+lifecycleViewmodelNav3 = "2.10.0" # Navigation 3 ViewModel support
+material3AdaptiveNav3 = "1.3.0-alpha06" # Navigation 3 Material3 Adaptive Layouts (Snapshot)
 # material3Adaptive = "1.0.0-alpha06"                # AndroidX Test Runner
 
 # Jetpack Compose
-composeBom = "2025.09.00"       # Jetpack Compose Bill of Materials (BOM)
+composeBom = "2026.01.00"       # Jetpack Compose Bill of Materials (BOM)
 composeMaterial = "1.7.8"       # Jetpack Compose Material (used for icons, wear material)
 # Note: androidx.compose.material3 uses the BoM version.
 # Note: androidx.compose.ui:ui-tooling-preview uses the BoM version.
-composeMaterial3Expressive = "1.5.0-alpha04"                # AndroidX Test Runner
+composeMaterial3Expressive = "1.5.0-alpha12"                # AndroidX Test Runner
 
 # Dependency Injection - Hilt
-hilt = "2.57.1"                 # Hilt, a dependency injection library for Android
+hilt = "2.59"                 # Hilt, a dependency injection library for Android
 hiltLifecycleViewModel = "1.3.0" # Hilt AndroidX Lifecycle ViewModel integration
 hiltNavigationCompose = "1.3.0" # Hilt Jetpack Compose Navigation integration
 hiltWork = "1.3.0"              # Hilt WorkManager integration
 
 # Data Persistence
-room = "2.8.0"                  # AndroidX Room, an abstraction layer over SQLite
-datastore = "1.1.7"             # AndroidX DataStore, for persistent data storage
+room = "2.8.4"                  # AndroidX Room, an abstraction layer over SQLite
+datastore = "1.2.0"             # AndroidX DataStore, for persistent data storage
 
 # Background Processing
-work = "2.10.4"                 # AndroidX WorkManager, for background tasks
+work = "2.11.0"                 # AndroidX WorkManager, for background tasks
 
 # Networking
-okhttp = "5.1.0"                # Square OkHttp, HTTP client
+okhttp = "5.3.2"                # Square OkHttp, HTTP client
 squareupRetrofit = "3.0.0"      # Square Retrofit, type-safe HTTP client for Android and Java
 
 # UI Components & Utilities
@@ -69,26 +69,39 @@ coil = "2.7.0"                  # Coil, an image loading library for Android
 accompanistPermissions = "0.37.3" # Accompanist Permissions library
 
 # Camera
-cameraX = "1.5.1"               # AndroidX CameraX libraries
+cameraX = "1.5.2"               # AndroidX CameraX libraries
 
 # Maps & Location
-mapsCompose = "6.10.0"          # Maps Compose library for Jetpack Compose
+mapsCompose = "7.0.0"          # Maps Compose library for Jetpack Compose
 mapsplatformSecretsPlugin = "2.0.1" # Gradle plugin for Maps API key secrets
-playServicesMaps = "19.2.0"     # Google Play Services Maps SDK
+playServicesMaps = "20.0.0"     # Google Play Services Maps SDK
 playServicesLocation = "21.3.0" # Google Play Services Location SDK
 
 # Health Connect
-healthConnect = "1.1.0-rc03"    # Health Connect client library
+healthConnect = "1.1.0"    # Health Connect client library
 
 # Wear OS
+# Define distinct versions for the different Wear tracks
+wearComposeMaterial3 = "1.6.0-alpha08"
+wearComposeNavigation = "1.6.0-alpha08" # Navigation usually lags slightly behind M3
+wearCompose = "1.6.0-alpha08" # Stable core
+
 playServicesWearable = "19.0.0" # Google Play Services for Wear OS
-wearComposeMaterial = "1.7.8"   # Wear OS Jetpack Compose Material library (used by icons too)
-wearComposeMaterial3 = "1.5.1"  # Wear OS Jetpack Compose Material3 library
 wearToolingPreview = "1.0.0"    # Wear OS Tooling Preview library
-coreSplashscreen = "1.0.1"      # AndroidX Core Splashscreen library
+coreSplashscreen = "1.2.0"      # AndroidX Core Splashscreen library
 tiles = "1.5.0"                 # Wear OS Tiles libraries (tiles, tiles-material, tiles-tooling, tiles-tooling-preview)
 horologist = "0.7.15"           # Horologist libraries for Wear OS
 watchfaceComplicationsDataSourceKtx = "1.2.1" # Wear OS Watchface Complications KTX library
+# ADD: Health Services (The "MAD" way to track rides)
+healthServices = "1.1.0-alpha05"
+# ADD: Ongoing Activity
+wearOngoing = "1.1.0"
+
+#glass
+glimmer = "1.0.0-alpha04"
+
+#XR
+projectedXR = "1.0.0-alpha03"
 
 # Google Play Services (Miscellaneous)
 playServicesCoroutines = "1.10.2" # Kotlin Coroutines support for Google Play Services
@@ -98,12 +111,12 @@ mlkitTextRecognition = "16.0.1" # ML Kit Text Recognition library
 playServicesCodeScanner = "16.1.0" # Google Play Services Code Scanner (QR Scanner)
 
 # Firebase
-firebaseBom = "34.2.0"          # Firebase Bill of Materials (BOM)
-googleGmsGoogleServices = "4.4.3" # Google Services Gradle plugin
+firebaseBom = "34.8.0"          # Firebase Bill of Materials (BOM)
+googleGmsGoogleServices = "4.4.4" # Google Services Gradle plugin
 googleFirebaseCrashlytics = "3.0.6" # Firebase Crashlytics Gradle plugin
 
 # GraphQL (Apollo)
-apollo = "3.8.6"                # Apollo GraphQL client version
+apollo = "4.0.0-beta.7"                # Apollo GraphQL client version
 
 # Testing & Profiling
 junit = "4.13.2"                # JUnit 4, a framework for Java tests
@@ -228,12 +241,11 @@ google-play-services-wearable = { group = "com.google.android.gms", name = "play
 androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" }
 
 # Wear OS - Compose
-androidx-wear-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "wearComposeMaterial" }
-androidx-wear-compose-material-icons = { group = "androidx.wear.compose", name = "compose-material-icons", version.ref = "wearComposeMaterial" }
 androidx-wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }
-androidx-wear-compose-navigation = { group = "androidx.wear.compose", name = "compose-navigation", version.ref = "wearComposeMaterial" } # Uses wearComposeMaterial version
+androidx-wear-compose-navigation = { group = "androidx.wear.compose", name = "compose-navigation", version.ref = "wearComposeNavigation" } # Uses wearComposeMaterial version
 androidx-wear-tooling-preview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "wearToolingPreview" }
-# androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "wearComposeFoundation" } # If needed
+# OPTIONAL: Add Foundation (useful for scaling lazy lists etc)
+androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "wearCompose" }
 
 # Wear OS - Tiles
 androidx-tiles = { group = "androidx.wear.tiles", name = "tiles", version.ref = "tiles" }
@@ -251,12 +263,21 @@ horologist-tiles = { group = "com.google.android.horologist", name = "horologist
 horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" }
 horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
 
+# Wear OS Health Services & Ongoing Activity
+androidx-health-services-client = { module = "androidx.health:health-services-client", version.ref = "healthServices" }
+androidx-wear-ongoing = { module = "androidx.wear:wear-ongoing", version.ref = "wearOngoing" }
+
+# XR
+androidx-glimmer = { group = "androidx.xr.glimmer", name = "glimmer", version.ref = "glimmer" }
+androidx-projected = { group = "androidx.xr.projected", name = "projected", version.ref = "projectedXR" }
+
 # ML Kit & Scanning
 mlkit-text-recognition = { module = "com.google.mlkit:text-recognition", version.ref = "mlkitTextRecognition" }
 gms-play-services-code-scanner = { module = "com.google.android.gms:play-services-code-scanner", version.ref = "playServicesCodeScanner" }
 
 # Firebase - BOM & Services
 firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
+firebase-ai = { group = "com.google.firebase", name = "firebase-ai" }
 firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" } # Version managed by BOM
 firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" } # Version managed by BOM
 # firebase-auth = { group = "com.google.firebase", name = "firebase-auth" } # Example: Add if using Firebase Auth (version from BOM)
@@ -284,7 +305,6 @@ androidx-runner = { group = "androidx.test", name = "runner", version.ref = "run
 androidx-benchmark-macro-junit4 = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxProfiling" }
 androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfiling" }
 
-
 [plugins]
 # Core Android & Kotlin Plugins
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ff4ca73e4..0103b94a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Aug 25 09:52:19 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d28ce4bf7..b8f883ce7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,6 +11,9 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -69,3 +72,7 @@ include(":applications:ashbike:features:core")
 include(":applications:photodo:db")
 include(":feature:material3")
 include(":applications:photodo:core")
+include(":applications:ashbike:apps:mobile")
+include(":applications:ashbike:apps:wear")
+include(":applications:ashbike:apps:xr")
+include(":applications:ashbike:apps:mobile:features:glass")