diff --git a/webapp/src/components/Map.svelte b/webapp/src/components/Map.svelte
index c190e2a..3930afa 100644
--- a/webapp/src/components/Map.svelte
+++ b/webapp/src/components/Map.svelte
@@ -5,9 +5,12 @@
 	import { SpotType, type ID, type ParkingLot } from "$lib/types";
 	import { currentMap } from "$lib/store";
 	import { markerColor, parkingLotStatus } from "$lib/utils";
+	import MapMarker from "./MapMarker.svelte";
     
     export let parkingLots: Record<ID, ParkingLot>;
 
+    const markers: Record<ID, MapMarker> = {};
+
     onMount(async () => {
         const mapboxgl = await import("mapbox-gl");
         const map = new mapboxgl.Map({
@@ -28,9 +31,10 @@
             `;
             const popup = new mapboxgl.Popup({offset: 25}).setHTML(popupHtml);
             const status = parkingLotStatus(parkingLot, SpotType.CAR)[0];
-            const options = {
+            const options: mapboxgl.MarkerOptions = {
                 color: markerColor(parkingLot.state.availableSpots["CAR"], parkingLot.metadata.totalSpots["CAR"], status)
             }
+            const marker = markers[id];
             return new mapboxgl.Marker(options)
                 .setLngLat([longitude, latitude])
                 .setPopup(popup);
@@ -40,6 +44,9 @@
 </script>
 
 <div id="map-container"></div>
+{#each Object.entries(parkingLots) as [id, parkingLot]}
+    <MapMarker parkingLot={parkingLot} bind:this={markers[id]} />
+{/each}
 <style>
     #map-container { position: absolute; top: 0; bottom: 0; width: 100%; }
 </style>
\ No newline at end of file
diff --git a/webapp/src/components/MapMarker.svelte b/webapp/src/components/MapMarker.svelte
new file mode 100644
index 0000000..2749a0a
--- /dev/null
+++ b/webapp/src/components/MapMarker.svelte
@@ -0,0 +1,20 @@
+<script lang="ts">
+	import { SpotType, type ParkingLot } from "$lib/types";
+	import { parkingLotStatus } from "$lib/utils";
+
+
+    export let parkingLot: ParkingLot;
+    const status = parkingLotStatus(parkingLot, SpotType.CAR)[0];
+</script>
+<div class="marker ${status}">
+    <i class="material-icons">room</i>
+    Elo
+</div>
+
+<style>
+    .marker {
+        display: flex;
+        color: red;
+
+    }
+</style>
\ No newline at end of file