diff --git a/public/index.html b/public/index.html
index bd5ae40..1c2423e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,8 +3,319 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Cabo Bachelor Party — Vote</title>
+  <title>Cabo Bachelor Party — Vote & Map</title>
+  <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
+  <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
   <style>
+    /* ── Map tab ─────────────────────────────────────────────── */
+    #map-view {
+      position: relative;
+      height: calc(100vh - 120px);
+      min-height: 400px;
+    }
+    #cabo-map {
+      position: absolute;
+      inset: 0;
+      z-index: 1;
+    }
+    .map-overlay {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+      right: 10px;
+      z-index: 1000;
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+      pointer-events: none;
+    }
+    .map-search-wrap {
+      pointer-events: all;
+      background: rgba(19,22,31,0.95);
+      border: 1px solid #252a38;
+      border-radius: 8px;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      padding: 6px 10px;
+      max-width: 320px;
+      backdrop-filter: blur(8px);
+    }
+    .map-search-wrap input {
+      flex: 1;
+      background: transparent;
+      border: none;
+      color: #e0e6f0;
+      font-size: 0.82rem;
+      outline: none;
+    }
+    .map-search-wrap input::placeholder { color: #7a8499; }
+    .map-cat-filters {
+      display: flex;
+      gap: 4px;
+      flex-wrap: wrap;
+      pointer-events: all;
+    }
+    .map-cat-btn {
+      padding: 4px 8px;
+      border: 1px solid #252a38;
+      background: rgba(19,22,31,0.9);
+      color: #7a8499;
+      border-radius: 4px;
+      cursor: pointer;
+      font-size: 0.68rem;
+      font-weight: 600;
+      backdrop-filter: blur(8px);
+      transition: all 0.15s;
+      white-space: nowrap;
+      user-select: none;
+    }
+    .map-cat-btn.active {
+      border-color: var(--accent);
+      color: var(--accent);
+      background: rgba(0,212,255,0.12);
+    }
+    .map-cat-btn.hidden-cat {
+      opacity: 0.35;
+      border-color: #1a1e2a;
+    }
+    .map-cat-btn:hover { border-color: #7a8499; color: #e0e6f0; }
+    .map-cat-btn.hidden-cat:hover { opacity: 0.7; }
+
+    /* External / Yelp marker icon */
+    .map-ext-icon {
+      width: 30px;
+      height: 30px;
+      border-radius: 50%;
+      border: 2.5px dashed #ff6b35;
+      background: rgba(255,107,53,0.15);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 12px;
+      box-shadow: 0 2px 8px rgba(0,0,0,0.4);
+    }
+    .map-ext-icon-new {
+      width: 28px;
+      height: 28px;
+      border-radius: 50%;
+      border: 2px dashed #fbbf24;
+      background: rgba(251,191,36,0.15);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 11px;
+      box-shadow: 0 2px 8px rgba(0,0,0,0.4);
+    }
+
+    /* Yelp search button */
+    /* Multi-provider search bar */
+    #map-search-wrap {
+      display: flex;
+      align-items: center;
+      gap: 0;
+      pointer-events: all;
+      background: rgba(19,22,31,0.95);
+      border: 1px solid #252a38;
+      border-radius: 8px;
+      padding: 0;
+      max-width: 480px;
+      backdrop-filter: blur(8px);
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+    #map-search-wrap:focus-within { border-color: var(--accent); }
+    #map-search-input {
+      flex: 1;
+      background: transparent;
+      border: none;
+      color: #e0e6f0;
+      font-size: 0.82rem;
+      padding: 8px 10px;
+      outline: none;
+      min-width: 120px;
+    }
+    #map-search-input::placeholder { color: #7a8499; }
+    .provider-tabs {
+      display: flex;
+      align-items: center;
+      border-left: 1px solid #252a38;
+      flex-shrink: 0;
+    }
+    .provider-tab {
+      padding: 5px 8px;
+      border: none;
+      background: transparent;
+      color: #555;
+      font-size: 0.68rem;
+      font-weight: 700;
+      cursor: pointer;
+      white-space: nowrap;
+      transition: all 0.15s;
+      border-right: 1px solid #252a38;
+      letter-spacing: 0.2px;
+    }
+    .provider-tab:last-child { border-right: none; }
+    .provider-tab:hover { color: #ccc; background: rgba(255,255,255,0.04); }
+    .provider-tab.active-yelp { color: #ff6b35; background: rgba(255,107,53,0.12); }
+    .provider-tab.active-osm   { color: #fbbf24; background: rgba(251,191,36,0.10); }
+    .provider-tab.active-all   { color: #00d4ff; background: rgba(0,212,255,0.08); }
+    #map-search-btn {
+      border: none;
+      background: transparent;
+      color: #00d4ff;
+      cursor: pointer;
+      padding: 6px 10px;
+      font-size: 0.9rem;
+      border-left: 1px solid #252a38;
+      flex-shrink: 0;
+    }
+    #map-search-btn:hover { background: rgba(0,212,255,0.06); }
+    /* Quick-book mini bar */
+    .map-quick-book {
+      display: flex;
+      align-items: center;
+      gap: 3px;
+      flex-wrap: wrap;
+    }
+    .qb-label { color: #444; font-size: 0.6rem; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px; margin-right: 2px; }
+    .qb-btn {
+      display: flex; align-items: center; gap: 2px;
+      padding: 2px 5px;
+      border: 1px solid #252a38;
+      background: rgba(255,255,255,0.03);
+      color: #555;
+      border-radius: 3px;
+      font-size: 0.6rem; font-weight: 600;
+      cursor: pointer; white-space: nowrap; text-decoration: none;
+      transition: all 0.15s;
+    }
+    .qb-btn:hover { border-color: #444; color: #ccc; background: rgba(255,255,255,0.07); }
+    /* Legend: multi-provider dots */
+    .legend-dot-osm { background: #fbbf24; width: 9px; height: 9px; border-radius: 50%; display: inline-block; margin-right: 4px; border: 1px solid rgba(0,0,0,0.3); }
+    .legend-dot-all { background: conic-gradient(#ff6b35 33%, #fbbf24 33%, #fbbf24 66%, #00d4ff 66%); }
+
+    /* Filter bar layout */
+    .map-overlay {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+      right: 10px;
+      z-index: 1000;
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+      pointer-events: none;
+    }
+    .map-filter-row {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      flex-wrap: wrap;
+      pointer-events: all;
+    }
+    .map-filter-row .row-label {
+      color: #7a8499;
+      font-size: 0.62rem;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+      margin-right: 2px;
+    }
+    #map-search-wrap,
+    .map-filter-row {
+      background: rgba(19,22,31,0.93);
+      border: 1px solid #252a38;
+      border-radius: 8px;
+      padding: 6px 8px;
+      backdrop-filter: blur(8px);
+    }
+
+    .map-legend {
+      position: absolute;
+      bottom: 24px;
+      left: 10px;
+      background: rgba(19,22,31,0.93);
+      border: 1px solid #252a38;
+      border-radius: 8px;
+      padding: 8px 12px;
+      z-index: 1000;
+      font-size: 0.68rem;
+      backdrop-filter: blur(8px);
+    }
+    .map-legend h4 { color: #fff; margin-bottom: 5px; font-size: 0.68rem; text-transform: uppercase; letter-spacing: 0.5px; }
+    .legend-item { display: flex; align-items: center; gap: 6px; margin: 2px 0; color: #aaa; }
+    .legend-dot { width: 9px; height: 9px; border-radius: 50%; flex-shrink: 0; }
+
+    /* Map popup overrides */
+    .leaflet-popup-content-wrapper { background: #13161f; color: #e0e6f0; border-radius: 10px; border: 1px solid #252a38; padding: 0; }
+    .leaflet-popup-content { font-size: 0.8rem; margin: 12px 14px !important; }
+    .leaflet-popup-tip { background: #13161f; }
+    .leaflet-container { background: #0a0a14; }
+    .leaflet-popup-close-button { color: #7a8499 !important; font-size: 16px !important; top: 6px !important; right: 8px !important; }
+    .leaflet-popup-close-button:hover { color: #fff !important; }
+    .map-popup { min-width: 180px; }
+    .map-popup h4 { color: #00d4ff; margin-bottom: 4px; font-size: 0.88rem; }
+    .map-popup p { color: #7a8499; font-size: 0.72rem; margin-bottom: 8px; line-height: 1.4; }
+    .map-popup .mpvote { display: flex; align-items: center; gap: 6px; margin-bottom: 8px; }
+    .map-popup .mpvoters { font-size: 0.65rem; color: #7a8499; }
+    .map-popup .mpvoters span { color: #34d399; font-weight: 600; }
+    .map-popup-btn {
+      display: inline-block;
+      padding: 4px 12px;
+      background: #00d4ff;
+      color: #0b0d14 !important;
+      border-radius: 4px;
+      font-size: 0.7rem;
+      font-weight: 700;
+      cursor: pointer;
+      text-decoration: none !important;
+      border: none;
+    }
+    .map-popup-btn.voted { background: #34d399; }
+    .map-popup-btn:hover { opacity: 0.85; }
+    .map-popup .mp-link {
+      display: block;
+      margin-top: 6px;
+      font-size: 0.65rem;
+      color: #00d4ff;
+    }
+    /* Search results dropdown in map */
+    #map-search-results {
+      position: absolute;
+      top: calc(100% + 4px);
+      left: 0;
+      right: 0;
+      background: #13161f;
+      border: 1px solid #252a38;
+      border-radius: 6px;
+      max-height: 240px;
+      overflow-y: auto;
+      z-index: 2001;
+      display: none;
+    }
+    #map-search-results.show { display: block; }
+    .msr-item {
+      padding: 7px 10px;
+      font-size: 0.75rem;
+      cursor: pointer;
+      border-bottom: 1px solid #1a1e2a;
+      color: #ccc;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+    .msr-item:last-child { border-bottom: none; }
+    .msr-item:hover { background: rgba(0,212,255,0.08); color: #00d4ff; }
+    .msr-item .msr-cat {
+      font-size: 0.6rem;
+      padding: 1px 5px;
+      border-radius: 3px;
+      font-weight: 700;
+      text-transform: uppercase;
+      white-space: nowrap;
+    }
+
     /* ── Variables ─────────────────────────────────────────── */
     :root {
       --bg: #0b0d14;
@@ -22,6 +333,7 @@
       --nightlife: #a855f7;
       --excursion: #06b6d4;
       --itinerary: #fbbf24;
+      --budget: #f97316;
     }
 
     /* ── Reset ──────────────────────────────────────────────── */
@@ -285,6 +597,29 @@
       margin-bottom: 8px;
     }
     .option-link:hover { opacity: 1; text-decoration: underline; }
+    .option-links {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 6px;
+      margin-bottom: 8px;
+    }
+    .option-pill {
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
+      border: 1px solid rgba(0, 212, 255, 0.2);
+      background: rgba(0, 212, 255, 0.08);
+      border-radius: 999px;
+      padding: 4px 8px;
+      font-size: 0.66rem;
+      color: var(--accent);
+      opacity: 0.92;
+    }
+    .option-pill:hover {
+      opacity: 1;
+      text-decoration: none;
+      border-color: rgba(0, 212, 255, 0.45);
+    }
 
     /* Vote bar */
     .vote-bar-bg {
@@ -304,6 +639,7 @@
     .vote-bar-fill.nightlife { background: var(--nightlife); }
     .vote-bar-fill.excursion { background: var(--excursion); }
     .vote-bar-fill.itinerary { background: var(--itinerary); }
+    .vote-bar-fill.budget { background: var(--budget); }
 
     .voters-row {
       margin-top: 5px;
@@ -326,6 +662,117 @@
       font-size: 0.65rem;
       color: var(--text-muted);
     }
+    .budget-board {
+      margin-bottom: 16px;
+      background:
+        radial-gradient(circle at top right, rgba(249, 115, 22, 0.16), transparent 38%),
+        linear-gradient(135deg, rgba(251, 191, 36, 0.08), rgba(19, 22, 31, 0.95) 48%, rgba(6, 182, 212, 0.08));
+      border: 1px solid rgba(249, 115, 22, 0.28);
+      border-radius: 18px;
+      padding: 18px;
+      box-shadow: 0 18px 48px rgba(0, 0, 0, 0.24);
+    }
+    .budget-board h2 {
+      font-size: 1.05rem;
+      color: #ffd7b0;
+      margin-bottom: 6px;
+    }
+    .budget-board p {
+      font-size: 0.78rem;
+      color: #e1c9b8;
+      line-height: 1.5;
+    }
+    .budget-stamp {
+      display: inline-flex;
+      margin-top: 10px;
+      padding: 4px 10px;
+      border-radius: 999px;
+      background: rgba(249, 115, 22, 0.12);
+      color: #ffbe88;
+      font-size: 0.68rem;
+      letter-spacing: 0.3px;
+    }
+    .budget-grid {
+      margin: 16px 0 18px;
+      display: grid;
+      grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
+      gap: 12px;
+    }
+    .budget-card {
+      background: rgba(11, 13, 20, 0.76);
+      border: 1px solid rgba(255, 255, 255, 0.08);
+      border-radius: 16px;
+      padding: 14px;
+      backdrop-filter: blur(10px);
+    }
+    .budget-card h3 {
+      font-size: 0.95rem;
+      margin-bottom: 4px;
+      color: #fff3e8;
+    }
+    .budget-card .budget-meta {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 10px;
+      margin-bottom: 10px;
+      color: #fbc08c;
+      font-size: 0.7rem;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+    }
+    .budget-card .budget-price {
+      font-size: 1.5rem;
+      font-weight: 800;
+      color: #fff;
+      margin-bottom: 4px;
+    }
+    .budget-card .budget-total {
+      font-size: 0.72rem;
+      color: #ffcf9c;
+      margin-bottom: 10px;
+    }
+    .budget-card .budget-summary {
+      font-size: 0.76rem;
+      color: #d9e3f4;
+      line-height: 1.45;
+      margin-bottom: 10px;
+    }
+    .budget-card ul {
+      list-style: none;
+      display: grid;
+      gap: 5px;
+    }
+    .budget-card li {
+      font-size: 0.7rem;
+      color: #b7c0d4;
+      line-height: 1.4;
+      padding-left: 10px;
+      position: relative;
+    }
+    .budget-card li::before {
+      content: '';
+      width: 4px;
+      height: 4px;
+      border-radius: 50%;
+      background: currentColor;
+      position: absolute;
+      left: 0;
+      top: 0.55em;
+      opacity: 0.8;
+    }
+    .budget-tier {
+      display: inline-flex;
+      align-items: center;
+      padding: 4px 8px;
+      border-radius: 999px;
+      font-weight: 700;
+      font-size: 0.66rem;
+      letter-spacing: 0.3px;
+    }
+    .budget-tier.budget { background: rgba(52, 211, 153, 0.12); color: #7df0c0; }
+    .budget-tier.balanced { background: rgba(6, 182, 212, 0.12); color: #7fe7ff; }
+    .budget-tier.splurge { background: rgba(249, 115, 22, 0.14); color: #ffbe88; }
 
     /* ── Add Option ─────────────────────────────────────────── */
     .add-section {
@@ -694,6 +1141,46 @@
     <div class="empty-state"><div class="empty-emoji">⏳</div>Loading options…</div>
   </div>
 
+  <!-- Map view -->
+  <div id="map-view" style="display:none;">
+    <div id="cabo-map"></div>
+    <div class="map-overlay">
+      <!-- Row 1: Multi-provider search -->
+      <div id="map-search-wrap">
+        <span style="color:#7a8499;font-size:0.8rem;padding-left:8px;flex-shrink:0;">🔍</span>
+        <input type="text" id="map-search-input" placeholder="Search Los Cabos…" autocomplete="off" />
+        <div class="provider-tabs">
+          <button class="provider-tab active-yelp" id="tab-yelp" onclick="setProvider('yelp')">🍴 Yelp</button>
+          <button class="provider-tab" id="tab-osm" onclick="setProvider('osm')">📍 OSM</button>
+          <button class="provider-tab" id="tab-all" onclick="setProvider('all')">⚡ All</button>
+        </div>
+        <button id="map-search-btn" onclick="mapDoSearch()">→</button>
+      </div>
+      <div id="map-search-results"></div>
+      <!-- Row 2: Category filters -->
+      <div class="map-filter-row">
+        <span class="row-label">Show</span>
+        <button class="map-cat-btn active" id="cat-btn-hotel" onclick="mapToggleCat('hotel')">🏨 Hotels</button>
+        <button class="map-cat-btn active" id="cat-btn-golf" onclick="mapToggleCat('golf')">⛳ Golf</button>
+        <button class="map-cat-btn active" id="cat-btn-nightlife" onclick="mapToggleCat('nightlife')">🎧 Nightlife</button>
+        <button class="map-cat-btn active" id="cat-btn-excursion" onclick="mapToggleCat('excursion')">🚤 Excursions</button>
+        <button class="map-cat-btn active" id="cat-btn-itinerary" onclick="mapToggleCat('itinerary')">🗺️ Itineraries</button>
+        <button class="map-cat-btn" id="cat-btn-clear" onclick="mapClearAllCats()" style="margin-left:4px;border-color:#f87171;color:#f87171;">✕ Clear</button>
+      </div>
+    </div>
+    <div class="map-legend">
+      <h4>Legend</h4>
+      <div class="legend-item"><div class="legend-dot" style="background:#3b82f6"></div> Hotel</div>
+      <div class="legend-item"><div class="legend-dot" style="background:#22c55e"></div> Golf</div>
+      <div class="legend-item"><div class="legend-dot" style="background:#06b6d4"></div> Excursion</div>
+      <div class="legend-item"><div class="legend-dot" style="background:#a855f7"></div> Nightlife</div>
+      <div class="legend-item"><div class="legend-dot" style="background:#fbbf24"></div> Itinerary</div>
+      <div class="legend-item"><div class="legend-dot" style="background:#ff6b35;opacity:0.8"></div> Yelp</div>
+      <div class="legend-item"><div class="legend-dot legend-dot-osm"></div> OSM</div>
+      <div class="legend-item"><div class="legend-dot" style="background:conic-gradient(#ff6b35 33%, #fbbf24 33%, #fbbf24 66%, #00d4ff 66%);width:9px;height:9px;border-radius:50%;display:inline-block;border:1px solid rgba(0,0,0,0.3)"></div> All sources</div>
+    </div>
+  </div>
+
   <!-- Add option -->
   <div class="add-section">
     <h3>➕ Suggest a Place</h3>
@@ -708,6 +1195,7 @@
           <option value="nightlife">🎧 Nightlife</option>
           <option value="excursion">🚤 Excursion</option>
           <option value="itinerary">🗺️ Full Itinerary</option>
+          <option value="budget">💸 Budget Idea</option>
         </select>
         <button class="btn-primary" id="addBtn" onclick="submitNewOption()">Submit</button>
       </div>
@@ -731,6 +1219,8 @@
     voterName: localStorage.getItem('cabo_voter_name') || '',
     categories: [],
     options: [],
+    budgetScenarios: [],
+    priceUpdatedAt: '',
     pollsOpen: true,
     totalVoters: 0,
     wsConnected: false,
@@ -812,6 +1302,8 @@
       if (msg.type === 'init') {
         state.categories = msg.categories;
         state.options = msg.options;
+        state.budgetScenarios = msg.budgetScenarios || [];
+        state.priceUpdatedAt = msg.priceUpdatedAt || '';
         state.pollsOpen = msg.pollsOpen;
         state.totalVoters = msg.totalVoters;
         renderTabs();
@@ -819,19 +1311,22 @@
       } else if (msg.type === 'vote_update') {
         msg.results.forEach(r => {
           const opt = state.options.find(o => o.id === r.id);
-          if (opt) { opt.votes = r.votes; opt.voters = r.voters; }
+          if (opt) { opt.votes = (r.voters || []).map(name => ({ name })); }
         });
         render();
+        if (mapInitialized) mapRefreshMarkers();
       } else if (msg.type === 'option_added' || msg.type === 'option_approved') {
         if (!state.options.find(o => o.id === msg.option.id)) {
           state.options.push(msg.option);
           renderTabs();
           render();
+          if (mapInitialized) mapRefreshMarkers();
         }
       } else if (msg.type === 'option_deleted') {
         state.options = state.options.filter(o => o.id !== msg.id);
         renderTabs();
         render();
+        if (mapInitialized) mapRefreshMarkers();
       } else if (msg.type === 'polls_status') {
         state.pollsOpen = msg.open;
         updatePollsBadge();
@@ -873,6 +1368,12 @@
     badge.className = 'polls-badge ' + (state.pollsOpen ? 'open' : 'closed');
   }
 
+  function getVoteEntries(opt) {
+    if (Array.isArray(opt.votes)) return opt.votes;
+    if (Array.isArray(opt.voters)) return opt.voters.map(name => ({ name }));
+    return [];
+  }
+
   // ── Name modal ────────────────────────────────────────────
   function submitName() {
     const name = document.getElementById('voterNameInput').value.trim();
@@ -898,7 +1399,8 @@
   // ── Tabs ───────────────────────────────────────────────────
   function renderTabs() {
     const bar = document.getElementById('tabsBar');
-    bar.innerHTML = state.categories.map(cat => `
+    const catsWithMap = [...state.categories, { id: 'map', name: 'Map', emoji: '🗺️' }];
+    bar.innerHTML = catsWithMap.map(cat => `
       <div class="tab${cat.id === activeTab ? ' active' : ''}"
            role="tab"
            id="tab-${cat.id}"
@@ -909,7 +1411,7 @@
            onkeydown="handleTabKey(event, '${cat.id}')">
         <span class="tab-emoji">${cat.emoji}</span>
         ${cat.name}
-        <span class="tab-count" id="tab-count-${cat.id}">${cat.id === 'results' ? '' : state.options.filter(o => o.categoryId === cat.id).length}</span>
+        <span class="tab-count" id="tab-count-${cat.id}">${cat.id === 'results' ? '' : cat.id === 'map' ? '' : state.options.filter(o => o.categoryId === cat.id).length}</span>
       </div>
     `).join('');
     bar.setAttribute('role', 'tablist');
@@ -917,7 +1419,7 @@
   }
 
   function handleTabKey(event, catId) {
-    const cats = state.categories.map(c => c.id);
+    const cats = [...state.categories.map(c => c.id), 'map'];
     const idx = cats.indexOf(catId);
     if (event.key === 'ArrowRight' || event.key === 'ArrowDown') {
       event.preventDefault();
@@ -936,6 +1438,20 @@
     activeTab = id;
     renderTabs();
     render();
+    // Show/hide map vs options list
+    const mapView = document.getElementById('map-view');
+    const optionsList = document.getElementById('optionsList');
+    const addSection = document.querySelector('.add-section');
+    if (id === 'map') {
+      mapView.style.display = 'block';
+      optionsList.style.display = 'none';
+      if (addSection) addSection.style.display = 'none';
+      if (!mapInitialized) initMap();
+    } else {
+      mapView.style.display = 'none';
+      optionsList.style.display = 'block';
+      if (addSection) addSection.style.display = '';
+    }
     document.getElementById('optionsList')?.setAttribute('aria-label', state.categories.find(c => c.id === id)?.name + ' options');
   }
 
@@ -970,7 +1486,17 @@
               const medal = rank === 1 ? '🥇' : rank === 2 ? '🥈' : rank === 3 ? '🥉' : rank;
               const medalClass = rank === 1 ? 'gold' : rank === 2 ? 'silver' : rank === 3 ? 'bronze' : '';
               const winner = rank === 1 ? 'winner' : '';
-              const barColor = cat.id === 'hotel' ? 'var(--hotel)' : cat.id === 'golf' ? 'var(--golf)' : cat.id === 'nightlife' ? 'var(--nightlife)' : cat.id === 'excursion' ? 'var(--excursion)' : 'var(--itinerary)';
+              const barColor = cat.id === 'hotel'
+                ? 'var(--hotel)'
+                : cat.id === 'golf'
+                  ? 'var(--golf)'
+                  : cat.id === 'nightlife'
+                    ? 'var(--nightlife)'
+                    : cat.id === 'excursion'
+                      ? 'var(--excursion)'
+                      : cat.id === 'budget'
+                        ? 'var(--budget)'
+                        : 'var(--itinerary)';
               return `
               <div class="results-row">
                 <div class="results-rank ${medalClass}">${medal}</div>
@@ -1000,23 +1526,30 @@
     }
 
     // Sort by votes desc
-    const sorted = [...opts].sort((a, b) => b.votes.length - a.votes.length);
-    const maxVotes = sorted[0] ? sorted[0].votes.length : 1;
+    const sorted = [...opts].sort((a, b) => getVoteEntries(b).length - getVoteEntries(a).length);
+    const maxVotes = sorted[0] ? getVoteEntries(sorted[0]).length : 1;
+    const budgetBoard = activeTab === 'budget' ? renderBudgetBoard() : '';
 
-    list.innerHTML = sorted.map(opt => {
+    list.innerHTML = budgetBoard + sorted.map(opt => {
       const catClass = opt.categoryId;
-      const votePct = maxVotes > 0 ? (opt.votes.length / maxVotes * 100) : 0;
-      const hasVoted = state.voterName && opt.votes.some(v => v.name === state.voterName);
-      const voteList = opt.votes.map(v => v.name).join(', ');
+      const voteEntries = getVoteEntries(opt);
+      const votePct = maxVotes > 0 ? (voteEntries.length / maxVotes * 100) : 0;
+      const hasVoted = state.voterName && voteEntries.some(v => v.name === state.voterName);
+      const voteList = voteEntries.map(v => v.name).join(', ');
+      const linkPills = opt.links && opt.links.length
+        ? `<div class="option-links">${opt.links.map(link => `
+          <a href="${link.url}" target="_blank" rel="noopener noreferrer" class="option-pill" onclick="event.stopPropagation()">${link.label}</a>
+        `).join('')}</div>`
+        : (opt.url ? `<a href="${opt.url}" target="_blank" rel="noopener noreferrer" class="option-link" onclick="event.stopPropagation()">🔗 ${opt.url.replace(/^https?:\/\//, '').split('/')[0]}</a>` : '');
 
       return `
       <div class="option-card${hasVoted ? ' voted' : ''}" onclick="toggleVote('${opt.id}')">
         <div class="option-top">
           <div class="option-name">${opt.name}</div>
-          <div class="option-votes">${opt.votes.length} vote${opt.votes.length !== 1 ? 's' : ''}</div>
+          <div class="option-votes">${voteEntries.length} vote${voteEntries.length !== 1 ? 's' : ''}</div>
         </div>
         ${opt.desc ? `<div class="option-desc">${opt.desc}</div>` : ''}
-        ${opt.url ? `<a href="${opt.url}" target="_blank" rel="noopener noreferrer" class="option-link" onclick="event.stopPropagation()">🔗 ${opt.url.replace(/^https?:\/\//, '').split('/')[0]}</a>` : ''}
+        ${linkPills}
         ${opt.details && opt.details.length ? `
           <div class="itin-details">${opt.details.map(d => `<span class="itin-tag">${d}</span>`).join('')}</div>
         ` : ''}
@@ -1029,6 +1562,39 @@
     }).join('');
   }
 
+  function renderBudgetBoard() {
+    if (!state.budgetScenarios.length) return '';
+
+    const tierOrder = { Budget: 0, Balanced: 1, Splurge: 2 };
+    const scenarios = [...state.budgetScenarios].sort((a, b) => {
+      if (a.groupSize !== b.groupSize) return a.groupSize - b.groupSize;
+      return (tierOrder[a.tier] ?? 99) - (tierOrder[b.tier] ?? 99);
+    });
+
+    return `
+      <section class="budget-board">
+        <h2>💸 Budget Cheat Sheet</h2>
+        <p>These are planning numbers for the group to compare tracks quickly before anyone starts buying flights. They use current live price signals and bake in the shared-cost difference between 8, 10, and 12 guys.</p>
+        <div class="budget-stamp">Pricing research last refreshed ${state.priceUpdatedAt || 'recently'}</div>
+        <div class="budget-grid">
+          ${scenarios.map(scenario => `
+            <article class="budget-card">
+              <div class="budget-meta">
+                <span>${scenario.groupSize} guys</span>
+                <span class="budget-tier ${scenario.tier.toLowerCase()}">${scenario.tier}</span>
+              </div>
+              <h3>${scenario.tier} Track</h3>
+              <div class="budget-price">$${scenario.perPerson.toLocaleString()}</div>
+              <div class="budget-total">$${scenario.groupTotal.toLocaleString()} group total</div>
+              <div class="budget-summary">${scenario.summary}</div>
+              <ul>${scenario.notes.map(note => `<li>${note}</li>`).join('')}</ul>
+            </article>
+          `).join('')}
+        </div>
+      </section>
+    `;
+  }
+
   // ── Voting ────────────────────────────────────────────────
   function toggleVote(optionId) {
     if (activeTab === 'results') return; // no voting on results tab
@@ -1045,7 +1611,7 @@
     const opt = state.options.find(o => o.id === optionId);
     if (!opt) return;
 
-    const alreadyVoted = opt.votes.some(v => v.name === state.voterName);
+    const alreadyVoted = getVoteEntries(opt).some(v => v.name === state.voterName);
 
     wsSend({ type: 'vote', optionId, voterName: state.voterName, remove: alreadyVoted });
     showToast(alreadyVoted ? `Removed vote for ${opt.name}` : `Voted for ${opt.name}!`);
@@ -1086,6 +1652,419 @@
     setTimeout(() => toast.classList.remove('show'), 3000);
   }
 
+  // ── Map ───────────────────────────────────────────────────
+  let mapInstance = null;
+  let mapInitialized = false;
+  let mapMarkers = {};
+  let mapHiddenCats = new Set();   // categories currently hidden
+  let mapExtMarkers = [];          // temporary external / Yelp markers
+  const CABOS_BBOX = '-109.85,22.85,-109.55,23.25';
+  const CABOS_CENTER = { lat: 23.065, lng: -109.698 };
+
+  function initMap() {
+    mapInitialized = true;
+    mapInstance = L.map('cabo-map', { zoomControl: true }).setView([CABOS_CENTER.lat, CABOS_CENTER.lng], 12);
+    L.tileLayer('https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png', {
+      attribution: '&copy; OpenStreetMap, &copy; CARTO',
+      maxZoom: 18
+    }).addTo(mapInstance);
+    mapInstance.zoomControl.setPosition('bottomright');
+
+    // Map search input
+    const searchInput = document.getElementById('map-search-input');
+    const searchResults = document.getElementById('map-search-results');
+    let searchTimeout;
+
+    searchInput.addEventListener('input', () => {
+      const q = searchInput.value.trim();
+      if (q.length < 2) { searchResults.classList.remove('show'); return; }
+      clearTimeout(searchTimeout);
+      searchTimeout = setTimeout(() => mapDoSearch(), 400);
+    });
+    searchInput.addEventListener('keydown', e => {
+      if (e.key === 'Enter') {
+        const q = searchInput.value.trim();
+        if (q) { mapDoSearch(); searchResults.classList.remove('show'); }
+      }
+    });
+    document.addEventListener('click', e => {
+      if (!e.target.closest('#map-search-wrap')) searchResults.classList.remove('show');
+    });
+
+    mapRefreshMarkers();
+  }
+
+  function mapMakeIcon(color, emoji, size = 34) {
+    return L.divIcon({
+      html: `<div style="background:${color};width:${size}px;height:${size}px;border-radius:50%;border:2.5px solid white;display:flex;align-items:center;justify-content:center;font-size:${Math.floor(size*0.4)}px;box-shadow:0 2px 10px rgba(0,0,0,0.5);">${emoji}</div>`,
+      className: '',
+      iconSize: [size, size],
+      iconAnchor: [size/2, size/2]
+    });
+  }
+
+  // Dashed-border icon for external / Yelp results
+  function mapMakeExtIcon(borderColor, emoji, size = 30) {
+    return L.divIcon({
+      html: `<div style="width:${size}px;height:${size}px;border-radius:50%;border:2.5px dashed ${borderColor};background:rgba(0,0,0,0.3);display:flex;align-items:center;justify-content:center;font-size:${Math.floor(size*0.35)}px;box-shadow:0 2px 8px rgba(0,0,0,0.5);color:white;">${emoji}</div>`,
+      className: '',
+      iconSize: [size, size],
+      iconAnchor: [size/2, size/2]
+    });
+  }
+
+  function mapMakePopup(opt) {
+    const catColors = { hotel: '#3b82f6', golf: '#22c55e', nightlife: '#a855f7', excursion: '#06b6d4', itinerary: '#fbbf24' };
+    const catEmoji = { hotel: '🏨', golf: '⛳', nightlife: '🎧', excursion: '🚤', itinerary: '🗺️' };
+    const color = opt.categoryColor || catColors[opt.categoryId] || '#888';
+    const emoji = catEmoji[opt.categoryId] || '📍';
+    const hasVoted = state.voterName && opt.votes.some(v => v.name === state.voterName);
+    const voterList = opt.votes.length > 0 ? opt.votes.map(v => v.name).join(', ') : 'No votes yet';
+
+    return `<div class="map-popup">
+      <h4>${emoji} ${opt.name}</h4>
+      <p>${opt.desc || ''}</p>
+      <div class="mpvote">
+        <button class="map-popup-btn ${hasVoted ? 'voted' : ''}" onclick="toggleVoteFromMap('${opt.id}')">
+          ${hasVoted ? '✓ Voted' : '👍 Vote'}
+        </button>
+        <span style="color:#7a8499;font-size:0.72rem;">${opt.votes.length} vote${opt.votes.length !== 1 ? 's' : ''}</span>
+      </div>
+      <div class="mpvoters">${opt.votes.length > 0 ? '👥 ' + voterList : 'Be the first to vote!'}</div>
+      ${opt.url ? `<a href="${opt.url}" target="_blank" rel="noopener noreferrer" class="mp-link">🔗 Book / Visit →</a>` : ''}
+    </div>`;
+  }
+
+  function mapMakeExtPopup(item) {
+    const rating = item.rating ? `⭐ ${item.rating}` : '';
+    const price = item.price ? `<span style="color:#fbbf24;margin-left:6px;">${item.price}</span>` : '';
+    const image = item.image_url ? `<img src="${item.image_url}" alt="" style="width:100%;height:80px;object-fit:cover;border-radius:6px;margin-bottom:8px;" />` : '';
+    const yelpUrl = item.url ? `<a href="${item.url}" target="_blank" rel="noopener noreferrer" class="mp-link" style="color:#ff6b35;">🍴 View on Yelp →</a>` : '';
+    const gmapsUrl = item.coordinates ? `<a href="https://www.google.com/maps?q=${item.coordinates.latitude},${item.coordinates.longitude}" target="_blank" rel="noopener noreferrer" class="mp-link">📍 Directions →</a>` : '';
+    return `<div class="map-popup">
+      ${image}
+      <h4 style="color:#ff6b35;">🍴 ${item.name}</h4>
+      <p>${item.location ? item.location.address1 + ', ' + item.location.city : ''}</p>
+      <div style="margin-bottom:6px;font-size:0.72rem;color:#aaa;">${rating}${price}</div>
+      ${yelpUrl}${gmapsUrl ? '<br>' + gmapsUrl : ''}
+      <div style="margin-top:6px;font-size:0.6rem;color:#555;text-align:right;">Powered by Yelp</div>
+    </div>`;
+  }
+
+  function toggleVoteFromMap(optionId) {
+    if (activeTab !== 'map') setTab('map');
+    toggleVote(optionId);
+  }
+
+  // ── Render venue markers (curated app data) ───────────────
+  function mapRefreshMarkers() {
+    if (!mapInstance) return;
+
+    // Remove existing venue markers
+    Object.values(mapMarkers).forEach(m => mapInstance.removeLayer(m));
+    mapMarkers = {};
+
+    // Show all approved venues whose category is NOT hidden
+    const visible = state.options.filter(o =>
+      o.approved && o.lat && o.lng && !mapHiddenCats.has(o.categoryId)
+    );
+
+    const catEmoji = { hotel: '🏨', golf: '⛳', nightlife: '🎧', excursion: '🚤', itinerary: '🗺️' };
+
+    visible.forEach(opt => {
+      const color = opt.categoryColor || '#888';
+      const emoji = catEmoji[opt.categoryId] || '📍';
+      const icon = mapMakeIcon(color, emoji, 34);
+      const marker = L.marker([opt.lat, opt.lng], { icon })
+        .addTo(mapInstance)
+        .bindPopup(mapMakePopup(opt), { className: 'map-popup-wrapper' });
+      mapMarkers[opt.id] = marker;
+    });
+
+    // Fit bounds to venue markers only (not external ones)
+    const venueMarkers = Object.values(mapMarkers);
+    if (venueMarkers.length > 0) {
+      const group = L.featureGroup(venueMarkers);
+      mapInstance.fitBounds(group.getBounds(), { padding: [40, 40], maxZoom: 14 });
+    }
+  }
+
+  // ── Category filter toggles ───────────────────────────────
+  const ALL_CATS = ['hotel', 'golf', 'nightlife', 'excursion', 'itinerary'];
+
+  function mapToggleCat(catId) {
+    if (mapHiddenCats.has(catId)) {
+      mapHiddenCats.delete(catId);
+    } else {
+      mapHiddenCats.add(catId);
+    }
+    mapSyncCatButtons();
+    mapRefreshMarkers();
+  }
+
+  function mapClearAllCats() {
+    ALL_CATS.forEach(c => mapHiddenCats.add(c));
+    mapSyncCatButtons();
+    mapRefreshMarkers();
+  }
+
+  function mapRestoreAllCats() {
+    mapHiddenCats.clear();
+    mapSyncCatButtons();
+    mapRefreshMarkers();
+  }
+
+  function mapSyncCatButtons() {
+    ALL_CATS.forEach(catId => {
+      const btn = document.getElementById('cat-btn-' + catId);
+      if (btn) {
+        if (mapHiddenCats.has(catId)) {
+          btn.classList.add('hidden-cat');
+          btn.classList.remove('active');
+        } else {
+          btn.classList.remove('hidden-cat');
+          btn.classList.add('active');
+        }
+      }
+    });
+  }
+
+  // ── Multi-provider search ───────────────────────────────
+  let currentProvider = 'yelp'; // 'yelp' | 'osm' | 'all'
+
+  function setProvider(p) {
+    currentProvider = p;
+    document.getElementById('tab-yelp').className = 'provider-tab' + (p === 'yelp' ? ' active-yelp' : '');
+    document.getElementById('tab-osm').className = 'provider-tab' + (p === 'osm' ? ' active-osm' : '');
+    document.getElementById('tab-all').className = 'provider-tab' + (p === 'all' ? ' active-all' : '');
+  }
+
+  function quickBook(type) {
+    const q = (document.getElementById('map-search-input').value || '').trim() || 'Los Cabos Mexico';
+    let url;
+    switch(type) {
+      case 'gmaps':    url = `https://www.google.com/maps/search/${encodeURIComponent(q)}`; break;
+      case 'flights':  url = `https://www.google.com/travel/flights/search?q=${encodeURIComponent(q)}&tfpla=on`; break;
+      case 'hotels':   url = `https://www.kayak.com/hotels/${encodeURIComponent(q)}/2admins`; break;
+      case 'viator':   url = `https://www.viator.com/search/${encodeURIComponent(q)}`; break;
+      case 'expedia':  url = `https://www.expedia.com/Thotel-Search?destination=${encodeURIComponent(q)}`; break;
+      case 'tripadvisor': url = `https://www.tripadvisor.com/Search?q=${encodeURIComponent(q)}`; break;
+      default: return;
+    }
+    window.open(url, '_blank', 'noopener,noreferrer');
+  }
+
+  function mapClearExtMarkers() {
+    mapExtMarkers.forEach(m => mapInstance.removeLayer(m));
+    mapExtMarkers = [];
+  }
+
+  async function mapYelpSearch(q) {
+    const input = document.getElementById('map-search-input');
+    const results = document.getElementById('map-search-results');
+    q = (q || input.value || '').trim();
+    if (!q) return;
+
+    results.innerHTML = '<div class="msr-item" style="color:#ff6b35;">Searching Yelp…</div>';
+    results.classList.add('show');
+
+    try {
+      const res = await fetch(`/api/yelp?term=${encodeURIComponent(q)}&location=Los+Cabos+Mexico`);
+      const data = await res.json();
+      if (data.error) throw new Error(data.error);
+
+      mapClearExtMarkers();
+
+      if (!data.businesses || data.businesses.length === 0) {
+        results.innerHTML = '<div class="msr-item" style="color:#7a8499;">No Yelp results. Try OSM or All.</div>';
+      } else {
+        results.innerHTML = data.businesses.slice(0, 8).map((b, i) => {
+          const cat = b.categories?.[0]?.title || 'Place';
+          const rating = b.rating ? `⭐ ${b.rating}` : '';
+          const price = b.price || '';
+          return `<div class="msr-item" onclick="mapShowExtResult(${i})">
+            <span style="font-size:0.7rem;">🍴</span>
+            <span><strong>${b.name}</strong> <span style="color:#7a8499;font-size:0.65rem;">· ${cat} · ${rating} ${price}</span></span>
+          </div>`;
+        }).join('');
+
+        window._mapYelpResults = data.businesses;
+
+        data.businesses.forEach((b, i) => {
+          if (!b.coordinates?.latitude || !b.coordinates?.longitude) return;
+          const city = b.location?.city?.toLowerCase() || '';
+          const state = b.location?.state || '';
+          if (!city.includes('cabo') && !state.includes('BS') && !state.includes('Baja')) return;
+
+          const icon = mapMakeExtIcon('#ff6b35', '🍴', 30);
+          const marker = L.marker([b.coordinates.latitude, b.coordinates.longitude], { icon })
+            .addTo(mapInstance)
+            .bindPopup(mapMakeExtPopup(b), { className: 'map-popup-wrapper' });
+          mapExtMarkers.push(marker);
+        });
+
+        if (mapExtMarkers.length > 0) {
+          const group = L.featureGroup(mapExtMarkers);
+          mapInstance.fitBounds(group.getBounds(), { padding: [50, 50], maxZoom: 13 });
+        }
+      }
+    } catch(err) {
+      console.error('Yelp search error:', err);
+      results.innerHTML = '<div class="msr-item" style="color:#f87171;">Yelp failed. Try OSM or All.</div>';
+    }
+  }
+
+  // ── OSM search ──────────────────────────────────────────
+  async function mapOSMSearch(q) {
+    const input = document.getElementById('map-search-input');
+    const results = document.getElementById('map-search-results');
+    q = (q || input.value || '').trim();
+    if (!q) return;
+
+    results.innerHTML = '<div class="msr-item" style="color:#fbbf24;">Searching OSM…</div>';
+    results.classList.add('show');
+
+    try {
+      const res = await fetch(
+        `https://nominatim.openstreetmap.org/search?format=json&q=${encodeURIComponent(q + ', Los Cabos, Mexico')}&limit=8&viewbox=${CABOS_BBOX}&bounded=1`,
+        { headers: { 'Accept': 'application/json' } }
+      ).then(r => r.json()).catch(() => []);
+
+      mapClearExtMarkers();
+
+      if (!res || res.length === 0) {
+        results.innerHTML = '<div class="msr-item" style="color:#7a8499;">No OSM results. Try Yelp or All.</div>';
+      } else {
+        results.innerHTML = res.map((r, i) => {
+          const type = (r.type || 'place');
+          const addr = r.display_name.split(',').slice(1, 4).join(',').trim();
+          return `<div class="msr-item" onclick="mapShowOSMResult(${i},${r.lat},${r.lon},'${r.display_name.replace(/'/g,"\\'")}')">
+            <span style="font-size:0.7rem;">📍</span>
+            <span><strong>${r.display_name.split(',')[0]}</strong> <span style="color:#7a8499;font-size:0.65rem;">· ${type}</span></span>
+          </div>`;
+        }).join('');
+
+        window._mapOSMResults = res;
+
+        res.forEach(r => {
+          const icon = mapMakeExtIcon('#fbbf24', '📍', 28);
+          const marker = L.marker([parseFloat(r.lat), parseFloat(r.lon)], { icon })
+            .addTo(mapInstance)
+            .bindPopup(`<div class="map-popup"><h4>📍 ${r.display_name.split(',')[0]}</h4><p style="color:#7a8499;font-size:0.7rem;">${r.display_name.split(',').slice(1,3).join(',').trim()}</p><a href="https://www.google.com/maps?q=${r.lat},${r.lon}" target="_blank" rel="noopener noreferrer" class="mp-link">📍 Maps →</a></div>`);
+          mapExtMarkers.push(marker);
+        });
+
+        if (mapExtMarkers.length > 0) {
+          const group = L.featureGroup(mapExtMarkers);
+          mapInstance.fitBounds(group.getBounds(), { padding: [50, 50], maxZoom: 13 });
+        }
+      }
+    } catch(err) {
+      results.innerHTML = '<div class="msr-item" style="color:#f87171;">OSM failed. Try Yelp or All.</div>';
+    }
+  }
+
+  // ── All providers at once ───────────────────────────────
+  async function mapSearchAll(q) {
+    const input = document.getElementById('map-search-input');
+    const results = document.getElementById('map-search-results');
+    q = (q || input.value || '').trim();
+    if (!q) return;
+
+    results.innerHTML = '<div class="msr-item" style="color:#00d4ff;">Searching all sources…</div>';
+    results.classList.add('show');
+
+    try {
+      const [osmRes, yelpData] = await Promise.all([
+        fetch(`https://nominatim.openstreetmap.org/search?format=json&q=${encodeURIComponent(q + ', Los Cabos, Mexico')}&limit=5&viewbox=${CABOS_BBOX}&bounded=1`, { headers: { 'Accept': 'application/json' } }).then(r => r.json()).catch(() => []),
+        fetch(`/api/yelp?term=${encodeURIComponent(q)}&location=Los+Cabos+Mexico`).then(r => r.json()).catch(() => ({}))
+      ]);
+
+      mapClearExtMarkers();
+      let html = '';
+
+      // Yelp results
+      const businesses = yelpData.businesses || [];
+      if (businesses.length > 0) {
+        window._mapYelpResults = businesses;
+        html += '<div class="msr-item" style="color:#7a8499;font-size:0.65rem;padding:4px 10px;">🍴 Yelp</div>';
+        html += businesses.slice(0, 5).map((b, i) => {
+          const rating = b.rating ? `⭐ ${b.rating}` : '';
+          return `<div class="msr-item" onclick="mapShowExtResult(${i})">🍴 ${b.name} <span style="color:#7a8499;font-size:0.65rem;">${rating}</span></div>`;
+        }).join('');
+
+        businesses.forEach(b => {
+          if (!b.coordinates?.latitude || !b.coordinates?.longitude) return;
+          const icon = mapMakeExtIcon('#ff6b35', '🍴', 30);
+          const marker = L.marker([b.coordinates.latitude, b.coordinates.longitude], { icon })
+            .addTo(mapInstance)
+            .bindPopup(mapMakeExtPopup(b), { className: 'map-popup-wrapper' });
+          mapExtMarkers.push(marker);
+        });
+      }
+
+      // OSM results
+      if (osmRes && osmRes.length > 0) {
+        window._mapOSMResults = osmRes;
+        html += '<div class="msr-item" style="color:#7a8499;font-size:0.65rem;padding:4px 10px;">📍 OSM</div>';
+        html += osmRes.slice(0, 5).map((r, i) => {
+          return `<div class="msr-item" onclick="mapShowOSMResult(${i},${r.lat},${r.lon},'${r.display_name.replace(/'/g,"\\'")}')">📍 ${r.display_name.split(',')[0]}</div>`;
+        }).join('');
+
+        osmRes.forEach(r => {
+          const icon = mapMakeExtIcon('#fbbf24', '📍', 28);
+          const marker = L.marker([parseFloat(r.lat), parseFloat(r.lon)], { icon })
+            .addTo(mapInstance)
+            .bindPopup(`<div class="map-popup"><h4>📍 ${r.display_name.split(',')[0]}</h4><a href="https://www.google.com/maps?q=${r.lat},${r.lon}" target="_blank" rel="noopener noreferrer" class="mp-link">📍 Maps →</a></div>`);
+          mapExtMarkers.push(marker);
+        });
+      }
+
+      if (!html) html = '<div class="msr-item" style="color:#7a8499;">No results found anywhere.</div>';
+      results.innerHTML = html;
+
+      if (mapExtMarkers.length > 0) {
+        const group = L.featureGroup(mapExtMarkers);
+        mapInstance.fitBounds(group.getBounds(), { padding: [50, 50], maxZoom: 13 });
+      }
+    } catch(err) {
+      results.innerHTML = '<div class="msr-item" style="color:#f87171;">Search failed. Try again.</div>';
+    }
+  }
+
+  function mapShowExtResult(index) {
+    const businesses = window._mapYelpResults || [];
+    const b = businesses[index];
+    if (!b?.coordinates) return;
+    document.getElementById('map-search-results').classList.remove('show');
+    document.getElementById('map-search-input').value = b.name;
+    mapInstance.flyTo([b.coordinates.latitude, b.coordinates.longitude], 15, { duration: 1.0 });
+    if (mapExtMarkers[index]) mapExtMarkers[index].openPopup();
+  }
+
+  function mapShowOSMResult(index, lat, lon, name) {
+    document.getElementById('map-search-results').classList.remove('show');
+    document.getElementById('map-search-input').value = name.split(',')[0];
+    mapInstance.flyTo([parseFloat(lat), parseFloat(lon)], 15, { duration: 1.0 });
+    if (mapExtMarkers[index]) mapExtMarkers[index].openPopup();
+  }
+
+  // ── Unified search dispatcher ──────────────────────────
+  function mapDoSearch() {
+    const q = document.getElementById('map-search-input').value.trim();
+    if (!q) return;
+    if (currentProvider === 'yelp') mapYelpSearch(q);
+    else if (currentProvider === 'osm') mapOSMSearch(q);
+    else mapSearchAll(q);
+  }
+
+  // Update Enter key to use the dispatcher
+  document.getElementById('map-search-input').onkeydown = function(e) {
+    if (e.key === 'Enter') { mapDoSearch(); document.getElementById('map-search-results').classList.remove('show'); }
+  };
+
+  // ── WebSocket vote update — refresh map markers ──────────────
+
   // ── Kick off ──────────────────────────────────────────────
   init();
 </script>
diff --git a/seed-data.js b/seed-data.js
new file mode 100644
index 0000000..d85a7c7
--- /dev/null
+++ b/seed-data.js
@@ -0,0 +1,586 @@
+const SEED_VERSION = 2;
+const PRICE_UPDATED_AT = '2026-04-29';
+
+const CATEGORY_META = {
+  hotel: { emoji: '🏨', color: '#3b82f6' },
+  golf: { emoji: '⛳', color: '#22c55e' },
+  nightlife: { emoji: '🎧', color: '#a855f7' },
+  excursion: { emoji: '🚤', color: '#06b6d4' },
+  itinerary: { emoji: '🗺️', color: '#fbbf24' },
+  budget: { emoji: '💸', color: '#f97316' },
+  results: { emoji: '🏆', color: '#facc15' },
+};
+
+const BUDGET_SCENARIOS = [
+  {
+    id: 'budget-8',
+    tier: 'Budget',
+    groupSize: 8,
+    perPerson: 1405,
+    groupTotal: 11240,
+    summary: 'Corazon + Palmilla + one shared activity + one nightlife night',
+    notes: [
+      'Flight estimate: $350',
+      'Hotel estimate: $450',
+      'Golf: Palmilla from $130',
+      'Activity: public sail / whale watch about $95',
+      'Food + drinks buffer: $275',
+      'Private round-trip transfer share: about $33',
+    ],
+  },
+  {
+    id: 'budget-10',
+    tier: 'Budget',
+    groupSize: 10,
+    perPerson: 1398,
+    groupTotal: 13980,
+    summary: 'Corazon + Palmilla + one shared activity + one nightlife night',
+    notes: [
+      'Flight estimate: $350',
+      'Hotel estimate: $450',
+      'Golf: Palmilla from $130',
+      'Activity: public sail / whale watch about $95',
+      'Food + drinks buffer: $275',
+      'Private round-trip transfer share: about $26',
+    ],
+  },
+  {
+    id: 'budget-12',
+    tier: 'Budget',
+    groupSize: 12,
+    perPerson: 1392,
+    groupTotal: 16704,
+    summary: 'Corazon + Palmilla + one shared activity + one nightlife night',
+    notes: [
+      'Flight estimate: $350',
+      'Hotel estimate: $450',
+      'Golf: Palmilla from $130',
+      'Activity: public sail / whale watch about $95',
+      'Food + drinks buffer: $275',
+      'Private round-trip transfer share: about $22',
+    ],
+  },
+  {
+    id: 'balanced-8',
+    tier: 'Balanced',
+    groupSize: 8,
+    perPerson: 1688,
+    groupTotal: 13504,
+    summary: 'Grand Fiesta Americana + golf + sunset sail + one nightlife night',
+    notes: [
+      'Flight estimate: $350',
+      'All-inclusive stay: $850',
+      'Golf: Cabo del Sol / similar from $180',
+      'Sunset sail: about $125',
+      'Nightlife + covers: $100',
+      'Transfer + resort buffer: about $83',
+    ],
+  },
+  {
+    id: 'balanced-10',
+    tier: 'Balanced',
+    groupSize: 10,
+    perPerson: 1681,
+    groupTotal: 16810,
+    summary: 'Grand Fiesta Americana + golf + sunset sail + one nightlife night',
+    notes: [
+      'Flight estimate: $350',
+      'All-inclusive stay: $850',
+      'Golf: Cabo del Sol / similar from $180',
+      'Sunset sail: about $125',
+      'Nightlife + covers: $100',
+      'Transfer + resort buffer: about $76',
+    ],
+  },
+  {
+    id: 'balanced-12',
+    tier: 'Balanced',
+    groupSize: 12,
+    perPerson: 1677,
+    groupTotal: 20124,
+    summary: 'Grand Fiesta Americana + golf + sunset sail + one nightlife night',
+    notes: [
+      'Flight estimate: $350',
+      'All-inclusive stay: $850',
+      'Golf: Cabo del Sol / similar from $180',
+      'Sunset sail: about $125',
+      'Nightlife + covers: $100',
+      'Transfer + resort buffer: about $72',
+    ],
+  },
+  {
+    id: 'splurge-8',
+    tier: 'Splurge',
+    groupSize: 8,
+    perPerson: 2484,
+    groupTotal: 19872,
+    summary: 'Breathless or Secrets + premium golf + private charter + VIP table',
+    notes: [
+      'Flight estimate: $400',
+      'Upscale all-inclusive stay: $1250',
+      'Premium golf: Quivira / similar about $250',
+      'Private whale or charter share: about $188',
+      'VIP nightlife share: about $213',
+      'Transfers + premium dinner buffer: about $183',
+    ],
+  },
+  {
+    id: 'splurge-10',
+    tier: 'Splurge',
+    groupSize: 10,
+    perPerson: 2346,
+    groupTotal: 23460,
+    summary: 'Breathless or Secrets + premium golf + private charter + VIP table',
+    notes: [
+      'Flight estimate: $400',
+      'Upscale all-inclusive stay: $1250',
+      'Premium golf: Quivira / similar about $250',
+      'Private whale or charter share: about $150',
+      'VIP nightlife share: about $170',
+      'Transfers + premium dinner buffer: about $126',
+    ],
+  },
+  {
+    id: 'splurge-12',
+    tier: 'Splurge',
+    groupSize: 12,
+    perPerson: 2289,
+    groupTotal: 27468,
+    summary: 'Breathless or Secrets + premium golf + private charter + VIP table',
+    notes: [
+      'Flight estimate: $400',
+      'Upscale all-inclusive stay: $1250',
+      'Premium golf: Quivira / similar about $250',
+      'Private whale or charter share: about $125',
+      'VIP nightlife share: about $142',
+      'Transfers + premium dinner buffer: about $122',
+    ],
+  },
+];
+
+function createOption(option) {
+  const categoryColor = CATEGORY_META[option.categoryId]?.color || '#888';
+  const primaryUrl = option.links?.[0]?.url || option.url || null;
+  return {
+    approved: true,
+    addedBy: 'system',
+    votes: [],
+    details: [],
+    links: [],
+    categoryColor,
+    url: primaryUrl,
+    ...option,
+    categoryColor,
+    url: primaryUrl,
+  };
+}
+
+function buildSeedData() {
+  return {
+    seedVersion: SEED_VERSION,
+    priceUpdatedAt: PRICE_UPDATED_AT,
+    categories: [
+      { id: 'hotel', name: 'Hotels', emoji: '🏨' },
+      { id: 'golf', name: 'Golf', emoji: '⛳' },
+      { id: 'nightlife', name: 'Nightlife', emoji: '🎧' },
+      { id: 'excursion', name: 'Excursions', emoji: '🚤' },
+      { id: 'itinerary', name: 'Itineraries', emoji: '🗺️' },
+      { id: 'budget', name: 'Budget', emoji: '💸' },
+      { id: 'results', name: 'Results', emoji: '🏆' },
+    ],
+    budgetScenarios: BUDGET_SCENARIOS,
+    options: [
+      createOption({
+        id: 'hotel-corazon',
+        seedKey: 'hotel-corazon',
+        categoryId: 'hotel',
+        name: 'Corazon Cabo Resort & Spa',
+        desc: 'Best party-first base on Medano Beach. Walkable to downtown and Costco package pages currently show transfer-inclusive offers plus 4th or 5th night promos.',
+        lat: 23.0639,
+        lng: -109.6991,
+        details: ['KAYAK recent rooms $173-$551/night', 'Costco package', 'Walk to marina nightlife'],
+        links: [
+          { label: 'Official', url: 'https://www.corazoncabo.com/' },
+          { label: 'Costco Travel', url: 'https://www.costcotravel.com/Vacation-Packages/Offers/MEXLOSCABOSCORAZON20230510' },
+          { label: 'KAYAK', url: 'https://www.kayak.com/Cabo-San-Lucas-Hotels-Cabo-Villas-Beach-Resort-Spa.58565.ksp' },
+        ],
+      }),
+      createOption({
+        id: 'hotel-breathless',
+        seedKey: 'hotel-breathless',
+        categoryId: 'hotel',
+        name: 'Breathless Cabo San Lucas',
+        desc: 'Adults-only, marina-facing, and the easiest all-inclusive pick for a true bachelor-party vibe.',
+        lat: 23.0628,
+        lng: -109.6981,
+        details: ['Apple Vacations from $942 pp / 3 nights', 'KAYAK from $393/night', 'Adults-only'],
+        links: [
+          { label: 'Official', url: 'https://www.hyattinclusivecollection.com/en/resorts-hotels/breathless/mexico/cabo-san-lucas-resort-spa/' },
+          { label: 'Hyatt', url: 'https://www.hyatt.com/en-US/hotel/mexico/breathless-cabo-san-lucas/brcsl' },
+          { label: 'Costco Travel', url: 'https://www.costcotravel.com/Vacation-Packages/Offers/MEXLOSCABOSBREATHE20230330' },
+          { label: 'Apple Vacations', url: 'https://www.applevacations.com/hotels/breathless-cabo-san-lucas-resort-spa-all-inclusive-adults-only?cachefaretype=&destinationcode=SJD&dynamicpackageid=H01&los=3&mode=0&onsaleid=1398047&traveldate=2026-05-10' },
+        ],
+      }),
+      createOption({
+        id: 'hotel-grand-fiesta',
+        seedKey: 'hotel-grand-fiesta',
+        categoryId: 'hotel',
+        name: 'Grand Fiesta Americana Los Cabos',
+        desc: 'Best overall balance for golf + all-inclusive + quality. Strong fit if the group wants one easy answer without going full splurge.',
+        lat: 23.0949,
+        lng: -109.7067,
+        details: ['Apple Vacations from $859 pp / 3 nights', 'KAYAK from $209/night', 'Golf-friendly'],
+        links: [
+          { label: 'Official', url: 'https://www.fiestamericana.com/en/hotels/grand-fiesta-americana-los-cabos' },
+          { label: 'Costco Travel', url: 'https://www.costcotravel.com/Vacation-Packages/Offers/MEXLOSCABOSGRANDFIESTA20171011' },
+          { label: 'Apple Vacations', url: 'https://www.applevacations.com/HotelById?cachefaretype=&destinationcode=SJD&dynamicpackageid=H01&hotelcode=43000&los=3&mode=0&onsaleid=1614780&redirect=false&remotesourcecode=HBSHotel&traveldate=&vendorcode=APV' },
+          { label: 'KAYAK', url: 'https://www.kayak.com/Cabo-San-Lucas-Hotels-Grand-Fiesta-Americana-Los-Cabos-Golf-Spa.331383.ksp' },
+        ],
+      }),
+      createOption({
+        id: 'hotel-secrets',
+        seedKey: 'hotel-secrets',
+        categoryId: 'hotel',
+        name: 'Secrets Puerto Los Cabos',
+        desc: 'Upscale adults-only pick with strong group-trip polish. Better for a luxe weekend than a chaos-first party hotel.',
+        lat: 23.0227,
+        lng: -109.7062,
+        details: ['CheapCaribbean from $885 pp / 3 nights', '4-night examples from $1,108 pp', 'Adults-only'],
+        links: [
+          { label: 'Official', url: 'https://www.hyattinclusivecollection.com/en/resorts-hotels/secrets/mexico/puerto-los-cabos-golf-spa-resort/' },
+          { label: 'Costco Travel', url: 'https://www.costcotravel.com/Vacation-Packages/Offers/MEXLOSCABOSSECRETSPUERT20230330' },
+          { label: 'CheapCaribbean', url: 'https://www.cheapcaribbean.com/HotelById/?cachefaretype=&destinationcode=SJD&dynamicpackageid=H01&hotelcode=SJDSCRT&los=3&mode=0&onsaleid=2173329&redirect=false&remotesourcecode=LtmsHotel&traveldate=&vendorcode=CCV' },
+          { label: 'KAYAK', url: 'https://www.kayak.com/San-Jose-del-Cabo-Hotels-Secrets-Puerto-Los-Cabos-Adults-Only.551846.ksp' },
+        ],
+      }),
+      createOption({
+        id: 'hotel-pacifica',
+        seedKey: 'hotel-pacifica',
+        categoryId: 'hotel',
+        name: 'Pueblo Bonito Pacifica',
+        desc: 'Luxury adults-only option with Quivira access. Best if the trip is really a premium golf weekend with nightlife as a side quest.',
+        lat: 23.0474,
+        lng: -109.7053,
+        details: ['Adults-only', 'Quivira access', 'Luxury retreat'],
+        links: [
+          { label: 'Official', url: 'https://www.pueblobonito.com/resorts/pacifica?resort=4' },
+          { label: 'Quivira FAQ', url: 'https://www.pueblobonito.com/resorts/pacifica/faq' },
+        ],
+      }),
+      createOption({
+        id: 'golf-palmilla',
+        seedKey: 'golf-palmilla',
+        categoryId: 'golf',
+        name: 'Palmilla Golf Club',
+        desc: 'Best public price signal I found with transparent inclusions: green fee, shared cart, practice facilities, and bottled water.',
+        lat: 23.0519,
+        lng: -109.7058,
+        details: ['From $130 pp', 'Shared cart included', 'Strong budget-track pick'],
+        links: [
+          { label: 'Cabo Villas Golf', url: 'https://www.cabovillas.com/golf/palmilla' },
+          { label: 'Visit Los Cabos Golf Guide', url: 'https://www.visitloscabos.travel/golf/' },
+        ],
+      }),
+      createOption({
+        id: 'golf-cabo-del-sol',
+        seedKey: 'golf-cabo-del-sol',
+        categoryId: 'golf',
+        name: 'Cabo del Sol',
+        desc: 'The most natural golf pairing for Grand Fiesta Americana and the balanced-track itinerary.',
+        lat: 23.0569,
+        lng: -109.6962,
+        details: ['Use about $180 as current planning number', 'Best balanced-track fit', 'Ocean-desert layout'],
+        links: [
+          { label: 'Official', url: 'https://cabodelsol.com/' },
+          { label: 'Visit Los Cabos Golf Guide', url: 'https://www.visitloscabos.travel/golf/' },
+        ],
+      }),
+      createOption({
+        id: 'golf-quivira',
+        seedKey: 'golf-quivira',
+        categoryId: 'golf',
+        name: 'Quivira Golf Club',
+        desc: 'Premium golf move for the splurge weekend. Access is easiest through the Pueblo Bonito / Pacifica side of the destination.',
+        lat: 23.0403,
+        lng: -109.7221,
+        details: ['Use about $250 for planning', 'Pairs with Pacifica', 'Signature ocean holes'],
+        links: [
+          { label: 'Official', url: 'https://www.quiviraloscabos.com/golf/' },
+          { label: 'Pacifica FAQ', url: 'https://www.pueblobonito.com/resorts/pacifica/faq' },
+        ],
+      }),
+      createOption({
+        id: 'golf-puerto-los-cabos',
+        seedKey: 'golf-puerto-los-cabos',
+        categoryId: 'golf',
+        name: 'Puerto Los Cabos Golf',
+        desc: 'Most natural pairing with Secrets Puerto Los Cabos if the group picks the upscale San Jose side.',
+        lat: 23.0308,
+        lng: -109.6964,
+        details: ['Convenient from Secrets', 'Upscale east-cape feel', 'Good alternative to Quivira'],
+        links: [
+          { label: 'Visit Los Cabos Golf Guide', url: 'https://www.visitloscabos.travel/golf/' },
+          { label: 'Secrets Official', url: 'https://www.hyattinclusivecollection.com/en/resorts-hotels/secrets/mexico/puerto-los-cabos-golf-spa-resort/' },
+        ],
+      }),
+      createOption({
+        id: 'nightlife-cabo-bash',
+        seedKey: 'nightlife-cabo-bash',
+        categoryId: 'nightlife',
+        name: 'Cabo Bash VIP Nightlife',
+        desc: 'Most turnkey option if you want the weekend hosted instead of DIY. They also coordinate yachts, villas, and day clubs.',
+        lat: 23.0627,
+        lng: -109.6989,
+        details: ['Gold package for 16 guests: $1,700', 'Concierge coordination', 'Strongest bachelor specialist'],
+        links: [
+          { label: 'Bachelor Parties', url: 'https://www.cabobash.com/bachelor.html' },
+          { label: 'Nightlife', url: 'https://www.cabobash.com/nightlife.html' },
+          { label: 'Day Clubs', url: 'https://www.cabobash.com/day-clubs.html' },
+        ],
+      }),
+      createOption({
+        id: 'nightlife-cabo-agency',
+        seedKey: 'nightlife-cabo-agency',
+        categoryId: 'nightlife',
+        name: 'The Cabo Agency VIP Tables',
+        desc: 'Best if you want to book specific tables instead of a full concierge weekend.',
+        lat: 23.0692,
+        lng: -109.6993,
+        details: ['Cabo Wabo VIP table $155 with $100 credit', 'Booth $400 with $300 credit', 'A la carte nightlife'],
+        links: [
+          { label: 'VIP Tables', url: 'https://www.thecaboagency.com/cabo_vip_tables.php' },
+          { label: 'Entertainment Packages', url: 'https://www.thecaboagency.com/cabo_entertainment_packages.php' },
+        ],
+      }),
+      createOption({
+        id: 'nightlife-taboo',
+        seedKey: 'nightlife-taboo',
+        categoryId: 'nightlife',
+        name: 'Taboo Beach Club',
+        desc: 'High-spend daytime flex. Better for a splashy afternoon than an all-weekend base.',
+        lat: 23.0637,
+        lng: -109.7001,
+        details: ['Pool island for 4: $884', 'Cabana for 8: $2,060', 'Use for splurge tier'],
+        links: [
+          { label: 'Cabo Bash Day Clubs', url: 'https://www.cabobash.com/day-clubs.html' },
+        ],
+      }),
+      createOption({
+        id: 'nightlife-mango-deck',
+        seedKey: 'nightlife-mango-deck',
+        categoryId: 'nightlife',
+        name: 'Mango Deck / Office Zone',
+        desc: 'Best lower-spend party zone if you want daytime chaos close to Medano Beach without burning the whole budget.',
+        lat: 23.0631,
+        lng: -109.6995,
+        details: ['Mango Deck deposit from $40 pp', 'Easy with Corazon', 'Budget-track friendly'],
+        links: [
+          { label: 'Cabo Bash Day Clubs', url: 'https://www.cabobash.com/day-clubs.html' },
+        ],
+      }),
+      createOption({
+        id: 'excursion-whale-public',
+        seedKey: 'excursion-whale-public',
+        categoryId: 'excursion',
+        name: 'Cabo Adventures Whale Watching',
+        desc: 'February is prime whale season, and this is the cleanest official public-tour price signal I found.',
+        lat: 23.0626,
+        lng: -109.7004,
+        details: ['From $76', 'Prime season in February', 'Dock fee and transport extras may apply'],
+        links: [
+          { label: 'Official', url: 'https://www.cabo-adventures.com/en/' },
+          { label: 'Whale Season Guide', url: 'https://www.visitloscabos.travel/blog/post/whale-watching-in-los-cabos-2025-the-ultimate-guide-to-an-unforgettable-season/' },
+        ],
+      }),
+      createOption({
+        id: 'excursion-whale-private',
+        seedKey: 'excursion-whale-private',
+        categoryId: 'excursion',
+        name: 'Private Whale Watching Charter',
+        desc: 'Best splurge-group activity because the per-person hit gets much better as the group size rises.',
+        lat: 23.0626,
+        lng: -109.7004,
+        details: ['From $1,504 total', 'About $188 pp at 8', 'About $125 pp at 12'],
+        links: [
+          { label: 'Cabo Adventures Private Tours', url: 'https://www.cabo-adventures.com/en/tours/private-cabo/' },
+        ],
+      }),
+      createOption({
+        id: 'excursion-atv',
+        seedKey: 'excursion-atv',
+        categoryId: 'excursion',
+        name: 'ATV Desert Adventure',
+        desc: 'Classic bachelor-party activity with a real extra-fee caveat worth budgeting up front.',
+        lat: 23.0289,
+        lng: -109.6689,
+        details: ['About $78-$91', '$35 damage waiver per vehicle', 'Entrance fee noted at check-in'],
+        links: [
+          { label: 'Tour Landing Page', url: 'https://www.cabo-adventures.com/en/tours/land-adventures/' },
+          { label: 'ATV Details', url: 'https://www.cabo-adventures.com/en/tour/atv-desert-adventure/' },
+        ],
+      }),
+      createOption({
+        id: 'excursion-sail',
+        seedKey: 'excursion-sail',
+        categoryId: 'excursion',
+        name: 'Sunset Sail / Public Yacht Day',
+        desc: 'Best balanced activity if the group wants a solid Cabo moment without chartering the entire day.',
+        lat: 23.0634,
+        lng: -109.6978,
+        details: ['Public sail from $109', 'Sunset sail $124.50', 'Private 38 foot sailboat from $855.94'],
+        links: [
+          { label: 'Cabo Sailing', url: 'https://www.cabovillas.com/water-tours/cabo-sailing' },
+        ],
+      }),
+      createOption({
+        id: 'itinerary-budget',
+        seedKey: 'itinerary-budget',
+        categoryId: 'itinerary',
+        name: 'Budget Track: Corazon + Palmilla + Public Activity',
+        desc: 'Best option if the group wants a real Cabo bachelor trip while keeping the all-in number close to the low-$1.4k range before extra bar tabs.',
+        lat: 23.0639,
+        lng: -109.6991,
+        details: ['8 guys: about $1,405 pp', '10 guys: about $1,398 pp', '12 guys: about $1,392 pp'],
+        links: [
+          { label: 'Corazon', url: 'https://www.corazoncabo.com/' },
+          { label: 'Palmilla', url: 'https://www.cabovillas.com/golf/palmilla' },
+          { label: 'Transfers', url: 'https://www.cabovillas.com/transportation' },
+        ],
+      }),
+      createOption({
+        id: 'itinerary-balanced',
+        seedKey: 'itinerary-balanced',
+        categoryId: 'itinerary',
+        name: 'Balanced Track: Grand Fiesta + Golf + Sail',
+        desc: 'Best all-around answer for a group that wants fewer logistics, a nice resort, and one clean golf day.',
+        lat: 23.0949,
+        lng: -109.7067,
+        details: ['8 guys: about $1,688 pp', '10 guys: about $1,681 pp', '12 guys: about $1,677 pp'],
+        links: [
+          { label: 'Grand Fiesta', url: 'https://www.fiestamericana.com/en/hotels/grand-fiesta-americana-los-cabos' },
+          { label: 'Costco Package', url: 'https://www.costcotravel.com/Vacation-Packages/Offers/MEXLOSCABOSGRANDFIESTA20171011' },
+          { label: 'Sailing', url: 'https://www.cabovillas.com/water-tours/cabo-sailing' },
+        ],
+      }),
+      createOption({
+        id: 'itinerary-splurge',
+        seedKey: 'itinerary-splurge',
+        categoryId: 'itinerary',
+        name: 'Splurge Track: Breathless or Secrets + Premium Golf + VIP Night',
+        desc: 'Best if the weekend is really about going big once, with the budget climbing above $2.2k per person depending on group size.',
+        lat: 23.0628,
+        lng: -109.6981,
+        details: ['8 guys: about $2,484 pp', '10 guys: about $2,346 pp', '12 guys: about $2,289 pp'],
+        links: [
+          { label: 'Breathless', url: 'https://www.hyattinclusivecollection.com/en/resorts-hotels/breathless/mexico/cabo-san-lucas-resort-spa/' },
+          { label: 'Secrets', url: 'https://www.hyattinclusivecollection.com/en/resorts-hotels/secrets/mexico/puerto-los-cabos-golf-spa-resort/' },
+          { label: 'VIP Tables', url: 'https://www.thecaboagency.com/cabo_vip_tables.php' },
+        ],
+      }),
+      createOption({
+        id: 'itinerary-concierge',
+        seedKey: 'itinerary-concierge',
+        categoryId: 'itinerary',
+        name: 'Concierge Route: Cabo Bash / Cabo Agency',
+        desc: 'Best if the group wants to stop spreadsheeting and hand flights, villas, yachts, transfers, and nightlife to a specialist.',
+        lat: 23.0633,
+        lng: -109.6992,
+        details: ['Most turnkey', 'Great for split budgets', 'Request quote for final pricing'],
+        links: [
+          { label: 'Cabo Bash', url: 'https://www.cabobash.com/bachelor.html' },
+          { label: 'The Cabo Agency', url: 'https://www.thecaboagency.com/cabo_bachelor_party.php' },
+          { label: 'Blue Desert Package', url: 'https://www.bluedesertcabo.com/activities/packages/bachelor-party-vacation-package/' },
+        ],
+      }),
+      createOption({
+        id: 'budget-option-budget',
+        seedKey: 'budget-option-budget',
+        categoryId: 'budget',
+        name: 'Budget Track',
+        desc: 'Corazon + one golf round + one public activity + one nightlife night. Best value if you want the trip fun but not financially reckless.',
+        details: ['8: $1,405 pp', '10: $1,398 pp', '12: $1,392 pp'],
+        links: [
+          { label: 'Corazon', url: 'https://www.corazoncabo.com/' },
+          { label: 'Palmilla', url: 'https://www.cabovillas.com/golf/palmilla' },
+        ],
+      }),
+      createOption({
+        id: 'budget-option-balanced',
+        seedKey: 'budget-option-balanced',
+        categoryId: 'budget',
+        name: 'Balanced Track',
+        desc: 'Grand Fiesta all-inclusive + better golf + sunset sail + one nightlife push. Strongest overall bachelor-weekend value.',
+        details: ['8: $1,688 pp', '10: $1,681 pp', '12: $1,677 pp'],
+        links: [
+          { label: 'Grand Fiesta', url: 'https://www.fiestamericana.com/en/hotels/grand-fiesta-americana-los-cabos' },
+          { label: 'Costco Travel', url: 'https://www.costcotravel.com/Vacation-Packages/Offers/MEXLOSCABOSGRANDFIESTA20171011' },
+        ],
+      }),
+      createOption({
+        id: 'budget-option-splurge',
+        seedKey: 'budget-option-splurge',
+        categoryId: 'budget',
+        name: 'Splurge Track',
+        desc: 'Adults-only resort, premium golf, private charter, and VIP nightlife. This is the blowout version.',
+        details: ['8: $2,484 pp', '10: $2,346 pp', '12: $2,289 pp'],
+        links: [
+          { label: 'Breathless', url: 'https://www.hyattinclusivecollection.com/en/resorts-hotels/breathless/mexico/cabo-san-lucas-resort-spa/' },
+          { label: 'Private Tour', url: 'https://www.cabo-adventures.com/en/tours/private-cabo/' },
+        ],
+      }),
+    ],
+    voters: [],
+    pollsOpen: true,
+  };
+}
+
+function mergeSeedData(existing = {}) {
+  const seed = buildSeedData();
+  const existingOptions = Array.isArray(existing.options) ? existing.options : [];
+  const mergedSeedOptions = seed.options.map((seedOption) => {
+    const match = existingOptions.find((option) => (
+      option.seedKey === seedOption.seedKey
+      || (option.addedBy === 'system' && option.categoryId === seedOption.categoryId && option.name === seedOption.name)
+    ));
+
+    return {
+      ...seedOption,
+      votes: Array.isArray(match?.votes) ? match.votes : [],
+      approved: typeof match?.approved === 'boolean' ? match.approved : seedOption.approved,
+      addedBy: match?.addedBy || seedOption.addedBy,
+    };
+  });
+
+  const preservedCustomOptions = existingOptions.filter((option) => {
+    if (option.addedBy === 'system') return false;
+
+    return !mergedSeedOptions.some((seedOption) => (
+      (seedOption.seedKey && option.seedKey === seedOption.seedKey)
+      || (seedOption.categoryId === option.categoryId && seedOption.name === option.name)
+    ));
+  });
+
+  const existingCategories = Array.isArray(existing.categories) ? existing.categories : [];
+  const preservedCustomCategories = existingCategories.filter(
+    (category) => !seed.categories.some((seedCategory) => seedCategory.id === category.id),
+  );
+
+  return {
+    ...existing,
+    seedVersion: seed.seedVersion,
+    priceUpdatedAt: seed.priceUpdatedAt,
+    categories: [...seed.categories, ...preservedCustomCategories],
+    budgetScenarios: seed.budgetScenarios,
+    options: [...mergedSeedOptions, ...preservedCustomOptions],
+    voters: Array.isArray(existing.voters) ? existing.voters : [],
+    pollsOpen: typeof existing.pollsOpen === 'boolean' ? existing.pollsOpen : true,
+  };
+}
+
+module.exports = {
+  SEED_VERSION,
+  PRICE_UPDATED_AT,
+  CATEGORY_META,
+  buildSeedData,
+  mergeSeedData,
+};
diff --git a/server.js b/server.js
index 5de8857..f9c74a6 100644
--- a/server.js
+++ b/server.js
@@ -5,6 +5,7 @@ const http = require('http');
 const path = require('path');
 const fs = require('fs');
 const { v4: uuidv4 } = require('uuid');
+const { CATEGORY_META, buildSeedData, mergeSeedData } = require('./seed-data');
 
 const app = express();
 const server = http.createServer(app);
@@ -16,168 +17,191 @@ const DATA_FILE = path.join(DATA_DIR, 'votes.json');
 app.use(cors());
 app.use(express.json());
 
-// Admin panel
 app.get('/admin', (req, res) => {
   res.sendFile(path.join(__dirname, 'public', 'admin.html'));
 });
 
 app.use(express.static(path.join(__dirname, 'public')));
 
-// ── Data helpers ──────────────────────────────────────────────
-
 function loadData() {
   if (!fs.existsSync(DATA_DIR)) fs.mkdirSync(DATA_DIR, { recursive: true });
+
   if (!fs.existsSync(DATA_FILE)) {
     const seed = buildSeedData();
     fs.writeFileSync(DATA_FILE, JSON.stringify(seed, null, 2));
     return seed;
   }
-  return JSON.parse(fs.readFileSync(DATA_FILE, 'utf8'));
+
+  const existing = JSON.parse(fs.readFileSync(DATA_FILE, 'utf8'));
+  const merged = mergeSeedData(existing);
+
+  if (JSON.stringify(existing) !== JSON.stringify(merged)) {
+    fs.writeFileSync(DATA_FILE, JSON.stringify(merged, null, 2));
+  }
+
+  return merged;
 }
 
-function saveData(data) {
-  fs.writeFileSync(DATA_FILE, JSON.stringify(data, null, 2));
+function saveData(nextData) {
+  fs.writeFileSync(DATA_FILE, JSON.stringify(nextData, null, 2));
+}
+
+function approvedOptionsWithVoteSummary() {
+  return data.options
+    .filter((option) => option.approved)
+    .map((option) => ({
+      id: option.id,
+      votes: option.votes.length,
+      voters: option.votes.map((vote) => vote.name),
+    }));
 }
 
 function broadcast(payload) {
   const msg = JSON.stringify(payload);
-  wss.clients.forEach(client => {
+  wss.clients.forEach((client) => {
     if (client.readyState === 1) client.send(msg);
   });
 }
 
-// ── Seed data ─────────────────────────────────────────────────
-
-function buildSeedData() {
+function buildRealtimeSnapshot() {
   return {
-    categories: [
-      { id: 'hotel',     name: 'Hotels',      emoji: '🏨' },
-      { id: 'golf',      name: 'Golf',         emoji: '⛳' },
-      { id: 'nightlife', name: 'Nightlife',    emoji: '🎧' },
-      { id: 'excursion', name: 'Excursions',  emoji: '🚤' },
-      { id: 'itinerary', name: 'Itineraries', emoji: '🗺️' },
-      { id: 'results',   name: 'Results',     emoji: '🏆' },
-    ],
-    options: [
-      // Hotels
-      { id: uuidv4(), categoryId: 'hotel', name: 'Grand Fiesta Americana', desc: 'Premium all-inclusive · Golf packages · 5⭐ · ~$223/night', url: 'https://www.fiestamericana.com/en/hotels/grand-fiesta-americana-los-cabos', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'hotel', name: 'Hotel Riu Palace', desc: 'High-energy beachfront · 5⭐ · ~$250/night', url: 'https://www.riu.com/en/hotel/los-cabos/hotel-riu-palace-cabo-san-lucas/', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'hotel', name: 'Marquis Los Cabos', desc: 'Luxury adults-only · Infinity pool · ~$300/night', url: 'https://www.marquisloscabos.com', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'hotel', name: 'Pueblo Bonito Pacifica', desc: 'Exclusive Quivira Golf Club access · Adults-only · ~$280/night', url: 'https://www.pueblobonito.com/pacifica', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'hotel', name: 'ME Cabo', desc: 'Adults-only · Buzzing beach club · ~$200/night', url: 'https://www.mecabo.com', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'hotel', name: 'Hacienda Encantada', desc: 'Condo-feel all-inclusive · 2BR Suites · ~$180/night', url: 'https://www.haciendaencantada.com', addedBy: 'system', approved: true, votes: [] },
-      // Golf
-      { id: uuidv4(), categoryId: 'golf', name: 'Quivira Golf Club', desc: 'Jack Nicklaus signature · Ocean views · $250/round', url: 'https://quiviraloscabos.com', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'golf', name: 'Cabo Del Sol Golf', desc: 'Desert-ocean layout · 18 holes · $180/round', url: 'https://www.cabodelsol.com/golf', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'golf', name: 'Solmar Golf Links', desc: 'Seaside championship course · $160/round', url: 'https://www.solmargolflinks.com', addedBy: 'system', approved: true, votes: [] },
-      // Nightlife
-      { id: uuidv4(), categoryId: 'nightlife', name: 'El Squid Roe', desc: '3 floors · $40–50 cover · Open til 4am', url: 'https://www.elsquidroe.com', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'nightlife', name: 'Mandala Nightclub', desc: 'VIP tables · $50 cover · High-energy', url: 'https://www.mandalacabo.com', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'nightlife', name: 'Cabo Wabo Cantina', desc: "Sammy Hagar's · Live music · $30 cover", url: 'https://www.cabowabocantina.com', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'nightlife', name: 'Crush Nightspot', desc: 'Upscale lounge · Craft cocktails · ~$30 cover', url: 'https://www.crushcabo.com', addedBy: 'system', approved: true, votes: [] },
-      // Excursions
-      { id: uuidv4(), categoryId: 'excursion', name: 'Private Yacht to The Arch', desc: 'Quivira Yacht Club · $250/person · 2hr', url: 'https://www.viator.com/tours/Los-Cabos/Private-Luxury-Yacht-Charter/d637-11242P30', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'excursion', name: 'Wild Canyon Adventure', desc: 'Zipline · Bungee jump · $80/person', url: 'https://www.viator.com/tours/Los-Cabos/Wild-Canyon-Adventure/d637-11166P4', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'excursion', name: 'ATV Desert Adventure', desc: 'Cerro de la Zanta · $100/person · 3hr', url: 'https://www.viator.com/tours/Los-Cabos/ATV-Desert-Adventure-from-Cabo-San-Lucas/d637-11166P1', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'excursion', name: 'Sunset Sail Cruise', desc: 'Medano Beach departure · $80/person · 2hr', url: 'https://www.viator.com/tours/Los-Cabos/Sunset-Sail-Cruise-from-Cabo-San-Lucas/d637-11166P6', addedBy: 'system', approved: true, votes: [] },
-      { id: uuidv4(), categoryId: 'excursion', name: 'Cabo Shark Dive', desc: 'Cage-free shark encounter · $150/person', url: 'https://www.viator.com/tours/Los-Cabos/Cabo-Shark-Dive/d637-11166P8', addedBy: 'system', approved: true, votes: [] },
-      // Itineraries
-      { id: uuidv4(), categoryId: 'itinerary', name: 'Plan A — Multi-Activity Action', desc: 'ATV · VIP Cabana · Quivira Golf · Yacht · $1,870–$1,920/person', url: null, addedBy: 'system', approved: true, votes: [], details: ['Quivira Golf $250', 'Private Yacht $250', 'ATV $100', 'VIP Cabanas $80', 'Nightlife $45', 'Transfers $30', 'Hotel 5 nights ~$1,115'] },
-      { id: uuidv4(), categoryId: 'itinerary', name: 'Plan B — Flexible Drop-In', desc: 'Staggered arrivals · Mix & match · $1,577–$1,870/person', url: null, addedBy: 'system', approved: true, votes: [], details: ['ME Cabo 4 nights ~$1,000', 'Beach clubs $20–30/day', 'Flexible dining $200', 'Nightlife $40–60', 'Sunset cruise $80', 'Transfers $30'] },
-      { id: uuidv4(), categoryId: 'itinerary', name: 'Plan C — Budget Golf Bundle', desc: 'Grand Fiesta Americana + Golf PKG · ~$1,600/person', url: null, addedBy: 'system', approved: true, votes: [], details: ['GFA golf package 5 nights ~$900', 'Quivira + Cabo Del Sol $150', 'Office Beach Club $25', 'Mandala $50', 'Transfers $25'] },
-    ],
-    voters: [],
-    pollsOpen: true,
+    type: 'init',
+    pollsOpen: data.pollsOpen,
+    categories: data.categories,
+    options: data.options.filter((option) => option.approved),
+    results: approvedOptionsWithVoteSummary(),
+    totalVoters: data.voters.length,
+    budgetScenarios: data.budgetScenarios || [],
+    priceUpdatedAt: data.priceUpdatedAt || null,
+  };
+}
+
+function createUserOption({ categoryId, name, desc, url, voterName, lat, lng, approved }) {
+  return {
+    id: uuidv4(),
+    seedKey: null,
+    categoryId,
+    name: name.trim(),
+    desc: (desc || '').trim(),
+    url: url ? url.trim() : null,
+    links: url ? [{ label: 'Website', url: url.trim() }] : [],
+    lat: lat || null,
+    lng: lng || null,
+    addedBy: voterName,
+    approved,
+    votes: [],
+    details: [],
+    categoryColor: CATEGORY_META[categoryId]?.color || '#888',
   };
 }
 
 let data = loadData();
 
-// ── API Routes ───────────────────────────────────────────────
-
-// Get all categories
 app.get('/api/categories', (req, res) => {
   res.json(data.categories);
 });
 
-// Get options (optionally filter by category)
 app.get('/api/options', (req, res) => {
   const { category, includeUnapproved } = req.query;
   let options = data.options;
-  if (category) options = options.filter(o => o.categoryId === category);
-  if (!includeUnapproved) options = options.filter(o => o.approved);
+
+  if (category) options = options.filter((option) => option.categoryId === category);
+  if (!includeUnapproved) options = options.filter((option) => option.approved);
+
   res.json(options);
 });
 
-// Get results summary (votes per option, grouped by category)
 app.get('/api/results', (req, res) => {
-  const results = data.categories.map(cat => ({
-    ...cat,
+  const results = data.categories.map((category) => ({
+    ...category,
     options: data.options
-      .filter(o => o.approved && o.categoryId === cat.id)
-      .map(o => ({ ...o, voteCount: o.votes.length }))
+      .filter((option) => option.approved && option.categoryId === category.id)
+      .map((option) => ({ ...option, voteCount: option.votes.length })),
   }));
-  res.json({ pollsOpen: data.pollsOpen, results, totalVoters: data.voters.length });
+
+  res.json({
+    pollsOpen: data.pollsOpen,
+    results,
+    totalVoters: data.voters.length,
+    budgetScenarios: data.budgetScenarios || [],
+    priceUpdatedAt: data.priceUpdatedAt || null,
+  });
+});
+
+app.get('/api/budgets', (req, res) => {
+  res.json({
+    updatedAt: data.priceUpdatedAt || null,
+    scenarios: data.budgetScenarios || [],
+  });
 });
 
-// Vote for an option (one vote per person per category — replaces previous vote)
 app.post('/api/vote', (req, res) => {
   const { optionId, voterName } = req.body;
-  if (!voterName || !optionId) return res.status(400).json({ error: 'Missing fields' });
-  if (!data.pollsOpen) return res.status(403).json({ error: 'Polls are closed' });
 
-  const option = data.options.find(o => o.id === optionId);
-  if (!option || !option.approved) return res.status(404).json({ error: 'Option not found' });
-
-  // Remove existing vote by this voter in the same category
-  const prevVote = data.options.find(o => o.votes.some(v => v.name === voterName) && o.categoryId === option.categoryId);
-  if (prevVote) {
-    prevVote.votes = prevVote.votes.filter(v => v.name !== voterName);
+  if (!voterName || !optionId) {
+    return res.status(400).json({ error: 'Missing fields' });
+  }
+  if (!data.pollsOpen) {
+    return res.status(403).json({ error: 'Polls are closed' });
+  }
+
+  const option = data.options.find((candidate) => candidate.id === optionId);
+  if (!option || !option.approved) {
+    return res.status(404).json({ error: 'Option not found' });
+  }
+
+  const previousVote = data.options.find((candidate) => (
+    candidate.categoryId === option.categoryId
+    && candidate.votes.some((vote) => vote.name === voterName)
+  ));
+
+  if (previousVote) {
+    previousVote.votes = previousVote.votes.filter((vote) => vote.name !== voterName);
   }
 
-  // Add new vote
   option.votes.push({ name: voterName, timestamp: Date.now() });
 
-  // Track voter
-  if (!data.voters.find(v => v.name === voterName)) {
+  if (!data.voters.find((voter) => voter.name === voterName)) {
     data.voters.push({ name: voterName, joinedAt: Date.now() });
   }
 
   saveData(data);
-  broadcast({ type: 'vote_update', results: data.options.filter(o => o.approved).map(o => ({ id: o.id, votes: o.votes.length, voters: o.votes.map(v => v.name) })) });
+  broadcast({ type: 'vote_update', results: approvedOptionsWithVoteSummary() });
   res.json({ success: true, voteCount: option.votes.length });
 });
 
-// Remove vote
 app.delete('/api/vote/:optionId', (req, res) => {
   const { voterName } = req.body;
-  const option = data.options.find(o => o.id === req.params.optionId);
+  const option = data.options.find((candidate) => candidate.id === req.params.optionId);
+
   if (!option) return res.status(404).json({ error: 'Not found' });
-  option.votes = option.votes.filter(v => v.name !== voterName);
+
+  option.votes = option.votes.filter((vote) => vote.name !== voterName);
   saveData(data);
-  broadcast({ type: 'vote_update', results: data.options.filter(o => o.approved).map(o => ({ id: o.id, votes: o.votes.length, voters: o.votes.map(v => v.name) })) });
+  broadcast({ type: 'vote_update', results: approvedOptionsWithVoteSummary() });
   res.json({ success: true });
 });
 
-// Add a new option
 app.post('/api/options', (req, res) => {
-  const { categoryId, name, desc, url, voterName } = req.body;
-  if (!categoryId || !name || !voterName) return res.status(400).json({ error: 'Missing required fields' });
+  const { categoryId, name, desc, url, voterName, lat, lng } = req.body;
 
-  const category = data.categories.find(c => c.id === categoryId);
+  if (!categoryId || !name || !voterName) {
+    return res.status(400).json({ error: 'Missing required fields' });
+  }
+
+  const category = data.categories.find((candidate) => candidate.id === categoryId);
   if (!category) return res.status(404).json({ error: 'Category not found' });
 
-  const newOption = {
-    id: uuidv4(),
+  const newOption = createUserOption({
     categoryId,
-    name: name.trim(),
-    desc: (desc || '').trim(),
-    url: url ? url.trim() : null,
-    addedBy: voterName,
-    approved: false, // needs approval
-    votes: [],
-    details: [],
-  };
+    name,
+    desc,
+    url,
+    voterName,
+    lat,
+    lng,
+    approved: false,
+  });
 
   data.options.push(newOption);
   saveData(data);
@@ -185,38 +209,26 @@ app.post('/api/options', (req, res) => {
   res.json({ success: true, option: newOption });
 });
 
-// Approve a pending option
 app.post('/api/options/:id/approve', (req, res) => {
-  const option = data.options.find(o => o.id === req.params.id);
+  const option = data.options.find((candidate) => candidate.id === req.params.id);
   if (!option) return res.status(404).json({ error: 'Not found' });
+
   option.approved = true;
   saveData(data);
   broadcast({ type: 'option_approved', option });
   res.json({ success: true });
 });
 
-// Delete an option
 app.delete('/api/options/:id', (req, res) => {
-  const idx = data.options.findIndex(o => o.id === req.params.id);
-  if (idx === -1) return res.status(404).json({ error: 'Not found' });
-  data.options.splice(idx, 1);
+  const optionIndex = data.options.findIndex((candidate) => candidate.id === req.params.id);
+  if (optionIndex === -1) return res.status(404).json({ error: 'Not found' });
+
+  data.options.splice(optionIndex, 1);
   saveData(data);
   broadcast({ type: 'option_deleted', id: req.params.id });
   res.json({ success: true });
 });
 
-// Remove vote from an option
-app.delete('/api/vote/:optionId', (req, res) => {
-  const { voterName } = req.body;
-  const option = data.options.find(o => o.id === req.params.id);
-  if (!option) return res.status(404).json({ error: 'Not found' });
-  option.votes = option.votes.filter(v => v.name !== voterName);
-  saveData(data);
-  broadcast({ type: 'vote_update', results: data.options.filter(o => o.approved).map(o => ({ id: o.id, votes: o.votes.length })) });
-  res.json({ success: true });
-});
-
-// Toggle polls open/closed
 app.post('/api/polls', (req, res) => {
   data.pollsOpen = req.body.open !== undefined ? req.body.open : !data.pollsOpen;
   saveData(data);
@@ -224,57 +236,120 @@ app.post('/api/polls', (req, res) => {
   res.json({ success: true, pollsOpen: data.pollsOpen });
 });
 
-// ── WebSocket ────────────────────────────────────────────────
+const YELP_API_KEY = process.env.YELP_API_KEY || '';
+
+app.get('/api/yelp', async (req, res) => {
+  const { term, location } = req.query;
+  if (!term) return res.status(400).json({ error: 'term is required' });
+
+  if (!YELP_API_KEY) {
+    return res.status(503).json({
+      error: 'YELP_API_KEY not configured on server. Add it as an environment variable.',
+    });
+  }
+
+  try {
+    const params = new URLSearchParams({
+      term: `${term} in ${location}`,
+      location: location || 'Los Cabos Mexico',
+      limit: '15',
+      sort_by: 'rating',
+      categories: 'restaurants,nightlife,active,arts,health',
+    });
+
+    const response = await fetch(`https://api.yelp.com/v3/businesses/search?${params}`, {
+      headers: {
+        Authorization: `Bearer ${YELP_API_KEY}`,
+        Accept: 'application/json',
+      },
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      return res.status(response.status).json({ error: `Yelp API error: ${errorText}` });
+    }
+
+    const payload = await response.json();
+    const businesses = (payload.businesses || []).map((business) => ({
+      name: business.name,
+      image_url: business.image_url,
+      url: business.url,
+      rating: business.rating,
+      price: business.price,
+      coordinates: business.coordinates,
+      location: business.location,
+      categories: business.categories,
+      display_phone: business.display_phone,
+      distance: business.distance,
+    }));
+
+    res.json({ businesses, total: payload.total });
+  } catch (error) {
+    console.error('Yelp proxy error:', error);
+    res.status(500).json({ error: 'Failed to fetch from Yelp' });
+  }
+});
 
 wss.on('connection', (ws) => {
-  // Send current state to new client
-  ws.send(JSON.stringify({
-    type: 'init',
-    pollsOpen: data.pollsOpen,
-    categories: data.categories,
-    options: data.options.filter(o => o.approved),
-    results: data.options.filter(o => o.approved).map(o => ({ id: o.id, votes: o.votes.length, voters: o.votes.map(v => v.name) })),
-    totalVoters: data.voters.length,
-  }));
+  ws.send(JSON.stringify(buildRealtimeSnapshot()));
 
   ws.on('message', (raw) => {
     try {
       const msg = JSON.parse(raw);
+
       if (msg.type === 'vote') {
         const { optionId, voterName, remove } = msg;
         if (!voterName || !optionId) return;
-        if (!data.pollsOpen) { ws.send(JSON.stringify({ type: 'error', message: 'Polls closed' })); return; }
-        const option = data.options.find(o => o.id === optionId);
+        if (!data.pollsOpen) {
+          ws.send(JSON.stringify({ type: 'error', message: 'Polls closed' }));
+          return;
+        }
+
+        const option = data.options.find((candidate) => candidate.id === optionId);
         if (!option || !option.approved) return;
+
         if (remove) {
-          option.votes = option.votes.filter(v => v.name !== voterName);
+          option.votes = option.votes.filter((vote) => vote.name !== voterName);
         } else {
-          const prev = data.options.find(o => o.votes.some(v => v.name === voterName) && o.categoryId === option.categoryId);
-          if (prev) prev.votes = prev.votes.filter(v => v.name !== voterName);
+          const previousVote = data.options.find((candidate) => (
+            candidate.categoryId === option.categoryId
+            && candidate.votes.some((vote) => vote.name === voterName)
+          ));
+          if (previousVote) {
+            previousVote.votes = previousVote.votes.filter((vote) => vote.name !== voterName);
+          }
+
           option.votes.push({ name: voterName, timestamp: Date.now() });
         }
-        if (!data.voters.find(v => v.name === voterName)) data.voters.push({ name: voterName, joinedAt: Date.now() });
+
+        if (!data.voters.find((voter) => voter.name === voterName)) {
+          data.voters.push({ name: voterName, joinedAt: Date.now() });
+        }
+
         saveData(data);
-        broadcast({ type: 'vote_update', results: data.options.filter(o => o.approved).map(o => ({ id: o.id, votes: o.votes.length, voters: o.votes.map(v => v.name) })) });
+        broadcast({ type: 'vote_update', results: approvedOptionsWithVoteSummary() });
       } else if (msg.type === 'add_option') {
-        const { categoryId, name, desc, url, voterName } = msg;
+        const { categoryId, name, desc, url, voterName, lat, lng } = msg;
         if (!categoryId || !name || !voterName) return;
-        const newOption = {
-          id: uuidv4(),
+
+        const newOption = createUserOption({
           categoryId,
-          name: name.trim(),
-          desc: (desc || '').trim(),
-          url: url ? url.trim() : null,
-          addedBy: voterName,
+          name,
+          desc,
+          url,
+          voterName,
+          lat,
+          lng,
           approved: true,
-          votes: [],
-          details: [],
-        };
+        });
+
         data.options.push(newOption);
         saveData(data);
         broadcast({ type: 'option_added', option: newOption });
       }
-    } catch (e) { /* ignore malformed */ }
+    } catch {
+      // Ignore malformed websocket payloads.
+    }
   });
 });
 
