diff --git a/import_msfs.py b/import_msfs.py
new file mode 100644
index 0000000..280ccad
--- /dev/null
+++ b/import_msfs.py
@@ -0,0 +1,630 @@
+#!/usr/bin/env python3
+"""
+Import MSFS merged data into a fresh assets.db for the Canteen Asset Tracker.
+
+Steps:
+1. Back up the existing assets.db with a timestamp suffix
+2. Read merged-assets.json (10,038 records from MSFS + Canteen merge)
+3. Create a fresh assets.db with the full schema (tables, indexes, triggers)
+4. Map merged fields to the assets table per the mapping specification
+5. Insert default users (admin + tech)
+6. Verify the data
+
+Usage:
+    python3 import_msfs.py
+"""
+
+import hashlib
+import json
+import os
+import shutil
+import sqlite3
+import sys
+from datetime import datetime
+
+# ── Paths ──────────────────────────────────────────────────────────────────
+PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
+DB_PATH = os.path.join(PROJECT_DIR, "assets.db")
+MERGED_JSON = os.path.expanduser(
+    "~/projects/ms-field-service-extraction/web/static/data/merged-assets.json"
+)
+
+# ── Password hashing (mirrors server.py) ──────────────────────────────────
+def hash_password(password: str) -> str:
+    return hashlib.sha256(password.encode()).hexdigest()
+
+# ── 1. Backup existing DB ────────────────────────────────────────────────
+def backup_db():
+    if not os.path.exists(DB_PATH):
+        print("[BACKUP] No existing assets.db found — skipping backup.")
+        return None
+    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+    backup_path = f"{DB_PATH}.{timestamp}.pre-msfs-import"
+    shutil.copy2(DB_PATH, backup_path)
+    size_mb = os.path.getsize(backup_path) / (1024 * 1024)
+    print(f"[BACKUP] Copied assets.db → {backup_path} ({size_mb:.1f} MB)")
+    return backup_path
+
+# ── 2. Read merged data ──────────────────────────────────────────────────
+def read_merged_data():
+    if not os.path.exists(MERGED_JSON):
+        print(f"[ERROR] Merged data not found at: {MERGED_JSON}")
+        sys.exit(1)
+    with open(MERGED_JSON, "r") as f:
+        data = json.load(f)
+    assets = data.get("assets", [])
+    meta = data.get("meta", {})
+    print(f"[READ] Loaded {len(assets)} records from merged-assets.json")
+    print(f"       Joined: {meta.get('joined', '?')}  "
+          f"MSFS-only: {meta.get('msfs_only', '?')}  "
+          f"Canteen-only: {meta.get('canteen_only', '?')}")
+    return assets
+
+# ── 3. Create fresh DB with full schema ──────────────────────────────────
+SCHEMA_SQL = """
+PRAGMA journal_mode=WAL;
+PRAGMA foreign_keys=ON;
+
+CREATE TABLE IF NOT EXISTS users (
+    id              INTEGER PRIMARY KEY AUTOINCREMENT,
+    username        TEXT    UNIQUE NOT NULL,
+    password_hash   TEXT    NOT NULL,
+    role            TEXT    NOT NULL DEFAULT 'technician',
+    created_at      TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS customers (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    name        TEXT    UNIQUE NOT NULL,
+    created_at  TEXT    NOT NULL DEFAULT (datetime('now')),
+    updated_at  TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS customer_contacts (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    customer_id INTEGER NOT NULL REFERENCES customers(id) ON DELETE CASCADE,
+    name        TEXT,
+    phone       TEXT,
+    email       TEXT
+);
+
+CREATE TABLE IF NOT EXISTS locations (
+    id                  INTEGER PRIMARY KEY AUTOINCREMENT,
+    customer_id         INTEGER REFERENCES customers(id),
+    name                TEXT,
+    address             TEXT    DEFAULT '',
+    building_name       TEXT    DEFAULT '',
+    building_number     TEXT    DEFAULT '',
+    floor               TEXT    DEFAULT '',
+    trailer_number      TEXT    DEFAULT '',
+    site_hours          TEXT    DEFAULT '',
+    access_notes        TEXT    DEFAULT '',
+    walking_directions  TEXT    DEFAULT '',
+    map_link            TEXT    DEFAULT '',
+    latitude            REAL    DEFAULT NULL,
+    longitude           REAL    DEFAULT NULL,
+    created_at          TEXT    NOT NULL DEFAULT (datetime('now')),
+    updated_at          TEXT    NOT NULL DEFAULT (datetime('now')),
+    disney_park         TEXT    DEFAULT NULL
+);
+
+CREATE TABLE IF NOT EXISTS rooms (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    location_id INTEGER NOT NULL REFERENCES locations(id) ON DELETE CASCADE,
+    name        TEXT,
+    floor       TEXT    DEFAULT '',
+    created_at  TEXT    NOT NULL DEFAULT (datetime('now')),
+    updated_at  TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS categories (
+    id      INTEGER PRIMARY KEY AUTOINCREMENT,
+    name    TEXT    UNIQUE NOT NULL,
+    icon    TEXT    DEFAULT ''
+);
+
+CREATE TABLE IF NOT EXISTS key_names (
+    id      INTEGER PRIMARY KEY AUTOINCREMENT,
+    name    TEXT    UNIQUE NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS key_types (
+    id      INTEGER PRIMARY KEY AUTOINCREMENT,
+    name    TEXT    UNIQUE NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS badge_types (
+    id      INTEGER PRIMARY KEY AUTOINCREMENT,
+    name    TEXT    UNIQUE NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS makes (
+    id      INTEGER PRIMARY KEY AUTOINCREMENT,
+    name    TEXT    UNIQUE NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS models (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    make_id     INTEGER NOT NULL REFERENCES makes(id),
+    name        TEXT    NOT NULL,
+    icon_path   TEXT
+);
+
+CREATE TABLE IF NOT EXISTS assets (
+    id                  INTEGER PRIMARY KEY AUTOINCREMENT,
+    machine_id          TEXT    NOT NULL UNIQUE,
+    serial_number       TEXT    DEFAULT '',
+    name                TEXT    NOT NULL,
+    description         TEXT    DEFAULT '',
+    category            TEXT    NOT NULL DEFAULT 'Other',
+    status              TEXT    NOT NULL DEFAULT 'active',
+    make                TEXT    DEFAULT '',
+    model               TEXT    DEFAULT '',
+    address             TEXT    DEFAULT '',
+    building_name       TEXT    DEFAULT '',
+    building_number     TEXT    DEFAULT '',
+    floor               TEXT    DEFAULT '',
+    room                TEXT    DEFAULT '',
+    trailer_number      TEXT    DEFAULT '',
+    walking_directions  TEXT    DEFAULT '',
+    map_link            TEXT    DEFAULT '',
+    parking_location    TEXT    DEFAULT '',
+    photo_path          TEXT,
+    customer_id         INTEGER REFERENCES customers(id),
+    location_id         INTEGER REFERENCES locations(id),
+    assigned_to         INTEGER REFERENCES users(id),
+    latitude            REAL    DEFAULT NULL,
+    longitude           REAL    DEFAULT NULL,
+    geofence_radius_meters INTEGER DEFAULT 50,
+    created_at          TEXT    NOT NULL DEFAULT (datetime('now')),
+    updated_at          TEXT    NOT NULL DEFAULT (datetime('now')),
+    disney_park         TEXT    DEFAULT NULL,
+    is_disney           INTEGER DEFAULT 0,
+    dex_report_date     TEXT    DEFAULT NULL,
+    install_date        TEXT    DEFAULT NULL,
+    deployed            TEXT    DEFAULT NULL,
+    pulled_date         TEXT    DEFAULT NULL,
+    company             TEXT    DEFAULT '',
+    location_area       TEXT    DEFAULT '',
+    place               TEXT    DEFAULT '',
+    connect_id          TEXT    DEFAULT '',
+    canteen_connect_guid TEXT   DEFAULT '',
+    manufacturer        TEXT    DEFAULT '',
+    equipment_id        TEXT    DEFAULT ''
+);
+
+CREATE TABLE IF NOT EXISTS asset_keys (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    asset_id    INTEGER NOT NULL REFERENCES assets(id) ON DELETE CASCADE,
+    key_name    TEXT,
+    key_type    TEXT
+);
+
+CREATE TABLE IF NOT EXISTS asset_badges (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    asset_id    INTEGER NOT NULL REFERENCES assets(id) ON DELETE CASCADE,
+    badge_name  TEXT
+);
+
+CREATE TABLE IF NOT EXISTS settings (
+    id      INTEGER PRIMARY KEY AUTOINCREMENT,
+    key     TEXT    UNIQUE NOT NULL,
+    value   TEXT
+);
+
+CREATE TABLE IF NOT EXISTS activity_log (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id     INTEGER REFERENCES users(id),
+    action      TEXT,
+    entity_type TEXT,
+    entity_id   INTEGER,
+    details     TEXT,
+    created_at  TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS geofences (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    name        TEXT,
+    points      TEXT,
+    color       TEXT,
+    created_at  TEXT    NOT NULL DEFAULT (datetime('now')),
+    updated_at  TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS geofence_users (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    geofence_id INTEGER NOT NULL REFERENCES geofences(id) ON DELETE CASCADE,
+    user_id     INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    UNIQUE(geofence_id, user_id)
+);
+
+CREATE TABLE IF NOT EXISTS visits (
+    id                  INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id             INTEGER REFERENCES users(id),
+    asset_id            INTEGER REFERENCES assets(id) ON DELETE CASCADE,
+    checkin_time        TEXT,
+    checkout_time       TEXT,
+    duration_minutes    INTEGER,
+    created_at          TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS sessions (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id     INTEGER REFERENCES users(id) ON DELETE CASCADE,
+    token       TEXT    UNIQUE NOT NULL,
+    created_at  TEXT    NOT NULL DEFAULT (datetime('now')),
+    expires_at  TEXT    NOT NULL DEFAULT (datetime('now', '+1 day'))
+);
+
+CREATE TABLE IF NOT EXISTS cantaloupe_sync_batches (
+    id              INTEGER PRIMARY KEY AUTOINCREMENT,
+    status          TEXT    NOT NULL DEFAULT 'pending',
+    created_at      TEXT    NOT NULL DEFAULT (datetime('now')),
+    approved_at     TEXT,
+    file_path       TEXT,
+    row_count       INTEGER DEFAULT 0,
+    diff_summary    TEXT,
+    raw_data        TEXT,
+    error_message   TEXT
+);
+
+CREATE TABLE IF NOT EXISTS service_entrances (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    location_id INTEGER NOT NULL REFERENCES locations(id) ON DELETE CASCADE,
+    name        TEXT    NOT NULL,
+    latitude    REAL    NOT NULL,
+    longitude   REAL    NOT NULL,
+    notes       TEXT    DEFAULT '',
+    created_at  TEXT    NOT NULL DEFAULT (datetime('now')),
+    updated_at  TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS checkins (
+    id          INTEGER PRIMARY KEY AUTOINCREMENT,
+    asset_id    INTEGER REFERENCES assets(id) ON DELETE CASCADE,
+    user_id     INTEGER REFERENCES users(id),
+    latitude    REAL,
+    longitude   REAL,
+    accuracy    REAL,
+    photo_path  TEXT,
+    notes       TEXT    DEFAULT '',
+    created_at  TEXT    NOT NULL DEFAULT (datetime('now'))
+);
+
+-- Indexes
+CREATE INDEX IF NOT EXISTS idx_assets_category ON assets(category);
+CREATE INDEX IF NOT EXISTS idx_csb_status ON cantaloupe_sync_batches(status);
+CREATE INDEX IF NOT EXISTS idx_csb_created ON cantaloupe_sync_batches(created_at);
+CREATE INDEX IF NOT EXISTS idx_checkins_asset_id ON checkins(asset_id);
+CREATE INDEX IF NOT EXISTS idx_checkins_created_at ON checkins(created_at);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_assets_machine_id ON assets(machine_id);
+"""
+
+# ── 4. Map merged record to asset row ────────────────────────────────────
+def get_machine_id(rec):
+    """Get machine_id, falling back from msfs to canteen."""
+    mid = rec.get("msfs_machine_id")
+    if mid:
+        return str(mid).strip()
+    mid = rec.get("canteen_machine_id")
+    if mid:
+        return str(mid).strip()
+    return ""
+
+def map_record_to_asset(rec):
+    """
+    Map a merged record's fields to the assets table columns.
+    Returns a dict keyed by column name.
+    """
+    # Primary identifiers
+    machine_id = get_machine_id(rec)
+    name = rec.get("msfs_name") or rec.get("canteen_name") or ""
+
+    # Category / status
+    category = rec.get("canteen_category") or "Other"
+    status = rec.get("canteen_status") or "active"
+
+    # Make / model / serial
+    make = rec.get("msfs_manufacturer") or ""
+    model = rec.get("msfs_dex_model") or ""
+    serial_number = rec.get("serial_number") or ""
+
+    # GPS — prefer msfs, fall back to canteen, then account
+    latitude = rec.get("msfs_latitude")
+    longitude = rec.get("msfs_longitude")
+    if latitude is None or longitude is None:
+        latitude = rec.get("canteen_latitude") or latitude
+        longitude = rec.get("canteen_longitude") or longitude
+
+    # Address — from account if available
+    address = ""
+    account = rec.get("account")
+    if account and account.get("address"):
+        addr_parts = [account["address"]]
+        if account.get("city"):
+            addr_parts.append(account["city"])
+        if account.get("state"):
+            addr_parts.append(account["state"])
+        if account.get("zip"):
+            addr_parts.append(account["zip"])
+        address = ", ".join(addr_parts)
+    if not address:
+        address = rec.get("canteen_address") or ""
+
+    # Canteen fields
+    customer_id = rec.get("canteen_customer_id")
+    disney_park = rec.get("canteen_disney_park")
+    is_disney = rec.get("canteen_is_disney") or 0
+    dex_report_date = rec.get("canteen_dex_report_date")
+    install_date = rec.get("canteen_install_date") or rec.get("msfs_install_date")
+    building_name = rec.get("canteen_building_name")
+    building_number = rec.get("canteen_building_number")
+    floor = rec.get("canteen_floor") or ""
+    room = rec.get("canteen_room") or ""
+    geofence_radius = rec.get("canteen_geofence_radius") or 50
+    company = rec.get("canteen_company") or ""
+    description = rec.get("canteen_description") or ""
+    deployed = rec.get("canteen_deployed")
+    pulled_date = rec.get("canteen_pulled_date")
+    location_area = rec.get("canteen_location_area") or ""
+    place = rec.get("canteen_place") or ""
+    location_id = rec.get("canteen_location_id")
+
+    # MSFS fields
+    connect_id = rec.get("msfs_connect_id") or ""
+    canteen_connect_guid = rec.get("msfs_canteen_connect_guid") or ""
+    manufacturer = rec.get("msfs_manufacturer") or ""
+    equipment_id = rec.get("msfs_equipment_id") or ""
+
+    return {
+        "machine_id": machine_id,
+        "serial_number": serial_number,
+        "name": name,
+        "description": description,
+        "category": category,
+        "status": status,
+        "make": make,
+        "model": model,
+        "address": address,
+        "building_name": building_name or "",
+        "building_number": building_number or "",
+        "floor": floor,
+        "room": room,
+        "customer_id": customer_id,
+        "location_id": location_id,
+        "latitude": latitude,
+        "longitude": longitude,
+        "geofence_radius_meters": geofence_radius,
+        "disney_park": disney_park,
+        "is_disney": is_disney,
+        "dex_report_date": dex_report_date,
+        "install_date": install_date,
+        "deployed": deployed,
+        "pulled_date": pulled_date,
+        "company": company,
+        "location_area": location_area,
+        "place": place,
+        "connect_id": connect_id,
+        "canteen_connect_guid": canteen_connect_guid,
+        "manufacturer": manufacturer,
+        "equipment_id": equipment_id,
+    }
+
+# ── 5. Insert records into DB ────────────────────────────────────────────
+def create_db(records):
+    """Create a fresh assets.db with schema and import records."""
+    # Remove existing
+    if os.path.exists(DB_PATH):
+        os.remove(DB_PATH)
+        print("[DB] Removed existing assets.db")
+
+    conn = sqlite3.connect(DB_PATH)
+    conn.row_factory = sqlite3.Row
+    conn.executescript(SCHEMA_SQL)
+    print("[DB] Created fresh assets.db with full schema")
+
+    # Insert default categories used by the data
+    cursor = conn.cursor()
+    categories_seen = set()
+    for rec in records:
+        cat = rec.get("canteen_category") or "Other"
+        categories_seen.add(cat)
+    for cat in sorted(categories_seen):
+        cursor.execute("INSERT OR IGNORE INTO categories (name) VALUES (?)", (cat,))
+    print(f"[CATEGORIES] Inserted {len(categories_seen)} categories")
+
+    # Insert customers from the data
+    customers_seen = {}
+    for rec in records:
+        if rec.get("customer") and rec["customer"].get("name"):
+            cust = rec["customer"]
+            cid = cust.get("id")
+            cname = cust.get("name")
+            if cid and cname and cid not in customers_seen:
+                customers_seen[cid] = cname
+    for cid, cname in sorted(customers_seen.items()):
+        cursor.execute(
+            "INSERT OR IGNORE INTO customers (id, name) VALUES (?, ?)",
+            (cid, cname),
+        )
+    print(f"[CUSTOMERS] Inserted {len(customers_seen)} customers")
+
+    # Insert locations from the data
+    locations_seen = {}
+    for rec in records:
+        if rec.get("location") and rec["location"].get("name"):
+            loc = rec["location"]
+            lid = loc.get("id")
+            lname = loc.get("name")
+            if lid and lname and lid not in locations_seen:
+                locations_seen[lid] = {
+                    "name": lname,
+                    "address": loc.get("address") or "",
+                    "customer_id": rec.get("canteen_customer_id"),
+                }
+    for lid, loc_data in sorted(locations_seen.items()):
+        cursor.execute(
+            "INSERT OR IGNORE INTO locations (id, name, address, customer_id) VALUES (?, ?, ?, ?)",
+            (lid, loc_data["name"], loc_data["address"], loc_data["customer_id"]),
+        )
+    print(f"[LOCATIONS] Inserted {len(locations_seen)} locations")
+
+    # Insert default users
+    default_users = [
+        ("admin", hash_password("admin123"), "admin"),
+        ("tech", hash_password("tech123"), "technician"),
+    ]
+    for username, pw_hash, role in default_users:
+        cursor.execute(
+            "INSERT INTO users (username, password_hash, role) VALUES (?, ?, ?)",
+            (username, pw_hash, role),
+        )
+    print(f"[USERS] Inserted {len(default_users)} default users")
+
+    # Insert assets — deduplicate by machine_id, preferring "joined" over "msfs_only"
+    asset_cols = [
+        "machine_id", "serial_number", "name", "description", "category",
+        "status", "make", "model", "address", "building_name",
+        "building_number", "floor", "room", "customer_id", "location_id",
+        "latitude", "longitude", "geofence_radius_meters", "disney_park",
+        "is_disney", "dex_report_date", "install_date", "deployed",
+        "pulled_date", "company", "location_area", "place", "connect_id",
+        "canteen_connect_guid", "manufacturer", "equipment_id",
+    ]
+    placeholders = ", ".join(["?"] * len(asset_cols))
+    col_names = ", ".join(asset_cols)
+
+    # Priority: joined > msfs_only > canteen_only
+    match_priority = {"joined": 0, "msfs_only": 1, "canteen_only": 2}
+
+    deduped = {}  # machine_id -> (priority, row)
+    no_id = 0
+    for rec in records:
+        row = map_record_to_asset(rec)
+        mid = row["machine_id"]
+        if not mid:
+            no_id += 1
+            continue
+        priority = match_priority.get(rec.get("match", ""), 99)
+        if mid not in deduped or priority < deduped[mid][0]:
+            deduped[mid] = (priority, row)
+
+    inserted = 0
+    for mid, (priority, row) in deduped.items():
+        values = [row[c] for c in asset_cols]
+        cursor.execute(
+            f"INSERT INTO assets ({col_names}) VALUES ({placeholders})",
+            values,
+        )
+        inserted += 1
+
+    total_raw = len(records)
+    total_deduped = len(deduped)
+    skipped = total_raw - total_deduped - no_id
+    print(f"\n[ASSETS] Raw records: {total_raw}")
+    print(f"[ASSETS] No machine_id: {no_id}")
+    print(f"[ASSETS] Duplicates removed: {skipped}")
+    print(f"[ASSETS] Inserted: {inserted}")
+    print(f"[ASSETS] Total in DB: {inserted}")
+
+    conn.commit()
+
+    # Count
+    asset_count = cursor.execute("SELECT COUNT(*) FROM assets").fetchone()[0]
+    gps_count = cursor.execute(
+        "SELECT COUNT(*) FROM assets WHERE latitude IS NOT NULL AND longitude IS NOT NULL"
+    ).fetchone()[0]
+    cat_dist = cursor.execute(
+        "SELECT category, COUNT(*) FROM assets GROUP BY category ORDER BY COUNT(*) DESC"
+    ).fetchall()
+    status_dist = cursor.execute(
+        "SELECT status, COUNT(*) FROM assets GROUP BY status ORDER BY COUNT(*) DESC"
+    ).fetchall()
+
+    conn.close()
+
+    print(f"[ASSETS] With GPS coords: {gps_count}")
+    print(f"\n[ASSETS] Category distribution:")
+    for cat, cnt in cat_dist:
+        print(f"         {cat}: {cnt}")
+    print(f"\n[ASSETS] Status distribution:")
+    for st, cnt in status_dist:
+        print(f"         {st}: {cnt}")
+
+    return asset_count, gps_count
+
+# ── 6. Verification ──────────────────────────────────────────────────────
+def verify_db():
+    """Open the fresh DB and run basic checks."""
+    conn = sqlite3.connect(DB_PATH)
+    conn.row_factory = sqlite3.Row
+    cursor = conn.cursor()
+
+    print("\n─── VERIFICATION ───")
+
+    # Table list
+    tables = cursor.execute(
+        "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name"
+    ).fetchall()
+    print(f"Tables ({len(tables)}): {', '.join(t['name'] for t in tables)}")
+
+    # User count
+    user_count = cursor.execute("SELECT COUNT(*) FROM users").fetchone()[0]
+    print(f"Users: {user_count}")
+    users = cursor.execute("SELECT username, role FROM users").fetchall()
+    for u in users:
+        print(f"  - {u['username']} ({u['role']})")
+
+    # Asset count
+    asset_count = cursor.execute("SELECT COUNT(*) FROM assets").fetchone()[0]
+    gps_count = cursor.execute(
+        "SELECT COUNT(*) FROM assets WHERE latitude IS NOT NULL AND longitude IS NOT NULL"
+    ).fetchone()[0]
+    print(f"Assets: {asset_count}")
+    print(f"Assets with GPS: {gps_count}")
+
+    # Sample from each match type
+    if asset_count > 0:
+        print("\nSample records:")
+        sample = cursor.execute(
+            "SELECT machine_id, name, category, status, latitude, longitude FROM assets LIMIT 5"
+        ).fetchall()
+        for s in sample:
+            gps_tag = f"({s['latitude']}, {s['longitude']})" if s['latitude'] else "NO GPS"
+            print(f"  {s['machine_id']}: {s['name']} [{s['category']}] {gps_tag}")
+
+    # Check index count
+    idx_count = cursor.execute(
+        "SELECT COUNT(*) FROM sqlite_master WHERE type='index' AND name NOT LIKE 'sqlite_%'"
+    ).fetchone()[0]
+    print(f"Indexes: {idx_count}")
+
+    # DB size
+    db_size = os.path.getsize(DB_PATH) / (1024 * 1024)
+    print(f"DB size: {db_size:.1f} MB")
+
+    conn.close()
+
+# ── Main ──────────────────────────────────────────────────────────────────
+def main():
+    print("═══ MSFS MERGED DATA IMPORT ═══\n")
+
+    # 1. Backup
+    backup_path = backup_db()
+
+    # 2. Read data
+    records = read_merged_data()
+
+    # 3. Create DB and import
+    asset_count, gps_count = create_db(records)
+
+    # 4. Verify
+    verify_db()
+
+    print(f"\n═══ DONE ═══")
+    if backup_path:
+        print(f"Backup: {backup_path}")
+    print(f"New DB: {DB_PATH} ({asset_count} assets, {gps_count} with GPS)")
+
+if __name__ == "__main__":
+    main()
diff --git a/server.py b/server.py
index 3d4631b..9f925d3 100644
--- a/server.py
+++ b/server.py
@@ -21,7 +21,12 @@ from contextlib import asynccontextmanager
 from datetime import date
 from pathlib import Path
 
-import pytesseract
+try:
+    import pytesseract
+    _HAS_TESSERACT = True
+except ImportError:
+    pytesseract = None
+    _HAS_TESSERACT = False
 import piexif
 from PIL import Image as PILImage
 
@@ -1123,13 +1128,23 @@ def get_asset(asset_id: int):
 # ─── Navigation endpoint ────────────────────────────────────────────────────
 
 @app.get("/api/assets/{asset_id}/navigation")
-def get_navigation(asset_id: int, lat: float = Query(...), lng: float = Query(...)):
-    """Return distance, bearing, and coordinates for navigation from GPS to asset."""
+def get_navigation(
+    asset_id: int,
+    lat: float = Query(...),
+    lng: float = Query(...),
+    mode: str = Query("driving", pattern="^(driving|walking)$"),
+):
+    """Return navigation info from GPS to asset using OSRM (falls back to Haversine).
+
+    Accepts optional mode: 'driving' (default) or 'walking'.
+    On success returns route_coords, route_duration_s, walking_directions, route_mode
+    plus the standard distance/bearing fields.
+    """
     import math
 
     conn = get_db()
     row = conn.execute(
-        "SELECT id, name, latitude, longitude, machine_id, address FROM assets WHERE id = ?",
+        "SELECT id, name, latitude, longitude, machine_id, address, walking_directions FROM assets WHERE id = ?",
         (asset_id,),
     ).fetchone()
     conn.close()
@@ -1145,7 +1160,47 @@ def get_navigation(asset_id: int, lat: float = Query(...), lng: float = Query(..
 
     dest_lat, dest_lng = row["latitude"], row["longitude"]
 
-    # Haversine distance
+    # ── Try OSRM first ──────────────────────────────────────────────────
+    osrm_profile = "driving" if mode == "driving" else "foot"
+    route_coords = None
+    route_duration_s = None
+    route_distance_m = None
+    walking_directions = None
+
+    try:
+        url = (
+            f"https://router.project-osrm.org/route/v1/{osrm_profile}/{lng},{lat};{dest_lng},{dest_lat}"
+            "?overview=full&geometries=geojson&steps=true&alternatives=false"
+        )
+        req = urllib.request.Request(url, headers={"User-Agent": "CanteenAssetTracker/1.0"})
+        with urllib.request.urlopen(req, timeout=10) as resp:
+            data = _json.loads(resp.read().decode())
+
+        if data.get("code") == "Ok" and data.get("routes"):
+            route = data["routes"][0]
+            coords_raw = route.get("geometry", {}).get("coordinates", [])
+            route_coords = [{"lat": c[1], "lng": c[0]} for c in coords_raw]
+            route_duration_s = round(route.get("duration", 0))
+            route_distance_m = round(route.get("distance", 0))
+
+            # Build step-by-step walking directions (only for walking mode)
+            walking_directions = None
+            if mode == "walking":
+                steps = []
+                for leg in route.get("legs", []):
+                    for step in leg.get("steps", []):
+                        steps.append({
+                            "instruction": step.get("maneuver", {}).get("instruction", step.get("name", "")),
+                            "distance_m": round(step.get("distance", 0)),
+                            "duration_s": round(step.get("duration", 0)),
+                        })
+                if steps:
+                    walking_directions = steps
+    except Exception:
+        # OSRM failed — fall through to Haversine below
+        pass
+
+    # ── Haversine distance (always computed for fallback / reference) ────
     R = 6371000  # Earth radius in meters
     phi1 = math.radians(lat)
     phi2 = math.radians(dest_lat)
@@ -1154,7 +1209,7 @@ def get_navigation(asset_id: int, lat: float = Query(...), lng: float = Query(..
 
     a_val = math.sin(dphi / 2) ** 2 + math.cos(phi1) * math.cos(phi2) * math.sin(dlambda / 2) ** 2
     c_val = 2 * math.atan2(math.sqrt(a_val), math.sqrt(1 - a_val))
-    distance_m = R * c_val
+    haversine_distance_m = R * c_val
 
     # Bearing
     y = math.sin(dlambda) * math.cos(phi2)
@@ -1166,7 +1221,7 @@ def get_navigation(asset_id: int, lat: float = Query(...), lng: float = Query(..
     idx = round(bearing / 45) % 8
     cardinal = dirs[idx]
 
-    return {
+    result = {
         "asset_id": asset_id,
         "asset_name": row["name"],
         "asset_lat": dest_lat,
@@ -1174,10 +1229,11 @@ def get_navigation(asset_id: int, lat: float = Query(...), lng: float = Query(..
         "asset_address": row["address"] or None,
         "origin_lat": lat,
         "origin_lng": lng,
-        "distance_meters": round(distance_m, 1),
-        "distance_km": round(distance_m / 1000, 2),
+        "distance_meters": round(route_distance_m if route_distance_m else haversine_distance_m, 1),
+        "distance_km": round((route_distance_m if route_distance_m else haversine_distance_m) / 1000, 2),
         "bearing": round(bearing, 1),
         "cardinal": cardinal,
+        "route_mode": mode,
         "google_maps_url": (
             f"https://www.google.com/maps/dir/?api=1"
             f"&origin={lat},{lng}"
@@ -1185,6 +1241,21 @@ def get_navigation(asset_id: int, lat: float = Query(...), lng: float = Query(..
         ),
     }
 
+    if route_coords:
+        result["route_coords"] = route_coords
+        result["route_duration_s"] = route_duration_s
+        result["route_distance_m"] = route_distance_m
+        result["route_mode"] = mode
+        result["osrm_source"] = "osrm"
+
+        if mode == "walking" and walking_directions:
+            result["walking_directions"] = walking_directions
+    else:
+        result["osrm_source"] = "haversine"
+        result["walking_directions"] = row["walking_directions"] or None
+
+    return result
+
 
 # ─── Task 6: PUT / DELETE /api/assets/{id} ─────────────────────────────────
 
@@ -1468,11 +1539,6 @@ class LoginRequest(BaseModel):
     password: str
     remember_me: bool = False
 
-class GeofencePointCheck(BaseModel):
-    lat: float
-    lng: float
-
-
 # ─── Phase C: Auth API ───────────────────────────────────────────────────────
 
 
@@ -1554,26 +1620,7 @@ def logout(request: Request):
 
 
 
-# ─── Phase 0: Proximity & Geofence Check ─────────────────────────────────────
-
-
-def _point_in_polygon(lat: float, lng: float, polygon: list) -> bool:
-    """Ray-casting algorithm for point-in-polygon test."""
-    inside = False
-    n = len(polygon)
-    if n < 3:
-        return False
-    j = n - 1
-    for i in range(n):
-        yi = polygon[i]["lat"] if isinstance(polygon[i], dict) else polygon[i][0]
-        xi = polygon[i]["lng"] if isinstance(polygon[i], dict) else polygon[i][1]
-        yj = polygon[j]["lat"] if isinstance(polygon[j], dict) else polygon[j][0]
-        xj = polygon[j]["lng"] if isinstance(polygon[j], dict) else polygon[j][1]
-
-        if ((yi > lat) != (yj > lat)) and (lng < (xj - xi) * (lat - yi) / (yj - yi) + xi):
-            inside = not inside
-        j = i
-    return inside
+# ─── Phase 0: Proximity Check ─────────────────────────────────────────────────
 
 
 @app.get("/api/proximity")
@@ -1608,24 +1655,6 @@ def proximity_check(
     return results
 
 
-@app.post("/api/geofences/check")
-def check_geofence_point(body: GeofencePointCheck):
-    """
-    Check if a GPS point falls inside any geofence polygon.
-    Returns list of matching geofences.
-    """
-    conn = get_db()
-    rows = conn.execute("SELECT * FROM geofences ORDER BY name").fetchall()
-    conn.close()
-
-    matches = []
-    for row in rows:
-        points = _json.loads(row["points"])
-        if _point_in_polygon(body.lat, body.lng, points):
-            matches.append(row_to_dict(row))
-    return matches
-
-
 # ─── Phase C: Visits API & Auto-visit Logging ────────────────────────────────
 
 
@@ -2050,11 +2079,26 @@ async def ocr_sticker(file: UploadFile = File(...), exif_data: str = Form(None))
         img = PILImage.open(ocr_path)
         # Preprocess: convert to grayscale and increase contrast for better OCR
         img_gray = img.convert("L")
+        if not _HAS_TESSERACT:
+            raise RuntimeError(
+                "Tesseract OCR library (pytesseract) is not installed. "
+                "Run: pip install pytesseract && apt-get install -y tesseract-ocr"
+            )
         text = pytesseract.image_to_string(img_gray, config="--psm 6")
+    except (RuntimeError, ImportError) as e:
+        if not saved_path:
+            ocr_path.unlink(missing_ok=True)
+        raise HTTPException(
+            status_code=503,
+            detail=f"OCR service unavailable: {str(e)}",
+        )
     except Exception as e:
         if not saved_path:
             ocr_path.unlink(missing_ok=True)
-        raise HTTPException(status_code=500, detail=f"OCR processing failed: {str(e)}")
+        raise HTTPException(
+            status_code=500,
+            detail=f"OCR processing error: {str(e)}. Tesseract binary may not be installed system-wide. Run: apt-get install -y tesseract-ocr",
+        )
 
     # Clean up temp file (but keep permanent photos)
     if not saved_path:
diff --git a/static/index.html b/static/index.html
index d2649b9..009e9dc 100644
--- a/static/index.html
+++ b/static/index.html
@@ -8,9 +8,7 @@
   <script src="https://cdn.jsdelivr.net/npm/tesseract.js@5/dist/tesseract.min.js"></script>
   <!-- Leaflet Map -->
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
-  <link rel="stylesheet" href="https://unpkg.com/leaflet-draw@1.0.4/dist/leaflet.draw.css" />
   <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
-  <script src="https://unpkg.com/leaflet-draw@1.0.4/dist/leaflet.draw.js"></script>
   <script src="https://unpkg.com/leaflet.heat@0.2.0/dist/leaflet-heat.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/exifr@7/dist/lite.umd.js"></script>
   <style>
@@ -808,13 +806,6 @@
     #mapContainer .leaflet-container {
       background: var(--bg);
     }
-    /* Geofence panel */
-    .geofence-panel {
-      margin-top: 8px;
-      background: var(--card);
-      border: 1px solid var(--border);
-      border-radius: var(--radius);
-    }
     /* Map controls bar */
     .map-controls {
       display: flex; gap: 6px; margin-bottom: 6px; flex-wrap: wrap;
@@ -882,22 +873,7 @@
     }
     .leaflet-popup-tip { background: var(--card) !important; }
     .leaflet-popup-close-button { color: var(--text2) !important; }
-    /* Leaflet.draw toolbar — add text labels to buttons */
-    .leaflet-draw-toolbar a {
-      width: auto !important; min-width: 30px; padding: 0 10px 0 30px !important;
-      display: flex; align-items: center;
-      font-size: 11px; font-weight: 600; color: var(--text) !important;
-      text-decoration: none !important;
-      white-space: nowrap;
-      background-position: 8px center !important;
-    }
-    .leaflet-draw-toolbar a::after { content: attr(title); }
-    .leaflet-draw-toolbar a[title="Draw a polygon"]::after { content: "Area"; }
-    .leaflet-draw-toolbar a[title="Draw a rectangle"]::after { content: "Box"; }
-    .leaflet-draw-toolbar a[title="Draw a circle"]::after { content: "Circle"; }
-    .leaflet-draw-toolbar a[title="Edit layers"]::after { content: "Edit"; }
-    .leaflet-draw-toolbar a[title="Delete layers"]::after { content: "Delete"; }
-    .leaflet-draw-actions a { width: auto !important; padding: 0 10px !important; font-size: 10px; color: var(--text) !important; }
+    /* Leaflet.draw toolbar — removed */
 
     /* ── Native Route Planner ── */
     #tabRoute {
@@ -1128,14 +1104,10 @@
        TAB: ADD ASSET (Barcode / OCR / Manual)
        ═══════════════════════════════════════════════════════════════════════ -->
   <div id="tabAddAsset" class="tab-panel active">
-    <!-- Hidden photo picker input -->
-    <input type="file" id="photoPicker" accept="image/*" style="display:none;">
     <!-- Mode Toggles -->
     <div class="mode-toggles">
       <button class="mode-toggle active" data-mode="barcode" onclick="setAddAssetMode('barcode')">📷 Barcode</button>
       <button class="mode-toggle" data-mode="ocr" onclick="setAddAssetMode('ocr')">🔍 OCR</button>
-      <button class="mode-toggle" data-mode="manual" onclick="setAddAssetMode('manual')">✏️ Manual</button>
-      <button class="photo-picker-btn" onclick="document.getElementById('photoPicker').click()">📱 Pick from Gallery</button>
     </div>
 
     <!-- ── BARCODE MODE ──────────────────────────────────────────────── -->
@@ -1153,24 +1125,8 @@
         <div id="scanResult" class="scan-result" style="display:none;"></div>
       </div>
 
-      <!-- New Asset form (shown when machine_id not found) -->
-      <div id="newAssetCard" class="card" style="display:none;">
-        <div class="card-title">Create New Asset</div>
-        <input id="newMachineId" type="text" class="input-field" placeholder="Machine ID" readonly>
-        <input id="newName" type="text" class="input-field" placeholder="Asset name *" required>
-        <textarea id="newDesc" class="input-field" placeholder="Telemetry ID (optional)" rows="2"></textarea>
-        <div class="form-row" style="margin-bottom:8px;">
-          <select id="newCatSelect" class="input-field">
-            <option value="">Category</option>
-          </select>
-          <select id="newStatus" class="input-field">
-            <option value="active">Active</option>
-            <option value="maintenance">Maintenance</option>
-            <option value="retired">Retired</option>
-          </select>
-        </div>
-        <button class="btn btn-primary" onclick="createScannedAsset()">Create Asset</button>
-      </div>
+      <!-- Lookup result shown here when asset found -->
+      
 
       <!-- Check-in form (shown when barcode found) -->
       <div id="checkinCard" class="card" style="display:none;">
@@ -1210,149 +1166,10 @@
       <div id="ocrResult" class="ocr-result" style="display:none;"></div>
       <!-- OCR GPS badge -->
       <div id="ocrGpsBadge" class="gps-badge ok" style="display:none; margin-bottom:8px;"></div>
-      <!-- Quick create from OCR -->
-      <div id="ocrCreateCard" class="card" style="display:none;">
-        <div class="card-title">Create from OCR</div>
-        <input id="ocrMachineId" type="text" class="input-field" placeholder="Machine ID" readonly>
-        <input id="ocrName" type="text" class="input-field" placeholder="Asset name *" required>
-        <select id="ocrCatSelect" class="input-field">
-          <option value="">Category</option>
-        </select>
-        <select id="ocrStatus" class="input-field">
-          <option value="active">Active</option>
-          <option value="maintenance">Maintenance</option>
-          <option value="retired">Retired</option>
-        </select>
-        <button class="btn btn-primary" onclick="createOcrAsset()">Create Asset</button>
-      </div>
-    </div>
-
-    <!-- ── MANUAL MODE ───────────────────────────────────────────────── -->
-    <div id="addManualMode" class="add-mode">
-      <div class="card">
-        <div class="card-title">Manual Entry</div>
-
-        <!-- Basic Info -->
-        <input id="manMachineId" type="text" class="input-field" placeholder="Machine ID *" required>
-        <input id="manSerialNumber" type="text" class="input-field" placeholder="Serial Number">
-        <input id="manName" type="text" class="input-field" placeholder="Asset Name *" required>
-        <textarea id="manDescription" class="input-field" placeholder="Telemetry ID" rows="2"></textarea>
-
-        <div class="form-row" style="margin-bottom:8px;">
-          <select id="manCatSelect" class="input-field">
-            <option value="">Category</option>
-          </select>
-          <select id="manMake" class="input-field" onchange="loadModels()">
-            <option value="">Make</option>
-          </select>
-        </div>
-        <select id="manModel" class="input-field" style="margin-bottom:8px;">
-          <option value="">Model</option>
-        </select>
-        <select id="manStatus" class="input-field" style="margin-bottom:0;">
-          <option value="active">Active</option>
-          <option value="inactive">Inactive</option>
-          <option value="maintenance">Maintenance</option>
-          <option value="retired">Retired</option>
-        </select>
-      </div>
-
-      <!-- Directions -->
-      <div class="form-section">
-        <div class="form-section-title">📍 Directions &amp; Access</div>
-        <input id="manAddress" type="text" class="input-field" placeholder="Address / Trailer Number">
-        <div class="form-row">
-          <input id="manBuildingName" type="text" class="input-field" placeholder="Building Name">
-          <input id="manBuildingNumber" type="text" class="input-field" placeholder="Building #" oninput="document.getElementById('manAddress').value = this.value">
-        </div>
-        <div class="form-row">
-          <input id="manFloor" type="text" class="input-field" placeholder="Floor">
-          <input id="manRoom" type="text" class="input-field" placeholder="Room">
-        </div>
-        <textarea id="manWalkingDirections" class="input-field" placeholder="Walking directions..." rows="2"></textarea>
-        <div class="form-row">
-          <input id="manMapLink" type="url" class="input-field" placeholder="Map link (URL)">
-          <button class="btn btn-outline btn-sm" onclick="openMapPin()" style="flex-shrink:0;">📍 Pin</button>
-        </div>
-        <div class="form-row">
-          <input id="manParkingLocation" type="text" class="input-field" placeholder="Parking location">
-          <button class="btn btn-outline btn-sm" onclick="fillGpsParking('manParkingLocation')" style="flex-shrink:0;">📍 GPS</button>
-        </div>
-      </div>
-
-      <!-- Keys -->
-      <div class="form-section">
-        <div class="form-section-title">
-          🔑 Keys
-          <button class="btn btn-outline btn-sm" onclick="addKeyEntry()">+ Add Key</button>
-        </div>
-        <div id="manKeysList"></div>
-      </div>
-
-      <!-- Security Badges -->
-      <div class="form-section">
-        <div class="form-section-title">🪪 Security Badges</div>
-        <div class="badge-checklist" id="manBadgesList"></div>
-      </div>
-
-      <!-- Customer & Location -->
-      <div class="form-section">
-        <div class="form-section-title">🏢 Customer &amp; Location</div>
-        <select id="manCustomer" class="input-field" onchange="loadManualLocations()">
-          <option value="">Customer</option>
-        </select>
-        <select id="manLocation" class="input-field" style="margin-bottom:0;">
-          <option value="">Location</option>
-        </select>
-      </div>
-
-      <!-- Photo -->
-      <div class="form-section">
-        <div class="form-section-title">📸 Photo (optional)</div>
-        <div id="manPhotoArea" class="camera-area" style="aspect-ratio:4/3;margin-bottom:8px;overflow:visible;">
-          <div id="manPhotoPlaceholder" class="camera-placeholder">
-            <div style="display:flex;flex-direction:column;gap:10px;align-items:center;">
-              <button class="btn btn-outline" onclick="document.getElementById('manPhotoInput').click()" style="width:100%;padding:14px;font-size:15px;">📁 Choose from Gallery</button>
-              <div style="font-size:11px;color:var(--text2);">(preserves EXIF/GPS)</div>
-              <div style="width:80%;height:1px;background:var(--border);margin:4px 0;"></div>
-              <button class="btn btn-outline" onclick="openManualCamera()" style="width:100%;padding:14px;font-size:15px;">📸 Take Photo</button>
-              <div style="font-size:11px;color:var(--text2);">(quick capture, no EXIF)</div>
-            </div>
-          </div>
-          <input type="file" id="manPhotoInput" accept="image/*" style="display:none;" onchange="handleManualPhotoFile(event)">
-        </div>
-        <div id="manPhotoCaptureRow" style="display:none;justify-content:center;margin-bottom:8px;">
-          <button class="ocr-capture-btn" onclick="openManualCamera()" title="Capture" style="position:static;width:48px;height:48px;font-size:18px;">📸</button>
-        </div>
-        <img id="manPhotoPreview" style="display:none;width:100%;border-radius:var(--radius-sm);">
-        <button id="manPhotoRetake" class="btn btn-outline btn-sm" style="display:none;margin-top:6px;width:100%;" onclick="retakeManualPhoto()">🔄 Retake</button>
-      </div>
-
-      <!-- Submit -->
-      <div class="form-row" style="margin-bottom:10px;">
-        <button class="btn btn-primary" onclick="submitManualAsset(false)" style="flex:2;" title="Save this asset to the database">Create Asset</button>
-        <button class="btn btn-outline" onclick="submitManualAsset(true)" style="flex:1;" title="Save and clear form to add another">+ Add Another</button>
-      </div>
-
-      <!-- Post-create check-in -->
-      <div id="manCheckinCard" class="card" style="display:none;">
-        <div class="card-title">Quick Check-in</div>
-        <textarea id="manCheckinNotes" class="input-field" placeholder="Notes (optional)" rows="2"></textarea>
-        <button class="btn btn-green" onclick="quickCheckinManual()" style="width:100%;">✓ Check In Now</button>
-      </div>
-    </div>  </div>
-
-    <!-- ── Photo Preview Card (shown when a photo is picked from gallery) ── -->
-    <div id="photoPreviewCard" class="photo-preview-card" style="display:none;">
-      <img id="pickedPhotoPreview" src="" alt="Picked photo">
-      <div class="photo-preview-toolbar">
-        <button onclick="ocrPickedPhoto()">🔍 OCR this photo</button>
-        <button onclick="extractGpsFromPicked()">📍 Extract GPS</button>
-        <button onclick="createAssetFromPicked()">➕ Create Asset</button>
-      </div>
-      <div class="exif-data" id="pickedExifData" style="display:none;"></div>
-      <button class="btn btn-outline btn-sm" style="margin-top:8px;width:100%;" onclick="clearPickedPhoto()">✕ Clear</button>
     </div>
+    <!-- ── PHOTO BADGE ── -->
+    <div id="ocrGpsBadge" class="gps-badge ok" style="display:none; margin-bottom:8px;"></div>
+  </div>
 
   <!-- ═══════════════════════════════════════════════════════════════════════
        TAB: ASSETS LIST
@@ -1370,7 +1187,6 @@
         <button class="filter-toggle" id="filterToggle" onclick="toggleFilterPanel()" title="Toggle filter panel">
           🎯 Filters <span id="filterCount" class="ft-count" style="display:none;">0</span>
         </button>
-        <button class="btn btn-outline btn-sm import-btn" onclick="showImportView()" style="margin-left:auto;" title="Import assets from a CSV file">📥 Import</button>
       </div>
       <!-- Filter panel (collapsible) -->
       <div class="filter-panel" id="filterPanel">
@@ -1544,31 +1360,6 @@
       </div>
     </div>
 
-    <!-- ── Import View ──────────────────────────────────────────────────── -->
-    <div id="assetsImportView" style="display:none;">
-      <div class="detail-header">
-        <button class="back-btn" onclick="showAssetList()" title="Go back to asset list">←</button>
-        <div style="font-size:18px;font-weight:700;">Import Assets</div>
-      </div>
-      <div class="card">
-        <div class="card-title">CSV File</div>
-        <p style="font-size:13px;color:var(--text2);margin-bottom:10px;">
-          Upload a CSV file with columns: machine_id, name, category, make, model, serial_number, customer, location
-        </p>
-        <input type="file" id="importFileInput" accept=".csv" class="input-field" style="margin-bottom:12px;">
-        <div id="importPreview" style="display:none;margin-bottom:12px;">
-          <div style="font-size:12px;color:var(--text2);margin-bottom:4px;" id="importRowCount"></div>
-          <div class="import-table-wrap">
-            <table class="import-table" id="importTable"><thead></thead><tbody></tbody></table>
-          </div>
-        </div>
-        <div id="importResults" style="display:none;"></div>
-        <div style="display:flex;gap:8px;">
-          <button class="btn btn-outline btn-sm" onclick="showAssetList()" style="flex:1;">Cancel</button>
-          <button class="btn btn-primary btn-sm" id="importRunBtn" onclick="runImport()" style="flex:2;" disabled>Start Import</button>
-        </div>
-      </div>
-    </div>
   </div>
 
   <!-- ═══════════════════════════════════════════════════════════════════════
@@ -1606,6 +1397,10 @@
       </div>
     </div>
     <div id="navMapContainer" style="height:280px;border-radius:12px;overflow:hidden;margin-bottom:12px;"></div>
+    <div style="display:flex;gap:6px;margin-bottom:8px;flex-wrap:wrap;">
+      <button class="btn btn-sm btn-outline" onclick="navigateToAsset('driving')" style="flex:1;">🚗 Driving</button>
+      <button class="btn btn-sm btn-outline" onclick="navigateToAsset('walking')" style="flex:1;">🚶 Walking</button>
+    </div>
     <div class="card" id="navInfoCard" style="display:none;">
       <div class="card-title">📏 Route Info</div>
       <div style="display:flex;gap:12px;flex-wrap:wrap;">
@@ -1621,6 +1416,10 @@
           <div style="font-size:11px;color:var(--text3);">From You</div>
           <div id="navBearing" style="font-size:20px;font-weight:700;">—</div>
         </div>
+        <div style="flex:1;min-width:100px;">
+          <div style="font-size:11px;color:var(--text3);">Est. Time</div>
+          <div id="navDuration" style="font-size:20px;font-weight:700;"></div>
+        </div>
       </div>
     </div>
     <div id="navDirectionsCard" class="card" style="display:none;">
@@ -1756,8 +1555,8 @@
        BOTTOM TABS
        ═══════════════════════════════════════════════════════════════════════ -->
   <div class="tabs">
-    <button class="tab-btn active" data-tab="tabAddAsset" onclick="switchTab('tabAddAsset')" title="Scan or manually add an asset">
-      <span class="tab-icon">📷</span> Add / Find Asset
+    <button class="tab-btn active" data-tab="tabAddAsset" onclick="switchTab('tabAddAsset')" title="Scan barcode or OCR to find an asset">
+      <span class="tab-icon">📷</span> Find Asset
     </button>
     <button class="tab-btn" data-tab="tabAssets" onclick="switchTab('tabAssets')" title="Browse and search your assets">
       <span class="tab-icon">📦</span> Assets
@@ -1966,8 +1765,6 @@
           AppState.currentUser = user;
           // Load settings now that we're authenticated
           loadSettingsCache().then(() => {
-            populateCategorySelect('newCatSelect');
-            populateCategorySelect('ocrCatSelect');
             populateCategorySelect('manCatSelect');
             populateMakeSelect();
             populateCustomerSelect();
@@ -2303,31 +2100,6 @@
           });
           L.tileLayer(tileUrl, { attribution: tileAttr, maxZoom: 19 }).addTo(map);
 
-          // Geofence drawing — only if L.Draw loaded
-          if (typeof L.Draw !== 'undefined') {
-            const drawnItems = new L.FeatureGroup();
-            map.addLayer(drawnItems);
-            const drawControl = new L.Control.Draw({
-              edit: { featureGroup: drawnItems },
-              draw: {
-                polygon: { shapeOptions: { color: '#c2410c' }, allowIntersection: false, showArea: false,
-                  tooltips: { start: 'Tap to start drawing area', cont: 'Tap to continue', end: 'Tap first point to close' } },
-                polyline: false,
-                rectangle: { shapeOptions: { color: '#c2410c' },
-                  tooltips: { start: 'Tap & drag to draw box', end: '' } },
-                circle: { shapeOptions: { color: '#c2410c' },
-                  tooltips: { start: 'Tap & drag to draw circle', end: '' } },
-                marker: false,
-                circlemarker: false
-              }
-            });
-            map.addControl(drawControl);
-            map.on(L.Draw.Event.CREATED, function(e) {
-              drawnItems.addLayer(e.layer);
-              // Dispatch event for any external hooks
-              document.dispatchEvent(new CustomEvent('geofenceDrawn', { detail: { layer: e.layerType, coords: e.layer.toGeoJSON() } }));
-            });
-          }
           // Draw Disney park outlines on first map init
           if (parkOutlinesVisible) drawParkOutlines();
           // Restore heatmap layer if it was active
@@ -2441,178 +2213,6 @@
       }
     }
 
-    // ── Photo Picker / Gallery ────────────────────────────────────────────────
-    let pickedPhotoFile = null;
-
-    // Wire the hidden file input
-    (function() {
-      const pp = document.getElementById('photoPicker');
-      if (pp) {
-        pp.addEventListener('change', function(e) {
-          if (e.target.files && e.target.files[0]) {
-            handlePickedPhoto(e.target.files[0]);
-          }
-        });
-      }
-    })();
-
-    async function handlePickedPhoto(file) {
-      pickedPhotoFile = file;
-      const reader = new FileReader();
-      reader.onload = async function(e) {
-        document.getElementById('pickedPhotoPreview').src = e.target.result;
-        document.getElementById('photoPreviewCard').style.display = 'block';
-
-        // Extract EXIF / file metadata
-        await extractExifData(file);
-
-        // Auto-extract GPS from the picked photo
-        tryExtractGpsFromPicked();
-
-        // Scroll to preview
-        document.getElementById('photoPreviewCard').scrollIntoView({ behavior: 'smooth' });
-      };
-      reader.readAsDataURL(file);
-    }
-
-    async function extractExifData(file) {
-      const exifDiv = document.getElementById('pickedExifData');
-      const rows = [];
-      rows.push({ label: '📄 File name', value: file.name });
-      rows.push({ label: '📦 File size', value: formatFileSize(file.size) });
-      rows.push({ label: '🏷️ Type', value: file.type || 'unknown' });
-      rows.push({ label: '🕐 Modified', value: formatDate(new Date(file.lastModified).toISOString()) });
-
-      // Try to read actual EXIF tags from the file
-      try {
-        const exifData = await exifr.parse(file);
-        if (exifData) {
-          if (exifData.Make || exifData.Model) {
-            rows.push({ label: '📷 Camera', value: [exifData.Make, exifData.Model].filter(Boolean).join(' ') });
-          }
-          if (exifData.DateTimeOriginal) {
-            const d = new Date(exifData.DateTimeOriginal);
-            rows.push({ label: '📅 Date taken', value: d.toLocaleString() });
-          }
-          if (exifData.ISO) {
-            rows.push({ label: '🎯 ISO', value: String(exifData.ISO) });
-          }
-          if (exifData.FNumber) {
-            rows.push({ label: '🔆 Aperture', value: 'f/' + exifData.FNumber });
-          }
-          if (exifData.ExposureTime) {
-            rows.push({ label: '⏱️ Shutter', value: exifData.ExposureTime + 's' });
-          }
-          if (exifData.FocalLength) {
-            rows.push({ label: '🔭 Focal', value: exifData.FocalLength + 'mm' });
-          }
-          if (exifData.GPSLatitude && exifData.GPSLongitude) {
-            const lat = exifData.latitude || exifData.GPSLatitude;
-            const lng = exifData.longitude || exifData.GPSLongitude;
-            rows.push({ label: '📍 GPS', value: typeof lat === 'number' ? `${lat.toFixed(6)}, ${lng.toFixed(6)}` : `${exifData.GPSLatitude.join(' ')} ${exifData.GPSLatitudeRef}, ${exifData.GPSLongitude.join(' ')} ${exifData.GPSLongitudeRef}` });
-          }
-        }
-      } catch (_) { /* EXIF display is best-effort */ }
-
-      exifDiv.innerHTML = rows.map(r =>
-        `<div class="exif-row"><span class="exif-label">${esc(r.label)}</span><span class="exif-value">${esc(r.value)}</span></div>`
-      ).join('');
-      exifDiv.style.display = 'block';
-    }
-
-    function formatFileSize(bytes) {
-      if (bytes < 1024) return bytes + ' B';
-      if (bytes < 1048576) return (bytes / 1024).toFixed(1) + ' KB';
-      return (bytes / 1048576).toFixed(1) + ' MB';
-    }
-
-    async function ocrPickedPhoto() {
-      if (!pickedPhotoFile) return;
-      // Switch to OCR mode
-      setAddAssetMode('ocr');
-
-      // Read EXIF data from the picked photo (defense against transport stripping)
-      let exifDataStr = null;
-      try {
-        const exifData = await exifr.parse(pickedPhotoFile);
-        if (exifData && Object.keys(exifData).length > 0) {
-          exifDataStr = JSON.stringify(exifData);
-        }
-      } catch (_) { /* EXIF is best-effort */ }
-
-      // Build form data with file + EXIF
-      const fd = new FormData();
-      fd.append('file', pickedPhotoFile, pickedPhotoFile.name || 'photo.jpg');
-      if (exifDataStr) {
-        fd.append('exif_data', exifDataStr);
-      }
-
-      setOcrStatus('Processing OCR...', 'working');
-      document.getElementById('ocrResult').style.display = 'none';
-      document.getElementById('ocrCreateCard').style.display = 'none';
-
-      let data = null;
-      try {
-        const res = await fetch('/api/ocr', {
-          method: 'POST',
-          body: fd,
-          headers: AppState.authToken
-            ? { 'Authorization': 'Bearer ' + AppState.authToken }
-            : {},
-        });
-        if (res.ok) {
-          data = await res.json();
-          data.method = 'server';
-        } else {
-          throw new Error('Server returned ' + res.status);
-        }
-      } catch (e) {
-        setOcrStatus('Server OCR failed: ' + e.message, 'error');
-        return;
-      }
-
-      displayOcrResult(data);
-    }
-
-    async function createAssetFromPicked() {
-      if (!pickedPhotoFile) return;
-      // Switch to Manual mode and pass the original file (preserves EXIF)
-      setAddAssetMode('manual');
-
-      // Pass the original File directly — preserves EXIF for server re-embed
-      manualPhotoFile = pickedPhotoFile;
-      manualPhotoBlob = pickedPhotoFile;  // Use original file (preserves EXIF)
-
-      // Show the photo in the manual preview using FileReader
-      const reader = new FileReader();
-      reader.onload = function(e) {
-        const img = document.getElementById('manPhotoPreview');
-        img.src = e.target.result;
-        img.style.display = 'block';
-        const ph = document.getElementById('manPhotoPlaceholder');
-        if (ph) ph.style.display = 'none';
-        const retake = document.getElementById('manPhotoRetake');
-        if (retake) retake.style.display = 'block';
-      };
-      reader.readAsDataURL(pickedPhotoFile);
-
-      // Try EXIF GPS from the original file
-      manualPhotoGps = await extractGpsFromPhoto(pickedPhotoFile);
-      if (manualPhotoGps) {
-        const coords = manualPhotoGps.lat.toFixed(6) + ', ' + manualPhotoGps.lng.toFixed(6);
-        const parkingEl = document.getElementById('manParkingLocation');
-        if (parkingEl && !parkingEl.value.trim()) {
-          parkingEl.value = coords;
-        }
-        const mapLinkEl = document.getElementById('manMapLink');
-        if (mapLinkEl && !mapLinkEl.value.trim()) {
-          mapLinkEl.value = `https://www.openstreetmap.org/?mlat=${manualPhotoGps.lat}&mlon=${manualPhotoGps.lng}&zoom=17`;
-        }
-      }
-
-      showToast('Photo loaded into Manual mode');
-    }
-
     // ── Shared: Load settings dropdowns (hardcoded defaults — managed via admin app) ──
     async function loadSettingsCache() {
       if (settingsCache._loaded) return;
@@ -2863,7 +2463,6 @@
 
       setScanStatus(`Scanned: ${machineId} — looking up...`, 'working');
       document.getElementById('scanResult').style.display = 'none';
-      document.getElementById('newAssetCard').style.display = 'none';
       document.getElementById('checkinCard').style.display = 'none';
 
       try {
@@ -2942,23 +2541,17 @@
 
     function showNewAssetForm(machineId) {
       currentScannedMachineId = machineId;
-      switchTab('tabAddAsset');
-      // Defer status update so it runs after async startScanning completes
-      setTimeout(() => {
-        setScanStatus('Machine ID not in database — create asset below', 'error');
-      }, 50);
-
-
-      document.getElementById('newMachineId').value = machineId;
-      document.getElementById('newName').value = '';
-      document.getElementById('newDesc').value = '';
-      populateCategorySelect('newCatSelect');
-      document.getElementById('newCatSelect').value = '';
-      document.getElementById('newStatus').value = 'active';
-      document.getElementById('newAssetCard').style.display = 'block';
-      document.getElementById('checkinCard').style.display = 'none';
-      document.getElementById('scanResult').style.display = 'none';
-      document.getElementById('newName').focus();
+      setScanStatus(`Machine ID ${machineId} not found in database`, 'error');
+      const el = document.getElementById('scanResult');
+      el.style.display = 'block';
+      el.innerHTML = `
+        <div style="font-size:14px;font-weight:600;color:var(--amber);">❌ Asset not found</div>
+        <div style="font-size:12px;color:var(--text2);margin-top:4px;">
+          Machine ID <strong>${esc(machineId)}</strong> is not registered.
+        </div>
+        <div style="font-size:12px;color:var(--text3);margin-top:8px;">
+          Try OCR scanning the sticker, or search in the Assets tab.
+        </div>`;
     }
 
     function showCheckinForm() {
@@ -3016,43 +2609,6 @@
       );
     }
 
-    async function createScannedAsset() {
-      const machineId = document.getElementById('newMachineId').value.trim();
-      const name = document.getElementById('newName').value.trim();
-      if (!machineId || !name) {
-        showToast('Machine ID and name are required', true);
-        return;
-      }
-      const payload = {
-        machine_id: machineId, name,
-        description: document.getElementById('newDesc').value.trim(),
-        category: document.getElementById('newCatSelect').value || 'Other',
-        status: document.getElementById('newStatus').value,
-      };
-      // F2: Auto-populate address from GPS
-      if (AppState.gpsLat) {
-        const geo = await reverseGeocode(AppState.gpsLat, AppState.gpsLng);
-        if (geo) {
-          payload.address = geo.address || geo.formatted || '';
-          payload.building_number = geo.building_number || '';
-          payload.building_name = geo.building_name || '';
-          payload.trailer_number = geo.building_number || '';  // F4
-        }
-      }
-      try {
-        const asset = await api('/api/assets', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(payload),
-        });
-        showToast('Asset created!');
-        document.getElementById('newAssetCard').style.display = 'none';
-        AppState.currentAssetId = asset.id;
-        showScannedAsset(asset);
-      } catch (e) {
-        showToast(e.message, true);
-      }
-    }
 
     async function submitCheckin() {
       if (!AppState.currentAssetId) {
@@ -3201,16 +2757,12 @@
         el.innerHTML = `
           <div class="or-id">${esc(data.machine_id)}${methodBadge}</div>
           <div class="or-meta">${confLabel}</div>
-          ${data.raw_text ? `<div class="or-raw">OCR text: ${esc(data.raw_text)}</div>` : ''}`;
-        setOcrStatus('Machine ID found!', 'success');
+          ${data.raw_text ? `<div class="or-raw">OCR text: ${esc(data.raw_text)}</div>` : ''}
+          <div class="or-searching" style="margin-top:8px;font-size:13px;color:var(--text2);">🔍 Searching for asset...</div>`;
+        setOcrStatus('Machine ID found! Searching...', 'working');
 
-        // Show quick create form
-        document.getElementById('ocrMachineId').value = data.machine_id;
-        document.getElementById('ocrName').value = '';
-        populateCategorySelect('ocrCatSelect');
-        document.getElementById('ocrStatus').value = 'active';
-        document.getElementById('ocrCreateCard').style.display = 'block';
-        document.getElementById('ocrName').focus();
+        // Auto-search the asset
+        lookupOcrAsset(data.machine_id);
       } else {
         el.innerHTML = `
           <div style="font-size:16px;font-weight:600;color:var(--red);">No machine ID detected</div>
@@ -3232,6 +2784,40 @@
       }
     }
 
+    // ── OCR: Auto-search asset by machine_id ─────────────────────────────
+    async function lookupOcrAsset(machineId) {
+      try {
+        const asset = await api('/api/assets/search?machine_id=' + encodeURIComponent(machineId));
+        // Asset found — update OCR result with asset info
+        const el = document.getElementById('ocrResult');
+        el.innerHTML = `
+          <div class="or-id">${esc(asset.machine_id)} ✅</div>
+          <div class="sr-name" style="font-size:16px;font-weight:700;margin:4px 0;">${esc(asset.name)}</div>
+          <div class="or-meta">${esc(catLabel(asset.category))} · ${esc(asset.status)}</div>`;
+        setOcrStatus('Asset found!', 'success');
+
+        // Auto-checkin if GPS available
+        AppState.currentAssetId = asset.id;
+        if (AppState.gpsLat != null) {
+          doAutoCheckin(asset.id);
+          el.innerHTML += `<div style="margin-top:8px;font-size:12px;color:var(--green);">✓ Auto check-in recorded</div>`;
+        }
+        el.innerHTML += `<div style="margin-top:8px;">
+          <button class="btn btn-outline btn-sm" onclick="switchTab('tabAssets');viewAsset(${asset.id});" style="width:100%;">View Details</button>
+        </div>`;
+      } catch (e) {
+        if (e.message === 'Asset not found' || e.message.includes('404')) {
+          const el = document.getElementById('ocrResult');
+          el.innerHTML = `
+            <div class="or-id">${esc(machineId)} ❌</div>
+            <div class="or-meta" style="color:var(--amber);">Machine ID not found in database</div>`;
+          setOcrStatus('Asset not found — try scanning the barcode instead', 'error');
+        } else {
+          setOcrStatus('Lookup error: ' + e.message, 'error');
+        }
+      }
+    }
+
     async function ocrImageClient(imageBlob) {
       // Timeout race — 30s max for client-side Tesseract.js
       const ocrPromise = Tesseract.recognize(imageBlob, 'eng', {
@@ -3275,7 +2861,6 @@
 
       setOcrStatus('Processing OCR...', 'working');
       document.getElementById('ocrResult').style.display = 'none';
-      document.getElementById('ocrCreateCard').style.display = 'none';
 
       let data = null;
       let method = 'server';
@@ -3327,52 +2912,6 @@
       displayOcrResult(data);
     }
 
-    async function createOcrAsset() {
-      const machineId = document.getElementById('ocrMachineId').value.trim();
-      const name = document.getElementById('ocrName').value.trim();
-      if (!machineId || !name) {
-        showToast('Machine ID and name are required', true);
-        return;
-      }
-      const payload = {
-        machine_id: machineId, name,
-        category: document.getElementById('ocrCatSelect').value || 'Other',
-        status: document.getElementById('ocrStatus').value,
-      };
-      // F2: Auto-populate address from GPS
-      if (AppState.gpsLat) {
-        const geo = await reverseGeocode(AppState.gpsLat, AppState.gpsLng);
-        if (geo) {
-          payload.address = geo.address || geo.formatted || '';
-          payload.building_number = geo.building_number || '';
-          payload.building_name = geo.building_name || '';
-          payload.trailer_number = geo.building_number || '';
-        }
-      }
-      try {
-        const asset = await api('/api/assets', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(payload),
-        });
-        showToast('Asset created!');
-        document.getElementById('ocrCreateCard').style.display = 'none';
-        document.getElementById('ocrResult').style.display = 'none';
-        setOcrStatus('Ready — take another photo', 'success');
-        AppState.currentAssetId = asset.id;
-        doAutoCheckin(asset.id);
-        showCheckinForm();
-      } catch (e) {
-        showToast(e.message, true);
-      }
-    }
-
-    // ═══════════════════════════════════════════════════════════════════════
-    // MANUAL MODE — Photo
-    // ═══════════════════════════════════════════════════════════════════════
-    let manualPhotoFile = null;
-    manualPhotoBlob = null;    // reuse existing declaration
-    let manualPhotoGps = null;
 
     function openManualCamera() {
       // Camera shortcut — EXIF won't survive but quick for field use
@@ -3436,141 +2975,6 @@
     // ═══════════════════════════════════════════════════════════════════════
     // MANUAL MODE — Submit
     // ═══════════════════════════════════════════════════════════════════════
-    async function submitManualAsset(addAnother) {
-      // Disable buttons to prevent double-click
-      var submitBtns = document.querySelectorAll('#assetsAddView .btn-primary, #assetsAddView .btn-outline');
-      submitBtns.forEach(function(b) { b.disabled = true; b.style.opacity = '0.6'; });
-
-      const machineId = document.getElementById('manMachineId').value.trim();
-      const name = document.getElementById('manName').value.trim();
-      if (!machineId || !name) {
-        showToast('Machine ID and Asset Name are required', true);
-        submitBtns.forEach(function(b) { b.disabled = false; b.style.opacity = ''; });
-        return;
-      }
-
-      let photoPath = null;
-      if (manualPhotoFile) {
-        try {
-          const fd = new FormData();
-          // Read EXIF before upload (defense against transport stripping)
-          try {
-            const exifData = await exifr.parse(manualPhotoFile);
-            if (exifData && Object.keys(exifData).length > 0) {
-              fd.append('exif_data', JSON.stringify(exifData));
-            }
-          } catch (_) { /* EXIF extraction is best-effort */ }
-          fd.append('file', manualPhotoFile, manualPhotoFile.name || 'photo.jpg');
-          const upData = await api('/api/upload/photo', { method: 'POST', body: fd });
-          photoPath = upData.path;
-          // Use server-extracted GPS from raw bytes (bypasses client-side EXIF stripping)
-          if (upData.exif_gps) {
-            const coords = upData.exif_gps.lat.toFixed(6) + ', ' + upData.exif_gps.lng.toFixed(6);
-            if (!document.getElementById('manParkingLocation').value.trim()) {
-              document.getElementById('manParkingLocation').value = coords;
-            }
-            if (!document.getElementById('manMapLink').value.trim()) {
-              document.getElementById('manMapLink').value = `https://www.openstreetmap.org/?mlat=${upData.exif_gps.lat}&mlon=${upData.exif_gps.lng}&zoom=17`;
-            }
-            showToast('📍 GPS extracted from photo!');
-          }
-        } catch (e) { /* photo upload failed, continue without */ }
-      }
-
-      const makeId = document.getElementById('manMake').value;
-      const modelId = document.getElementById('manModel').value;
-      const makeName = makeId ? (settingsCache.makes.find(m => m.id == makeId) || {}).name || '' : '';
-      const modelName = modelId ? (settingsCache.models.find(m => m.id == modelId) || {}).name || '' : '';
-
-      // F2: Auto-populate address from GPS (only if address field is empty)
-      if (AppState.gpsLat && !document.getElementById('manAddress').value.trim()) {
-        const geo = await reverseGeocode(AppState.gpsLat, AppState.gpsLng);
-        if (geo) {
-          if (!document.getElementById('manAddress').value.trim()) {
-            document.getElementById('manAddress').value = geo.address || geo.formatted || '';
-            document.getElementById('manBuildingNumber').value = geo.building_number || '';
-            document.getElementById('manBuildingName').value = geo.building_name || '';
-          }
-        }
-      }
-
-      const payload = {
-        machine_id: machineId,
-        name: name,
-        serial_number: document.getElementById('manSerialNumber').value.trim(),
-        description: document.getElementById('manDescription').value.trim(),
-        category: document.getElementById('manCatSelect').value || 'Other',
-        make: makeName,
-        model: modelName,
-        status: document.getElementById('manStatus').value,
-        address: document.getElementById('manAddress').value.trim(),
-        building_name: document.getElementById('manBuildingName').value.trim(),
-        building_number: document.getElementById('manBuildingNumber').value.trim(),
-        floor: document.getElementById('manFloor').value.trim(),
-        room: document.getElementById('manRoom').value.trim(),
-        trailer_number: document.getElementById('manAddress').value.trim(),
-        walking_directions: document.getElementById('manWalkingDirections').value.trim(),
-        map_link: document.getElementById('manMapLink').value.trim(),
-        parking_location: document.getElementById('manParkingLocation').value.trim(),
-        customer_id: parseInt(document.getElementById('manCustomer').value) || null,
-        location_id: parseInt(document.getElementById('manLocation').value) || null,
-        keys: getKeysData(),
-        badges: getCheckedBadges(),
-      };
-      if (photoPath) payload.photo_path = photoPath;
-
-      try {
-        const asset = await api('/api/assets', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(payload),
-        });
-        showToast('Asset created!');
-        AppState.currentAssetId = asset.id;
-        doAutoCheckin(asset.id);
-
-        if (addAnother) {
-          // Clear form
-          document.getElementById('manMachineId').value = '';
-          document.getElementById('manSerialNumber').value = '';
-          document.getElementById('manName').value = '';
-          document.getElementById('manDescription').value = '';
-          document.getElementById('manCatSelect').value = '';
-          document.getElementById('manMake').value = '';
-          document.getElementById('manModel').value = '';
-          document.getElementById('manStatus').value = 'active';
-          document.getElementById('manAddress').value = '';
-          document.getElementById('manBuildingName').value = '';
-          document.getElementById('manBuildingNumber').value = '';
-          document.getElementById('manFloor').value = '';
-          document.getElementById('manRoom').value = '';
-          document.getElementById('manWalkingDirections').value = '';
-          document.getElementById('manMapLink').value = '';
-          document.getElementById('manParkingLocation').value = '';
-          document.getElementById('manCustomer').value = '';
-          document.getElementById('manLocation').value = '';
-          // Reset keys
-          document.getElementById('manKeysList').innerHTML = '';
-          // Reset badges
-          document.querySelectorAll('#manBadgesList .badge-check-item').forEach(b => b.classList.remove('checked'));
-          // Reset photo
-          manualPhotoBlob = null;
-          document.getElementById('manPhotoPreview').style.display = 'none';
-          document.getElementById('manPhotoRetake').style.display = 'none';
-          document.getElementById('manMachineId').focus();
-        } else {
-          // Show check-in card
-          document.getElementById('manCheckinCard').style.display = 'block';
-          document.getElementById('manCheckinNotes').focus();
-          document.getElementById('manCheckinCard').scrollIntoView({ behavior: 'smooth' });
-        }
-      } catch (e) {
-        showToast(e.message, true);
-      } finally {
-        var submitBtns = document.querySelectorAll('#assetsAddView .btn-primary, #assetsAddView .btn-outline');
-        submitBtns.forEach(function(b) { b.disabled = false; b.style.opacity = ''; });
-      }
-    }
 
     async function quickCheckinManual() {
       if (!AppState.currentAssetId) {
@@ -4251,7 +3655,7 @@
 
     // ── View switching ────────────────────────────────────────────────────
     function hideAllAssetViews() {
-      ['assetsListView','assetsDetailView','assetsEditView','assetsImportView'].forEach(id => {
+      ['assetsListView','assetsDetailView','assetsEditView'].forEach(id => {
         const el = document.getElementById(id);
         if (el) el.style.display = 'none';
       });
@@ -4273,14 +3677,6 @@
       document.getElementById('assetsEditView').style.display = 'block';
     }
 
-    function showImportView() {
-      hideAllAssetViews();
-      document.getElementById('assetsImportView').style.display = 'block';
-      // Reset import state
-      document.getElementById('importFileInput').value = '';
-      document.getElementById('importPreview').style.display = 'none';
-      document.getElementById('importResults').style.display = 'none';
-      document.getElementById('importRunBtn').disabled = true;
     }
 
     // ── Detail view ───────────────────────────────────────────────────────
@@ -4442,7 +3838,8 @@
       }).catch(() => {});
     }
 
-    async function navigateToAsset() {
+    async function navigateToAsset(mode) {
+      mode = mode || 'driving';
       if (!AppState.currentAssetId) return;
       if (!AppState.gpsLat || !AppState.gpsLng) {
         showToast('GPS location not available. Tap ◎ My Location first.', true);
@@ -4450,7 +3847,28 @@
       }
       try {
         const nav = await api('/api/assets/' + AppState.currentAssetId +
-          '/navigation?lat=' + AppState.gpsLat + '&lng=' + AppState.gpsLng);
+          '/navigation?lat=' + AppState.gpsLat + '&lng=' + AppState.gpsLng + '&mode=' + mode);
+
+        // If OSRM route_coords are available, fetch OSRM route for this mode
+        if (nav.asset_lat && nav.asset_lng) {
+          try {
+            const osrmProfile = mode === 'walking' ? 'foot' : 'driving';
+            const osrmUrl = 'https://router.project-osrm.org/route/v1/' + osrmProfile +
+              '/' + AppState.gpsLng + ',' + AppState.gpsLat +
+              ';' + nav.asset_lng + ',' + nav.asset_lat +
+              '?overview=full&geometries=geojson&steps=true&alternatives=false';
+            const osrmResp = await fetch(osrmUrl);
+            const osrmData = await osrmResp.json();
+            if (osrmData && osrmData.routes && osrmData.routes[0]) {
+              const route = osrmData.routes[0];
+              nav.route_coords = route.geometry.coordinates.map(c => [c[1], c[0]]);
+              nav.route_duration_s = route.duration;
+              nav._osrm_route = route;
+            }
+          } catch (osrmErr) {
+            console.warn('OSRM route fetch failed, using straight line:', osrmErr);
+          }
+        }
 
         // Store nav data for dedicated page
         AppState._navData = nav;
@@ -4516,13 +3934,23 @@
           destMarker.bindPopup('<div style="min-width:140px;"><b>' + esc(nav.asset_name) + '</b><br><span style="font-size:11px;color:var(--text2);">📍 ' + esc(nav.asset_address) + '</span></div>');
         }
 
-        // Route line
-        L.polyline([[nav.origin_lat, nav.origin_lng], [nav.asset_lat, nav.asset_lng]], {
-          color: '#5b6ef7', weight: 4, opacity: 0.8, dashArray: '10, 6',
-        }).addTo(navMap);
+        // Route line — use OSRM route_coords if available, else straight line
+        if (nav.route_coords && nav.route_coords.length > 1) {
+          L.polyline(nav.route_coords, {
+            color: '#5b6ef7', weight: 4, opacity: 0.8,
+          }).addTo(navMap);
+        } else {
+          L.polyline([[nav.origin_lat, nav.origin_lng], [nav.asset_lat, nav.asset_lng]], {
+            color: '#5b6ef7', weight: 4, opacity: 0.8, dashArray: '10, 6',
+          }).addTo(navMap);
+        }
 
         // Fit bounds
-        navMap.fitBounds([[nav.origin_lat, nav.origin_lng], [nav.asset_lat, nav.asset_lng]], { padding: [40, 40], maxZoom: 16 });
+        if (nav.route_coords && nav.route_coords.length > 1) {
+          navMap.fitBounds(nav.route_coords, { padding: [40, 40], maxZoom: 16 });
+        } else {
+          navMap.fitBounds([[nav.origin_lat, nav.origin_lng], [nav.asset_lat, nav.asset_lng]], { padding: [40, 40], maxZoom: 16 });
+        }
       }, 200);
 
       // Populate info card
@@ -4531,6 +3959,17 @@
       document.getElementById('navDistance').textContent = distText;
       document.getElementById('navCardinal').textContent = nav.cardinal || '—';
       document.getElementById('navBearing').textContent = nav.bearing ? nav.bearing + '°' : '—';
+
+      // Show duration if available from OSRM
+      const durationEl = document.getElementById('navDuration');
+      if (durationEl && nav.route_duration_s) {
+        const mins = Math.round(nav.route_duration_s / 60);
+        durationEl.textContent = mins + ' min';
+        durationEl.style.display = '';
+      } else if (durationEl) {
+        durationEl.style.display = 'none';
+      }
+
       document.getElementById('navInfoCard').style.display = '';
 
       // Walking directions
@@ -4600,7 +4039,7 @@
         document.getElementById('checkinCount').textContent = checkins.length ? '(' + checkins.length + ')' : '';
         const el = document.getElementById('checkinHistory');
         if (!checkins.length) {
-          el.innerHTML = '<div class="empty-state">No check-ins yet</div>';
+          el.innerHTML = '<div class="empty-state">📋 No check-ins yet<br><span style="font-size:0.85em;opacity:0.7">Check in from the Add Asset tab</span></div>';
           return;
         }
         el.innerHTML = checkins.map(c => `
@@ -4612,7 +4051,7 @@
         `).join('');
       } catch (e) {
         document.getElementById('checkinHistory').innerHTML =
-          '<div class="empty-state">Failed to load check-ins</div>';
+          '<div class="empty-state">⚠️ Failed to load check-ins<br><span style="font-size:0.85em;opacity:0.7">Check your connection and try again</span><br><button onclick="loadCheckinHistory(\'' + (assetId || '') + '\')" style="margin-top:8px;padding:6px 16px;border:1px solid #ccc;border-radius:6px;background:#fff;cursor:pointer">🔄 Retry</button></div>';
       }
     }
 
@@ -4787,141 +4226,6 @@
       }
     }
 
-    // ── CSV Import ────────────────────────────────────────────────────────
-    let importRows = [];
-
-    document.getElementById('importFileInput').addEventListener('change', function(e) {
-      const file = e.target.files[0];
-      if (!file) return;
-      const reader = new FileReader();
-      reader.onload = function(ev) {
-        const text = ev.target.result;
-        const lines = text.split('\n').filter(l => l.trim());
-        if (lines.length < 2) {
-          showToast('CSV must have a header row and at least one data row', true);
-          return;
-        }
-        // Parse header
-        const header = lines[0].split(',').map(h => h.trim().toLowerCase());
-        const idx = {
-          machine_id: header.indexOf('machine_id'),
-          name: header.indexOf('name'),
-          category: header.indexOf('category'),
-          make: header.indexOf('make'),
-          model: header.indexOf('model'),
-          serial_number: header.indexOf('serial_number'),
-          customer: header.indexOf('customer'),
-          location: header.indexOf('location'),
-        };
-        if (idx.machine_id < 0 || idx.name < 0) {
-          showToast('CSV must have at least machine_id and name columns', true);
-          return;
-        }
-
-        importRows = [];
-        for (let i = 1; i < lines.length; i++) {
-          const cols = lines[i].split(',').map(c => c.trim());
-          const row = {
-            machine_id:     cols[idx.machine_id] || '',
-            name:           cols[idx.name] || '',
-            category:       idx.category >= 0 ? cols[idx.category] || '' : '',
-            make:           idx.make >= 0 ? cols[idx.make] || '' : '',
-            model:          idx.model >= 0 ? cols[idx.model] || '' : '',
-            serial_number:  idx.serial_number >= 0 ? cols[idx.serial_number] || '' : '',
-            customer_name:  idx.customer >= 0 ? cols[idx.customer] || '' : '',
-            location_name:  idx.location >= 0 ? cols[idx.location] || '' : '',
-          };
-          if (row.machine_id && row.name) importRows.push(row);
-        }
-
-        if (!importRows.length) {
-          showToast('No valid rows found (need machine_id + name)', true);
-          return;
-        }
-
-        // Show preview
-        document.getElementById('importRowCount').textContent = importRows.length + ' rows ready to import';
-        document.getElementById('importPreview').style.display = 'block';
-        document.getElementById('importRunBtn').disabled = false;
-
-        // Show preview table (first 10 rows)
-        const displayKeys = ['machine_id','name','category','make','model'];
-        const thead = '<tr>' + displayKeys.map(k => '<th>' + k + '</th>').join('') + '</tr>';
-        const tbody = importRows.slice(0, 10).map(r =>
-          '<tr>' + displayKeys.map(k => '<td>' + esc(r[k] || '') + '</td>').join('') + '</tr>'
-        ).join('');
-        if (importRows.length > 10) {
-          document.getElementById('importTable').innerHTML =
-            thead + '<tfoot style="font-size:11px;color:var(--text2);"><tr><td colspan="' + displayKeys.length + '">... and ' + (importRows.length - 10) + ' more rows</td></tr></tfoot>' + tbody;
-        } else {
-          document.getElementById('importTable').innerHTML = thead + tbody;
-        }
-      };
-      reader.readAsText(file);
-    });
-
-    async function runImport() {
-      if (!importRows.length) return;
-      const btn = document.getElementById('importRunBtn');
-      btn.disabled = true;
-      btn.textContent = 'Importing...';
-
-      let created = 0, skipped = 0;
-      const errors = [];
-
-      for (let i = 0; i < importRows.length; i++) {
-        const r = importRows[i];
-        try {
-          await api('/api/assets', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              machine_id: r.machine_id,
-              name: r.name,
-              category: r.category || 'Other',
-              make: r.make || '',
-              model: r.model || '',
-              serial_number: r.serial_number || '',
-            }),
-          });
-          created++;
-        } catch (e) {
-          if (e.message && e.message.includes('UNIQUE constraint')) {
-            skipped++;
-          } else {
-            errors.push('Row ' + (i + 2) + ' (' + r.machine_id + '): ' + e.message);
-          }
-        }
-      }
-
-      // Show results
-      const resEl = document.getElementById('importResults');
-      resEl.style.display = 'block';
-      let html = '<div class="import-results">';
-      html += '<span class="ir-ok">✓ Created: ' + created + '</span> &nbsp; ';
-      html += '<span class="ir-warn">⊘ Skipped (duplicate): ' + skipped + '</span> &nbsp; ';
-      html += '<span class="ir-err">✗ Errors: ' + errors.length + '</span>';
-      if (errors.length) {
-        html += '<div style="margin-top:6px;font-size:11px;max-height:120px;overflow-y:auto;">' +
-          errors.map(e => '<div class="ir-err">' + esc(e) + '</div>').join('') + '</div>';
-      }
-      html += '</div>';
-      resEl.innerHTML = html;
-
-      btn.textContent = 'Done';
-      btn.className = 'btn btn-outline btn-sm';
-      btn.onclick = () => showAssetList();
-      showToast('Import complete: ' + created + ' created, ' + skipped + ' skipped, ' + errors.length + ' errors');
-    }
-
-    // ═══════════════════════════════════════════════════════════════════════
-    // MAP PINS + FILTER + SEARCH + ASSET LIST
-    // ═══════════════════════════════════════════════════════════════════════
-
-    var _mapAllAssets = [];       // All assets from API (cached)
-    var _mapFilterTimer = null;   // Debounce timer
-    var _mapActiveCategory = '';  // Active category filter chip
-    var _mapActiveStatus = '';    // Active status filter chip
 
     async function loadAssetPins() {
       // Store markers on a namespace so we can clear them
@@ -5172,112 +4476,6 @@
     }
 
     // ▶ Called when "📍 Extract GPS" button is clicked in photo preview
-    async function extractGpsFromPicked() {
-      if (!pickedPhotoFile) {
-        showToast('No photo picked', true);
-        return;
-      }
-      await tryExtractGpsFromPicked();
-    }
-
-    // ▶ Internal: try to extract GPS from the currently picked photo
-    async function tryExtractGpsFromPicked() {
-      if (!pickedPhotoFile) return;
-      const exifEl = document.getElementById('pickedExifData');
-
-      exifEl.style.display = 'block';
-      exifEl.innerHTML = '<span style="color:var(--amber);">⏳ Reading EXIF GPS...</span>';
-
-      const gps = await extractGpsFromPhoto(pickedPhotoFile);
-      pickedPhotoGps = gps;
-
-      if (gps) {
-        exifEl.innerHTML = `
-          <div style="display:flex;align-items:center;gap:6px;margin-bottom:8px;">
-            <span class="gps-badge ok">📍 GPS from photo</span>
-          </div>
-          <div style="font-size:13px;color:var(--text2);margin-bottom:4px;">
-            ${gps.lat.toFixed(6)}, ${gps.lng.toFixed(6)}
-            ${gps.accuracy ? ` (±${gps.accuracy.toFixed(1)}m)` : ''}
-          </div>
-          <div id="gpsMiniMap"></div>
-          <div style="display:flex;gap:8px;margin-top:8px;">
-            <button class="btn btn-sm btn-outline" onclick="fillManualFromGps()" style="flex:1;">
-              📝 Fill Manual Form
-            </button>
-            <button class="btn btn-sm btn-outline" onclick="openInMaps()" style="flex:1;">
-              🗺️ Open in Maps
-            </button>
-          </div>
-          <div style="font-size:11px;color:var(--text3);margin-top:4px;">
-            Tap "Fill Manual Form" to populate parking & directions, then edit as needed
-          </div>
-        `;
-        // Render mini-map
-        const miniMapEl = document.getElementById('gpsMiniMap');
-        if (miniMapEl) {
-          setTimeout(() => renderGpsPreview(gps.lat, gps.lng, miniMapEl), 100);
-        }
-      } else {
-        exifEl.innerHTML = `
-          <span class="gps-badge err">📍 No GPS in photo</span>
-          <div style="font-size:12px;color:var(--text3);margin-top:4px;">
-            This photo has no GPS data. Phones often strip EXIF GPS when sharing screenshots or from some apps.
-            You can manually enter coordinates in the Manual form.
-          </div>
-        `;
-      }
-    }
-
-    // ▶ Fill the manual form fields with extracted GPS
-    function fillManualFromGps() {
-      if (!pickedPhotoGps) {
-        showToast('No GPS data to fill', true);
-        return;
-      }
-
-      const coords = pickedPhotoGps.lat.toFixed(6) + ', ' + pickedPhotoGps.lng.toFixed(6);
-
-      // Switch to manual mode
-      setAddAssetMode('manual');
-
-      // Fill parking location
-      const parkingEl = document.getElementById('manParkingLocation');
-      if (parkingEl && !parkingEl.value.trim()) {
-        parkingEl.value = coords;
-      }
-
-      // Fill map link with OpenStreetMap URL
-      const mapLinkEl = document.getElementById('manMapLink');
-      if (mapLinkEl && !mapLinkEl.value.trim()) {
-        mapLinkEl.value = `https://www.openstreetmap.org/?mlat=${pickedPhotoGps.lat}&mlon=${pickedPhotoGps.lng}&zoom=17`;
-      }
-
-      showToast('📍 GPS coordinates filled! Edit if needed.');
-    }
-
-    // ▶ Open coordinates in Google Maps
-    function openInMaps() {
-      if (!pickedPhotoGps) return;
-      const url = `https://www.google.com/maps?q=${pickedPhotoGps.lat},${pickedPhotoGps.lng}`;
-      window.open(url, '_blank');
-    }
-
-    // ▶ Clear picked photo and reset state
-    function clearPickedPhoto() {
-      pickedPhotoFile = null;
-      pickedPhotoGps = null;
-      document.getElementById('pickedPhotoPreview').src = '';
-      document.getElementById('photoPreviewCard').style.display = 'none';
-      document.getElementById('pickedExifData').style.display = 'none';
-      document.getElementById('pickedExifData').innerHTML = '';
-      // Reset file input so same file can be re-picked
-      document.getElementById('photoPicker').value = '';
-    }
-
-    // ═══════════════════════════════════════════════════════════════════════
-    // Extract GPS from a photo file using exifr library
-    // ═══════════════════════════════════════════════════════════════════════
     async function extractGpsFromPhoto(file) {
       if (!file) return null;
       try {
@@ -5351,7 +4549,7 @@
         container.appendChild(label);
       });
       rpSyncAllCheckbox();
-    } catch (e) { console.warn('Could not load technicians:', e); }
+    } catch (e) { showToast('Failed to load technicians', true); console.warn('Could not load technicians:', e); }
   }
 
   function rpSaveTechs() {
@@ -5736,7 +4934,7 @@
     navigator.clipboard.writeText(text).then(() => {
       // brief flash feedback
       const btn = document.querySelector('[onclick="rpCopyText()"]');
-      if (btn) { btn.textContent = '✅ Copied!'; setTimeout(() => btn.textContent = '📋 Copy', 2000); }
+      if (btn) { btn.textContent = '✅ Copied!'; setTimeout(() => btn.textContent = '📋 Copy', 4000); }
     }).catch(() => {
       // fallback
       const ta = document.createElement('textarea');