diff --git a/src/api.ts b/src/api.ts
index d5f43ad..b96da9d 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -2,7 +2,7 @@ import debounce from "debounce";
 import { OverpassResponse, RawOverpassNode } from "./interfaces";
 
 import * as http from "https";
-import { drawMarkersAndCards, removeMarkers } from "./drawing";
+import { addStreetLayers, drawMarkersAndCards, removeMarkers, removeStreetLayers } from "./drawing";
 import { wayToNode } from "./geo-utils";
 import { bicycleParking, safeCycleways } from "./overpass-requests";
 
@@ -86,102 +86,21 @@ async function fetchAndDrawMarkers(
   console.log(geoJson);
   console.log("Adding geojson to map...");
 
-  try {
-    if(map.isSourceLoaded('greenRoads')) {
-      console.log("Removing sources...");
-      map.removeLayer('greenRoadsId');
-      map.removeLayer('redRoadsId');
-      map.removeLayer('orangeRoadsId');
-
-      map.removeSource('greenRoads');
-      map.removeSource('redRoads');
-      map.removeSource('orangeRoads');
-
-    } else {
-
-      console.log("NOT Removing sources.");
-    }
-
-  } catch (e) {
-
-  }
-
-  map.addSource('redRoads', {
-    type: 'geojson',
-    data: {
-      features: geoJson.features.filter(feature => feature.properties &&
-        feature.properties.maxspeed > 40),
-      type: "FeatureCollection"
-    }
-  });
-
-  map.addSource('greenRoads', {
-    type: 'geojson',
-    data: {
-      features: geoJson.features.filter(feature => feature.properties &&
-        (feature.properties.highway === 'cycleway' || feature.properties.highway === 'pedestrian'))
-      ,
-      type: "FeatureCollection"
-    }
-  });
-  map.addSource('orangeRoads', {
-    type: 'geojson',
-    data: {
-      features: geoJson.features.filter(feature => feature.properties &&
-        (feature.properties.maxspeed <= 40))
-      ,
-      type: "FeatureCollection"
-    }
-  });
-
-
-
-  // Add a new layer to visualize the polygon.
-  map.addLayer({
-    'id': 'redRoadsId',
-    'type': 'line',
-    'source': 'redRoads', // reference the data source
-    'layout': {},
-    'paint': {
-      "line-color": "red",
-      "line-width": 5
-    },
-  });
-
-
-  // Add a new layer to visualize the polygon.
-  map.addLayer({
-    'id': 'greenRoadsId',
-    'type': 'line',
-    'source': 'greenRoads', // reference the data source
-    'layout': {},
-    'paint': {
-      "line-color": "green",
-      "line-width": 5
-    },
-  });
-  map.addLayer({
-    'id': 'orangeRoadsId',
-    'type': 'line',
-    'source': 'orangeRoads', // reference the data source
-    'layout': {},
-    'paint': {
-      "line-color": "orange",
-      "line-width": 5
-    },
-  });
+  removeStreetLayers(map);
+  addStreetLayers(map, geoJson);
+  
 
   return;
-  removeMarkers(markers.current);
+  // removeMarkers(markers.current);
 
-  const nodesAndWayCenters: RawOverpassNode[] = ads.elements
-    .map((item) => (item.type === "way" ? wayToNode(item, ads.elements) : item))
-    .filter((item) => item !== null)
-    .map((item) => item as RawOverpassNode)
-    .filter((item) => item.tags !== undefined);
+  // const nodesAndWayCenters: RawOverpassNode[] = ads.elements
+  //   .map((item) => (item.type === "way" ? wayToNode(item, ads.elements) : item))
+  //   .filter((item) => item !== null)
+  //   .map((item) => item as RawOverpassNode)
+  //   .filter((item) => item.tags !== undefined);
 
-  markers.current = await drawMarkersAndCards(map, nodesAndWayCenters);
-  setLoadingStatus("success");
+  // markers.current = await drawMarkersAndCards(map, nodesAndWayCenters);
+  // setLoadingStatus("success");
 }
 
 type LoadingStatusType = "loading" | "success" | "429error" | "unknownerror";
\ No newline at end of file
diff --git a/src/drawing.ts b/src/drawing.ts
index 7ef93b2..f147153 100644
--- a/src/drawing.ts
+++ b/src/drawing.ts
@@ -3,6 +3,7 @@ import {
   RawOverpassNode,
 } from "./interfaces";
 
+import { FeatureCollection, Geometry, GeoJsonProperties, Feature, GeometryObject } from 'geojson';
 
 export function drawMarkerAndCard(
   item: RawOverpassNode,
@@ -52,6 +53,97 @@ export function drawMarkerAndCard(
 
 export function removeMarkers(markers: mapboxgl.Marker[]): void {
   markers.map((marker) => marker.remove());
+}
+export function removeStreetLayers(map: mapboxgl.Map): void {
+  try {
+    if(map.isSourceLoaded('greenRoads')) {
+      console.log("Removing sources...");
+      map.removeLayer('greenRoadsId');
+      map.removeLayer('redRoadsId');
+      map.removeLayer('orangeRoadsId');
+
+      map.removeSource('greenRoads');
+      map.removeSource('redRoads');
+      map.removeSource('orangeRoads');
+
+    } else {
+
+      console.log("NOT Removing sources.");
+    }
+
+  } catch (e) {
+
+  }
+}
+
+export function addStreetLayers(map: mapboxgl.Map, geoJson: FeatureCollection<Geometry, GeoJsonProperties>) {
+map.addSource('redRoads', {
+    type: 'geojson',
+    data: {
+      features: geoJson.features.filter(feature => feature.properties &&
+        feature.properties.maxspeed > 40),
+      type: "FeatureCollection"
+    }
+  });
+
+  map.addSource('greenRoads', {
+    type: 'geojson',
+    data: {
+      features: geoJson.features.filter(feature => feature.properties &&
+        (feature.properties.highway === 'cycleway' || feature.properties.highway === 'pedestrian'))
+      ,
+      type: "FeatureCollection"
+    }
+  });
+  map.addSource('orangeRoads', {
+    type: 'geojson',
+    data: {
+      features: geoJson.features.filter(feature => feature.properties &&
+        (feature.properties.maxspeed <= 40))
+      ,
+      type: "FeatureCollection"
+    }
+  });
+
+
+
+  // Add a new layer to visualize the polygon.
+  map.addLayer({
+    'id': 'redRoadsId',
+    'type': 'line',
+    'source': 'redRoads', // reference the data source
+    'layout': {},
+    'paint': {
+      "line-color": "red",
+      "line-width": 3
+    },
+  });
+
+
+  // Add a new layer to visualize the polygon.
+  map.addLayer({
+    'id': 'greenRoadsId',
+    'type': 'line',
+    'source': 'greenRoads', // reference the data source
+    'layout': {},
+    'paint': {
+      "line-color": "green",
+      "line-width": 7
+    },
+  });
+  map.addLayer({
+    'id': 'orangeRoadsId',
+    'type': 'line',
+    'source': 'orangeRoads', // reference the data source
+    'layout': {},
+    'paint': {
+      "line-color": "orange",
+      "line-width": 5
+    },
+  });
+
+
+
 }
 
 export function drawMarkersAndCards(