diff --git a/src/app/harbor/tavern/map.tsx b/src/app/harbor/tavern/map.tsx
index 8442bb66..dcda9442 100644
--- a/src/app/harbor/tavern/map.tsx
+++ b/src/app/harbor/tavern/map.tsx
@@ -101,9 +101,7 @@ function MapUpdater({
       }
     } else if (navigator.geolocation) {
       navigator.geolocation.getCurrentPosition((loc) => {
-        if (map !== null) {
-          map.setView([loc.coords.latitude, loc.coords.longitude], 11)
-        }
+        map.setView([loc.coords.latitude, loc.coords.longitude], 11)
       })
     }
   }, [selectedTavern, map])
@@ -116,6 +114,8 @@ function TavernMarkers(props: MapProps) {
 
   if (!map) return null
 
+  console.log(props)
+
   const peopleMarkers = props.people.map((t) => {
     let iconClass = `rounded-full border-2 border-white w-full h-full `
 
diff --git a/src/app/harbor/tavern/tavern.tsx b/src/app/harbor/tavern/tavern.tsx
index 0f48880b..65a1fa76 100644
--- a/src/app/harbor/tavern/tavern.tsx
+++ b/src/app/harbor/tavern/tavern.tsx
@@ -74,6 +74,15 @@ const RsvpStatusSwitcher = ({ tavernEvents, onTavernSelect }) => {
     }
   }
 
+  const eventsByCountry = tavernEvents.reduce((acc, event) => {
+    const country = event.locality.split(', ').at(-1)
+    if (!acc[country]) {
+      acc[country] = []
+    }
+    acc[country].push(event)
+    return acc
+  }, {})
+
   return (
     <>
       <Modal
@@ -112,15 +121,30 @@ const RsvpStatusSwitcher = ({ tavernEvents, onTavernSelect }) => {
               value={whichTavern}
               className="ml-2 text-gray-600 rounded-sm"
             >
-              <option value="" disabled>
-                Select
-              </option>
-              {tavernEvents.map((te, idx) => (
-                <option key={idx} value={te.id}>
-                  {te.locality}
-                  {te.organizers.length === 0 ? ' (no organizers yet!)' : ''}
-                </option>
-              ))}
+              <option value="">Select</option>
+              {Object.keys(eventsByCountry)
+                .sort()
+                .map((country) => (
+                  <optgroup key={country} label={country}>
+                    {eventsByCountry[country].map((te) => (
+                      <option key={te.id} value={te.id}>
+                        {te.locality}
+                        {te.organizers.length === 0
+                          ? ' (no organizers yet!)'
+                          : ''}
+                      </option>
+                    ))}
+                  </optgroup>
+                ))}
+              {/* {tavernEvents.map((te, idx) => {
+                console.log(te)
+                return (
+                  <option key={idx} value={te.id}>
+                    {te.locality}
+                    {te.organizers.length === 0 ? ' (no organizers yet!)' : ''}
+                  </option>
+                )
+              })} */}
             </select>
 
             <label>What is your shirt size?</label>