diff --git a/public/img/saved/school.png b/public/img/saved/school.png
new file mode 100644
index 0000000..340e948
Binary files /dev/null and b/public/img/saved/school.png differ
diff --git a/src/lib/components/lnv/Map.svelte b/src/lib/components/lnv/Map.svelte
index ac6e591..2951e6c 100644
--- a/src/lib/components/lnv/Map.svelte
+++ b/src/lib/components/lnv/Map.svelte
@@ -21,6 +21,7 @@
 	let locationAccuracyCircle: HTMLDivElement | undefined = $state();
 	let homeMarker: HTMLImageElement | undefined = $state();
 	let workMarker: HTMLImageElement | undefined = $state();
+	let schoolMarker: HTMLImageElement | undefined = $state();
 
 	const DEBUG_POINTS = false; // Set to true to show debug points on the map
 </script>
@@ -100,6 +101,21 @@
 			element={homeMarker}
 		/>
 	{/if}
+	{#if saved.school && map.zoom > 9}
+		<img
+			src="/img/saved/school.png"
+			alt="School Marker"
+			bind:this={schoolMarker}
+			style="width: 32px;"
+		/>
+		<Marker
+			lnglat={{
+				lat: saved.school.lat,
+				lng: saved.school.lon,
+			}}
+			element={schoolMarker}
+		/>
+	{/if}
 	{#if saved.work && map.zoom > 9}
 		<img
 			src="/img/saved/work.png"
diff --git a/src/lib/components/lnv/sidebar/InfoSidebar.svelte b/src/lib/components/lnv/sidebar/InfoSidebar.svelte
index ab8342e..8ac9dde 100644
--- a/src/lib/components/lnv/sidebar/InfoSidebar.svelte
+++ b/src/lib/components/lnv/sidebar/InfoSidebar.svelte
@@ -9,6 +9,7 @@
 		MailIcon,
 		PhoneIcon,
 		RouteIcon,
+		SchoolIcon,
 	} from "@lucide/svelte";
 	import { pin } from "../map.svelte";
 	import SidebarHeader from "./SidebarHeader.svelte";
@@ -182,6 +183,16 @@
 							<HomeIcon />
 							Set as Home
 						</Button>
+						<Button
+							variant="outline"
+							onclick={() => {
+								saved.school = { lat, lon: lng };
+								saveLocations();
+							}}
+						>
+							<SchoolIcon />
+							Set as School
+						</Button>
 						<Button
 							variant="outline"
 							onclick={() => {
diff --git a/src/lib/components/lnv/sidebar/MainSidebar.svelte b/src/lib/components/lnv/sidebar/MainSidebar.svelte
index c0c65a0..00b3f6c 100644
--- a/src/lib/components/lnv/sidebar/MainSidebar.svelte
+++ b/src/lib/components/lnv/sidebar/MainSidebar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { BriefcaseIcon, HomeIcon } from "@lucide/svelte";
+	import { BriefcaseIcon, HomeIcon, SchoolIcon } from "@lucide/svelte";
 	import { Button } from "../../ui/button";
 	import { fly } from "svelte/transition";
 	import { circInOut } from "svelte/easing";
@@ -19,7 +19,12 @@
 		variant="secondary"
 		class="flex-1"
 		onclick={() => {
-			const { lat, lon } = saved.home;
+			const loc = saved.home;
+			if (!loc) {
+				alert("No home location saved.");
+				return;
+			}
+			const { lat, lon } = loc;
 			if (!lat || !lon) {
 				alert("No home location saved.");
 				return;
@@ -39,7 +44,38 @@
 		variant="secondary"
 		class="flex-1"
 		onclick={() => {
-			const { lat, lon } = saved.work;
+			console.log(saved);
+			const loc = saved.school;
+			if (!loc) {
+				alert("No school location saved.");
+				return;
+			}
+			const { lat, lon } = loc;
+			if (!lat || !lon) {
+				alert("No school location saved.");
+				return;
+			}
+			pin.dropPin(lat, lon);
+			pin.showInfo();
+			map.value?.flyTo({
+				center: [lon, lat],
+				zoom: 19,
+			});
+		}}
+	>
+		<SchoolIcon />
+		School
+	</Button>
+	<Button
+		variant="secondary"
+		class="flex-1"
+		onclick={() => {
+			const loc = saved.work;
+			if (!loc) {
+				alert("No work location saved.");
+				return;
+			}
+			const { lat, lon } = loc;
 			if (!lat || !lon) {
 				alert("No work location saved.");
 				return;