diff --git a/assets/js/app.js b/assets/js/app.js
index 2e0c6a7..a318235 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -29,10 +29,34 @@ let Hooks = {};
 Hooks.APRSMap = {
   mounted() {
     console.log("APRSMap hook mounted");
-    // Initialize the map centered on the United States
-    const map = L.map(this.el).setView([39.8283, -98.5795], 5);
+    // Get initial center and zoom from server-provided data attributes
+    const initialCenter = JSON.parse(this.el.dataset.center);
+    const initialZoom = parseInt(this.el.dataset.zoom);
+
+    // Initialize the map with the server-provided location
+    const map = L.map(this.el).setView([initialCenter.lat, initialCenter.lng], initialZoom);
     console.log("Map initialized:", map);
 
+    // Handle geolocation requests from server
+    this.handleEvent("request_geolocation", () => {
+      if ("geolocation" in navigator) {
+        navigator.geolocation.getCurrentPosition(
+          (position) => {
+            const { latitude, longitude } = position.coords;
+            console.log("User location:", latitude, longitude);
+            map.setView([latitude, longitude], 12);
+            // Notify server of new location
+            this.pushEvent("set_location", { lat: latitude, lng: longitude });
+          },
+          (error) => {
+            console.warn("Geolocation error:", error.message);
+          },
+        );
+      } else {
+        console.warn("Geolocation not available in this browser");
+      }
+    });
+
     // Add OpenStreetMap tile layer
     L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
       attribution:
@@ -107,6 +131,24 @@ Hooks.APRSMap = {
       this.clearAllMarkers();
     });
 
+    // Handle geolocation button clicks
+    this.handleEvent("request_geolocation", () => {
+      if ("geolocation" in navigator) {
+        navigator.geolocation.getCurrentPosition(
+          (position) => {
+            const { latitude, longitude } = position.coords;
+            // Send location back to server
+            this.pushEvent("set_location", { lat: latitude, lng: longitude });
+          },
+          (error) => {
+            console.warn("Geolocation error:", error.message);
+          },
+        );
+      } else {
+        console.warn("Geolocation not available in this browser");
+      }
+    });
+
     // Update bounds when map moves or zooms
     map.on("moveend", () => {
       this.sendBoundsToServer();
diff --git a/lib/aprs_web/live/map_live/index.ex b/lib/aprs_web/live/map_live/index.ex
index 8abb8c2..6dc0112 100644
--- a/lib/aprs_web/live/map_live/index.ex
+++ b/lib/aprs_web/live/map_live/index.ex
@@ -8,27 +8,45 @@ defmodule AprsWeb.MapLive.Index do
   alias AprsWeb.Endpoint
   alias Parser.Types.MicE
 
+  @default_center %{lat: 39.8283, lng: -98.5795}
+  @default_zoom 5
+  @ip_api_url "http://ip-api.com/json/"
+  @finch_name Aprs.Finch
+
   @impl true
   def mount(_params, _session, socket) do
+    socket =
+      assign(socket,
+        packets: [],
+        packet_count: 0,
+        page_title: "APRS Map",
+        # Track visible packets by callsign
+        visible_packets: %{},
+        # Default bounds for USA
+        map_bounds: %{
+          north: 49.0,
+          south: 24.0,
+          east: -66.0,
+          west: -125.0
+        },
+        map_center: @default_center,
+        map_zoom: @default_zoom
+      )
+
     if connected?(socket) do
       Endpoint.subscribe("aprs_messages")
+      # Get IP-based location on initial load
+      ip =
+        case socket.private[:connect_info][:peer_data][:address] do
+          {a, b, c, d} -> "#{a}.#{b}.#{c}.#{d}"
+          {a, b, c, d, e, f, g, h} -> "#{a}:#{b}:#{c}:#{d}:#{e}:#{f}:#{g}:#{h}"
+          _ -> nil
+        end
+
+      if ip, do: Task.async(fn -> get_ip_location(ip) end)
     end
 
-    {:ok,
-     assign(socket,
-       packets: [],
-       packet_count: 0,
-       page_title: "APRS Map",
-       # Track visible packets by callsign
-       visible_packets: %{},
-       # Default bounds for USA
-       map_bounds: %{
-         north: 49.0,
-         south: 24.0,
-         east: -66.0,
-         west: -125.0
-       }
-     )}
+    {:ok, socket}
   end
 
   @impl true
@@ -62,50 +80,68 @@ defmodule AprsWeb.MapLive.Index do
   end
 
   @impl true
-  def handle_info(%{event: "packet", payload: payload}, socket) do
-    # Sanitize the packet to prevent encoding errors
-    sanitized_packet = EncodingUtils.sanitize_packet(payload)
+  def handle_event("locate_me", _params, socket) do
+    # Send JavaScript command to request browser geolocation
+    {:noreply, push_event(socket, "request_geolocation", %{})}
+  end
 
-    # Log packet type for debugging
-    IO.inspect(sanitized_packet.data_type, label: "Packet type")
+  @impl true
+  def handle_event("set_location", %{"lat" => lat, "lng" => lng}, socket) do
+    # Update map center and zoom when location is received
+    {:noreply, assign(socket, map_center: %{lat: lat, lng: lng}, map_zoom: 12)}
+  end
 
-    if sanitized_packet.data_extended do
-      # Check if data_extended is a struct before accessing __struct__
-      case sanitized_packet.data_extended do
-        %{__struct__: module} -> IO.inspect(module, label: "Data extended type")
-        _ -> IO.inspect("Plain map", label: "Data extended type")
-      end
-    end
+  @impl true
+  def handle_info(msg, socket) do
+    case msg do
+      {:ip_location, %{lat: lat, lng: lng}} ->
+        {:noreply, assign(socket, map_center: %{lat: lat, lng: lng}, map_zoom: 12)}
 
-    # Only process packets with position data that are within current map bounds
-    if has_position_data?(sanitized_packet) && within_bounds?(sanitized_packet, socket.assigns.map_bounds) do
-      # Convert to a simple map structure for JSON encoding
-      packet_data = build_packet_data(sanitized_packet)
+      %{event: "packet", payload: payload} ->
+        # Sanitize the packet to prevent encoding errors
+        sanitized_packet = EncodingUtils.sanitize_packet(payload)
 
-      # Only push if we have valid packet data
-      if packet_data do
-        # Generate a unique key for this packet
-        callsign_key =
-          "#{sanitized_packet.base_callsign}#{if sanitized_packet.ssid, do: "-#{sanitized_packet.ssid}", else: ""}"
+        # Log packet type for debugging
+        IO.inspect(sanitized_packet.data_type, label: "Packet type")
 
-        # Update visible packets tracking
-        visible_packets = Map.put(socket.assigns.visible_packets, callsign_key, sanitized_packet)
-        packet_count = map_size(visible_packets)
+        if sanitized_packet.data_extended do
+          # Check if data_extended is a struct before accessing __struct__
+          case sanitized_packet.data_extended do
+            %{__struct__: module} -> IO.inspect(module, label: "Data extended type")
+            _ -> IO.inspect("Plain map", label: "Data extended type")
+          end
+        end
 
-        # Push the packet to the client-side JavaScript
-        socket =
-          socket
-          |> push_event("new_packet", packet_data)
-          |> assign(visible_packets: visible_packets, packet_count: packet_count)
+        # Only process packets with position data that are within current map bounds
+        if has_position_data?(sanitized_packet) && within_bounds?(sanitized_packet, socket.assigns.map_bounds) do
+          # Convert to a simple map structure for JSON encoding
+          packet_data = build_packet_data(sanitized_packet)
 
-        {:noreply, socket}
-      else
-        # Invalid packet data, skip it
-        {:noreply, socket}
-      end
-    else
-      # Ignore packets without position data or outside bounds
-      {:noreply, socket}
+          # Only push if we have valid packet data
+          if packet_data do
+            # Generate a unique key for this packet
+            callsign_key =
+              "#{sanitized_packet.base_callsign}#{if sanitized_packet.ssid, do: "-#{sanitized_packet.ssid}", else: ""}"
+
+            # Update visible packets tracking
+            visible_packets = Map.put(socket.assigns.visible_packets, callsign_key, sanitized_packet)
+            packet_count = map_size(visible_packets)
+
+            # Push the packet to the client-side JavaScript
+            socket =
+              socket
+              |> push_event("new_packet", packet_data)
+              |> assign(visible_packets: visible_packets, packet_count: packet_count)
+
+            {:noreply, socket}
+          else
+            # Invalid packet data, skip it
+            {:noreply, socket}
+          end
+        else
+          # Ignore packets without position data or outside bounds
+          {:noreply, socket}
+        end
     end
   end
 
@@ -158,6 +194,22 @@ defmodule AprsWeb.MapLive.Index do
         z-index: 1000;
       }
 
+      .locate-button {
+        position: absolute;
+        left: 10px;
+        top: 80px;
+        z-index: 1000;
+        background: white;
+        border: 2px solid rgba(0,0,0,0.2);
+        border-radius: 4px;
+        padding: 5px;
+        cursor: pointer;
+      }
+
+      .locate-button:hover {
+        background: #f4f4f4;
+      }
+
       .packet-counter {
         font-size: 14px;
         font-weight: 600;
@@ -170,13 +222,40 @@ defmodule AprsWeb.MapLive.Index do
       }
     </style>
 
-    <div id="aprs-map" phx-hook="APRSMap" phx-update="ignore"></div>
+    <div
+      id="aprs-map"
+      phx-hook="APRSMap"
+      phx-update="ignore"
+      data-center={Jason.encode!(@map_center)}
+      data-zoom={@map_zoom}
+      data-lat={@map_center.lat}
+      data-lng={@map_center.lng}
+    >
+    </div>
 
     <div class="map-overlay">
       <div class="packet-counter">
         <span id="packet-count">{@packet_count}</span> packets in view
       </div>
     </div>
+
+    <button class="locate-button" phx-click="locate_me" title="Find my location">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        width="20"
+        height="20"
+        viewBox="0 0 24 24"
+        fill="none"
+        stroke="currentColor"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      >
+        <circle cx="12" cy="12" r="10" />
+        <line x1="12" y1="8" x2="12" y2="16" />
+        <line x1="8" y1="12" x2="16" y2="12" />
+      </svg>
+    </button>
     """
   end
 
@@ -246,6 +325,37 @@ defmodule AprsWeb.MapLive.Index do
     end
   end
 
+  # Get IP location from external service
+
+  # Get location from IP using ip-api.com
+  defp get_ip_location(nil), do: nil
+
+  defp get_ip_location(ip) do
+    url = "#{@ip_api_url}#{ip}"
+    request = Finch.build(:get, url)
+
+    case Finch.request(request, @finch_name) do
+      {:ok, %{status: 200, body: body}} ->
+        case Jason.decode(body) do
+          {:ok, %{"lat" => lat, "lon" => lng}} when is_number(lat) and is_number(lng) ->
+            if lat >= -90 and lat <= 90 and lng >= -180 and lng <= 180 do
+              send(self(), {:ip_location, %{lat: lat, lng: lng}})
+            else
+              send(self(), {:ip_location, @default_center})
+            end
+
+          _ ->
+            send(self(), {:ip_location, @default_center})
+        end
+
+      {:ok, _} ->
+        send(self(), {:ip_location, @default_center})
+
+      {:error, _} ->
+        send(self(), {:ip_location, @default_center})
+    end
+  end
+
   defp build_data_extended(nil), do: nil
 
   defp build_data_extended(data_extended) do
diff --git a/lib/aprs_web/live/map_live/index.old b/lib/aprs_web/live/map_live/index.old
deleted file mode 100644
index 9daad64..0000000
--- a/lib/aprs_web/live/map_live/index.old
+++ /dev/null
@@ -1,248 +0,0 @@
-defmodule AprsWeb.MapLive.Index do
-  @moduledoc """
-  LiveView for displaying real-time APRS packets on a map
-  """
-  use AprsWeb, :live_view
-
-  alias Aprs.EncodingUtils
-  alias AprsWeb.Endpoint
-  alias Parser.Types.MicE
-
-  @impl true
-  def mount(_params, _session, socket) do
-    if connected?(socket) do
-      Endpoint.subscribe("aprs_messages")
-    end
-
-    {:ok,
-     assign(socket,
-       packets: [],
-       packet_count: 0,
-       page_title: "APRS Map",
-       # Default bounds for USA
-       map_bounds: %{
-         north: 49.0,
-         south: 24.0,
-         east: -66.0,
-         west: -125.0
-       }
-     )}
-  end
-
-  @impl true
-  def handle_event("update_bounds", %{"bounds" => bounds}, socket) do
-    # Update the map bounds from the client
-    map_bounds = %{
-      north: bounds["north"],
-      south: bounds["south"],
-      east: bounds["east"],
-      west: bounds["west"]
-    }
-
-    # Clear existing markers when bounds change
-    socket = push_event(socket, "clear_markers", %{})
-
-    {:noreply, assign(socket, map_bounds: map_bounds, packet_count: 0)}
-  end
-
-  @impl true
-  def handle_info(%{event: "packet", payload: payload}, socket) do
-    # Sanitize the packet to prevent encoding errors
-    sanitized_packet = EncodingUtils.sanitize_packet(payload)
-
-    # Log packet type for debugging
-    IO.inspect(sanitized_packet.data_type, label: "Packet type")
-
-    if sanitized_packet.data_extended do
-      # Check if data_extended is a struct before accessing __struct__
-      case sanitized_packet.data_extended do
-        %{__struct__: module} -> IO.inspect(module, label: "Data extended type")
-        _ -> IO.inspect("Plain map", label: "Data extended type")
-      end
-    end
-
-    # Only process packets with position data that are within current map bounds
-    if has_position_data?(sanitized_packet) && within_bounds?(sanitized_packet, socket.assigns.map_bounds) do
-      # Convert to a simple map structure for JSON encoding
-      packet_data = build_packet_data(sanitized_packet)
-
-      # Only push if we have valid packet data
-      if packet_data do
-        # Push the packet to the client-side JavaScript and increment count
-        socket =
-          socket
-          |> push_event("new_packet", packet_data)
-          |> update(:packet_count, &(&1 + 1))
-
-        {:noreply, socket}
-      else
-        # Invalid packet data, skip it
-        {:noreply, socket}
-      end
-    else
-      # Ignore packets without position data or outside bounds
-      {:noreply, socket}
-    end
-  end
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <link
-      rel="stylesheet"
-      href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
-      integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
-      crossorigin=""
-    />
-    <script
-      src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
-      integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
-      crossorigin=""
-    >
-    </script>
-
-    <style>
-      #aprs-map {
-        position: fixed;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        z-index: 1;
-      }
-
-      .map-overlay {
-        position: absolute;
-        top: 10px;
-        right: 10px;
-        background: rgba(255, 255, 255, 0.9);
-        padding: 10px 15px;
-        border-radius: 5px;
-        box-shadow: 0 2px 5px rgba(0,0,0,0.2);
-        z-index: 1000;
-      }
-
-      .packet-counter {
-        font-size: 14px;
-        font-weight: 600;
-        color: #333;
-      }
-
-      .aprs-marker {
-        background: transparent !important;
-        border: none !important;
-      }
-    </style>
-
-    <div id="aprs-map" phx-hook="APRSMap"></div>
-
-    <div class="map-overlay">
-      <div class="packet-counter">
-        <span id="packet-count">{@packet_count}</span> packets in view
-      </div>
-    </div>
-    """
-  end
-
-  # Helper functions
-
-  defp has_position_data?(packet) do
-    case packet.data_extended do
-      %MicE{} = mic_e ->
-        # MicE packets have lat/lon in separate components
-        is_number(mic_e.lat_degrees) && is_number(mic_e.lat_minutes) &&
-          is_number(mic_e.lon_degrees) && is_number(mic_e.lon_minutes)
-
-      %{latitude: lat, longitude: lon} ->
-        # Regular position packets have decimal lat/lon
-        is_number(lat) && is_number(lon)
-
-      _ ->
-        false
-    end
-  end
-
-  defp within_bounds?(packet, bounds) do
-    {lat, lng} = get_coordinates(packet)
-
-    lat && lng &&
-      lat >= bounds.south && lat <= bounds.north &&
-      lng >= bounds.west && lng <= bounds.east
-  end
-
-  defp get_coordinates(packet) do
-    case packet.data_extended do
-      %MicE{} = mic_e ->
-        # Convert MicE components to decimal degrees
-        lat = mic_e.lat_degrees + mic_e.lat_minutes / 60.0 + mic_e.lat_fractional / 6000.0
-        lat = if mic_e.lat_direction == :south, do: -lat, else: lat
-
-        lng = mic_e.lon_degrees + mic_e.lon_minutes / 60.0 + mic_e.lon_fractional / 6000.0
-        lng = if mic_e.lon_direction == :west, do: -lng, else: lng
-
-        # Validate coordinates are within valid ranges
-        if lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180 do
-          {lat, lng}
-        else
-          IO.puts("Invalid MicE coordinates: lat=#{lat}, lng=#{lng}")
-          {nil, nil}
-        end
-
-      %{latitude: lat, longitude: lon} ->
-        {lat, lon}
-
-      _ ->
-        {nil, nil}
-    end
-  end
-
-  defp build_packet_data(packet) do
-    data_extended = build_data_extended(packet.data_extended)
-
-    if data_extended do
-      %{
-        "base_callsign" => packet.base_callsign || "",
-        "ssid" => packet.ssid || "",
-        "data_type" => to_string(packet.data_type || "unknown"),
-        "path" => packet.path || "",
-        "data_extended" => data_extended
-      }
-    end
-  end
-
-  defp build_data_extended(nil), do: nil
-
-  defp build_data_extended(data_extended) do
-    case data_extended do
-      %MicE{} = mic_e ->
-        # Convert MicE components to decimal degrees
-        lat = mic_e.lat_degrees + mic_e.lat_minutes / 60.0 + mic_e.lat_fractional / 6000.0
-        lat = if mic_e.lat_direction == :south, do: -lat, else: lat
-
-        lng = mic_e.lon_degrees + mic_e.lon_minutes / 60.0 + mic_e.lon_fractional / 6000.0
-        lng = if mic_e.lon_direction == :west, do: -lng, else: lng
-
-        # Validate coordinates are within valid ranges
-        if lat >= -90 && lat <= 90 && lng >= -180 && lng <= 180 do
-          %{
-            "latitude" => lat,
-            "longitude" => lng,
-            "comment" => mic_e.message || "",
-            "symbol_table_id" => "/",
-            "symbol_code" => ">",
-            "aprs_messaging" => false
-          }
-        end
-
-      _ ->
-        %{
-          "latitude" => data_extended[:latitude],
-          "longitude" => data_extended[:longitude],
-          "comment" => data_extended[:comment] || "",
-          "symbol_table_id" => data_extended[:symbol_table_id] || "/",
-          "symbol_code" => data_extended[:symbol_code] || ">",
-          "aprs_messaging" => data_extended[:aprs_messaging] || false
-        }
-    end
-  end
-end