diff --git a/lightning/src/components/AccordionTest.tsx b/lightning/src/components/AccordionTest.tsx
index 87d6868..ac0487d 100644
--- a/lightning/src/components/AccordionTest.tsx
+++ b/lightning/src/components/AccordionTest.tsx
@@ -4,9 +4,10 @@ import { ErrorBoundary, For, Show, } from 'solid-js';
 import type { JSX } from 'solid-js';
 
 import { useStationsContext } from './StationsContext';
-import { useMapContext } from './MapContext';
 import { Viewport } from 'solid-map-gl';
 
+import { viewport, setViewport } from './map/BadassMap';
+
 
 function ChevronUpIcon(props: JSX.IntrinsicElements['svg']) {
     return (<svg
@@ -27,7 +28,6 @@ function ChevronUpIcon(props: JSX.IntrinsicElements['svg']) {
 
 export default function AccordionTest() {
     const [stations, { setStationsRequest }] = useStationsContext();
-    const [viewport, { setViewport }] = useMapContext();
 
     function clickHandler(station) {
         setViewport({
diff --git a/lightning/src/components/MapContext.tsx b/lightning/src/components/MapContext.tsx
deleted file mode 100644
index 7940a7b..0000000
--- a/lightning/src/components/MapContext.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { createSignal, createContext, createResource, useContext } from "solid-js";
-
-import type { Viewport } from "solid-map-gl";
-
-export const MapContext = createContext();
-
-
-export function MapContextProvider(props: any) {
-    const [viewport, setViewport] = createSignal<Viewport>({
-        center: { lng: -90, lat: 38, },
-        zoom: 4,
-        bearing: 0,
-        pitch: 0,
-    });
-
-    return (
-        <MapContext.Provider value={[viewport, { setViewport }]}>
-            {props.children}
-        </MapContext.Provider>
-    );
-};
-
-
-export const useMapContext = () => useContext(MapContext);
diff --git a/lightning/src/components/Toolbox.tsx b/lightning/src/components/Toolbox.tsx
index 0d3a112..628f6ec 100644
--- a/lightning/src/components/Toolbox.tsx
+++ b/lightning/src/components/Toolbox.tsx
@@ -1,11 +1,9 @@
 import type { JSX } from "solid-js"
 import type { Viewport } from "solid-map-gl";
 import { mapRotate, setMapRotate } from "./map/BadassMap";
-import { useMapContext } from "./MapContext";
-
+import { viewport, setViewport } from "./map/BadassMap";
 
 export function Toolbox() {
-    const [viewport, { setViewport }] = useMapContext();
     return (
         <ul>
             <h3>Toolbox</h3>
diff --git a/lightning/src/components/map/BadassMap.tsx b/lightning/src/components/map/BadassMap.tsx
index 967dd96..d4ded16 100644
--- a/lightning/src/components/map/BadassMap.tsx
+++ b/lightning/src/components/map/BadassMap.tsx
@@ -13,15 +13,19 @@ const MapArcLayer = unstable_clientOnly(() => import('~/components/map/MapArcLay
 
 import 'maplibre-gl/dist/maplibre-gl.css';
 import StyleJson from '~/style/style.json';
-import { useMapContext } from '../MapContext';
 
 
 export const [mapRotate, setMapRotate] = createSignal(false);
+createEffect(() => console.log('Rotate:', mapRotate()));
 
-createEffect(() => console.log(mapRotate()));
+export const [viewport, setViewport] = createSignal<Viewport>({
+    center: { lng: -90, lat: 38, },
+    zoom: 4,
+    bearing: 0,
+    pitch: 0,
+});
 
 export default function BadassMap(props: any) {
-    const [viewport, { setViewport }] = useMapContext();
     return (
         <MapGL
             mapLib={maplibre}
diff --git a/lightning/src/root.tsx b/lightning/src/root.tsx
index c498ccc..4528fae 100644
--- a/lightning/src/root.tsx
+++ b/lightning/src/root.tsx
@@ -4,7 +4,6 @@ import { A, Body, ErrorBoundary, FileRoutes, Head, Html, Meta, Routes, Scripts,
 import type { JSX } from "solid-js";
 
 import { StationsProvider } from "./components/StationsContext";
-import { MapContextProvider } from "./components/MapContext.tsx";
 import BadassMap from './components/map/BadassMap';
 
 import "./root.css";
@@ -22,18 +21,16 @@ export default function Root() {
 
             <Body>
                 <ErrorBoundary>
-                    <MapContextProvider>
-                        <StationsProvider>
-                            <BadassMap />
-                            <A href="/">Map</A>
-                            <A href="/stations">Stations</A>
-                            <A href="/about">About</A>
-                            <A href="/tools">Tools</A>
-                            <Routes>
-                                <FileRoutes />
-                            </Routes>
-                        </StationsProvider>
-                    </MapContextProvider>
+                    <StationsProvider>
+                        <BadassMap />
+                        <A href="/">Map</A>
+                        <A href="/stations">Stations</A>
+                        <A href="/about">About</A>
+                        <A href="/tools">Tools</A>
+                        <Routes>
+                            <FileRoutes />
+                        </Routes>
+                    </StationsProvider>
                 </ErrorBoundary>
                 <Scripts />
             </Body>
diff --git a/lightning/src/routes/stations.tsx b/lightning/src/routes/stations.tsx
index c778f49..dffa628 100644
--- a/lightning/src/routes/stations.tsx
+++ b/lightning/src/routes/stations.tsx
@@ -5,6 +5,7 @@ import type { JSX } from 'solid-js';
 import AccordionTest from '~/components/AccordionTest';
 import { useStationsContext } from '~/components/StationsContext';
 
+import { viewport } from '~/components/map/BadassMap';
 
 const TEST_PACKET: StationRequest = {
     Latitude: 42.36,
@@ -16,7 +17,12 @@ const TEST_PACKET: StationRequest = {
 export default function Stations() {
     const [stations, { setStationsRequest }] = useStationsContext();
 
-    setStationsRequest(TEST_PACKET);
+    setStationsRequest({
+        Latitude: viewport().center.lat,
+        Longitude: viewport().center.lng,
+        Distance: 10,
+        CountLimit: 200,
+    });
 
     return (
         <main>
