diff --git a/templates/map.html b/templates/map.html
index 311e934..8dd1dbd 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -15,18 +15,29 @@
 	<div id="map"></div>
 	<script>
 let map=L.map("map",{center:[38.21,-85.75],zoom:13,layers:[L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")]});
-let busMarkers=new Map();
+let layerControl=L.control.layers().addTo(map);
+let busLayers={};busMarkers={};
 function updateMap(){
 	fetch("tarc.csv").then(response=>response.text()).then(data=>{
 		if(data=="")return;
+		let newRoute=false;
 		data.split("\n").forEach(line=>{
-			const [lat,lng,r,id,p,d,s,t]=line.split(",");
-			const info=`<b>Route ${r}</b><br>#${id}<br>${p} riders<br>${d}<br>${s}mph<br>${new Date(t*1000).toLocaleTimeString('en-US',{hour12:false})}`
-			if(busMarkers.has(id)){busMarkers.get(id).setLatLng([lat,lng]).bindPopup(info)
-			}else{busMarkers.set(id,L.marker([lat,lng]).bindPopup(info).addTo(map))}
+			let [lat,lng,r,id,p,d,s,t]=line.split(",");
+			let info=`<b>Route ${r}</b><br>#${id}<br>${p} riders<br>${d}<br>${s}mph<br>${new Date(t*1000).toLocaleTimeString('en-US',{hour12:false})}`;
+			if(id in busMarkers){
+				busMarkers[id].setLatLng([lat,lng]).bindPopup(info)
+			}else{
+				if(!busLayers[r]){busLayers[r]=L.layerGroup().addTo(map)}
+				busMarkers[id]=L.marker([lat,lng]).bindPopup(info).addTo(busLayers[r]);
+				newRoute=true
+			}
 		})
+		if(newRoute){
+			map.removeControl(layerControl);
+			layerControl=L.control.layers(null,busLayers).addTo(map)
+		}
+		setTimeout(updateMap,6000)
 	})
-	setTimeout(updateMap,5000);
 }
 updateMap();