diff --git a/docker-compose.yml b/docker-compose.yml
index 0681b2d..14b5d6e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,4 +7,19 @@ services:
     ports:
       - "8007:8007"
     restart: unless-stopped
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.music.rule=Host(`music.araozu.dev`)"
+      - "traefik.http.routers.music.entrypoints=websecure"
+      - "traefik.http.routers.music.tls=true"
+      - "traefik.http.routers.music.tls.certresolver=araozu-wildcard"
+      - "traefik.http.routers.music.tls.domains[0].main=araozu.dev"
+      - "traefik.http.routers.music.tls.domains[0].sans=*.araozu.dev"
+
+
+networks:
+  proxy:
+    external: true
 
diff --git a/src/modules/album/album.go b/src/modules/album/album.go
index 0cd2daf..13d42fa 100644
--- a/src/modules/album/album.go
+++ b/src/modules/album/album.go
@@ -52,6 +52,7 @@ func allAlbumsPage(c echo.Context) error {
 
 func albumPage(c echo.Context) error {
 	token, server := utils.Credentials(c)
+	isHtmxRequest := c.Request().Header.Get("HX-Request") == "true"
 	albumId := c.Param("id")
 
 	// load album info and song list on the background
@@ -110,5 +111,9 @@ func albumPage(c echo.Context) error {
 	}
 	clientSongsJson := buff.String()
 
-	return utils.RenderTempl(c, http.StatusOK, albumTempl(albumId, album, songs, string(clientSongsJson)))
+	if isHtmxRequest {
+		return utils.RenderTempl(c, http.StatusOK, albumTemplFragment(albumId, album, songs, string(clientSongsJson)))
+	} else {
+		return utils.RenderTempl(c, http.StatusOK, albumTempl(albumId, album, songs, string(clientSongsJson)))
+	}
 }
diff --git a/src/modules/album/album.templ b/src/modules/album/album.templ
index 9fe0cab..29f680d 100644
--- a/src/modules/album/album.templ
+++ b/src/modules/album/album.templ
@@ -59,31 +59,35 @@ templ albumsFragment(albums []utils.Album) {
 // Renders the page of a single Album
 templ albumTempl(albumId string, album *utils.Album, songs []utils.Song, songsJson string) {
 	@utils.SkeletonTempl() {
-		<div
-			class="text-center"
-			_={ fmt.Sprintf("init set $songsJson to %s", songsJson) }
-		>
-			<img class="inline-block mt-2 rounded shadow" src={ fmt.Sprintf("/covers/%s", albumId) }/>
-			<h1 class="font-bold pt-4 pb-2 text-2xl">
-				{ album.Name }
-			</h1>
-			<p>
-				{ album.Artist }
-			</p>
-			<div>
-				for i, song := range songs {
-					<button
-						class="inline-block py-2 pl-2 pr-4 w-full cursor-pointer text-left hover:bg-sky-100 hover:dark:bg-sky-950 whitespace-nowrap overflow-hidden overflow-ellipsis transition-colors"
-						_={ fmt.Sprintf("on click replaceQueueAndPlayAt($songsJson, %d)", i) }
-					>
-						<span class="inline-block w-6 text-right opacity-75 pr-2">
-							{ strconv.Itoa(song.TrackNumber) }
-						</span>
-						{ song.Title }
-					</button>
-				}
-			</div>
-		</div>
-		@utils.MusicPlayer()
+		@albumTemplFragment(albumId, album, songs, songsJson)
 	}
 }
+
+// Renders the page of a single album, but as a fragment without a skeleton
+templ albumTemplFragment(albumId string, album *utils.Album, songs []utils.Song, songsJson string) {
+	<div
+		class="text-center"
+		_={ fmt.Sprintf("init set $songsJson to %s", songsJson) }
+	>
+		<img class="inline-block mt-2 rounded shadow" src={ fmt.Sprintf("/covers/%s", albumId) }/>
+		<h1 class="font-bold pt-4 pb-2 text-2xl">
+			{ album.Name }
+		</h1>
+		<p>
+			{ album.Artist }
+		</p>
+		<div>
+			for i, song := range songs {
+				<button
+					class="inline-block py-2 pl-2 pr-4 w-full cursor-pointer text-left hover:bg-sky-100 hover:dark:bg-sky-950 whitespace-nowrap overflow-hidden overflow-ellipsis transition-colors"
+					_={ fmt.Sprintf("on click replaceQueueAndPlayAt($songsJson, %d)", i) }
+				>
+					<span class="inline-block w-6 text-right opacity-75 pr-2">
+						{ strconv.Itoa(song.TrackNumber) }
+					</span>
+					{ song.Title }
+				</button>
+			}
+		</div>
+	</div>
+}
diff --git a/src/modules/index/index.templ b/src/modules/index/index.templ
index f8f128e..edc7235 100644
--- a/src/modules/index/index.templ
+++ b/src/modules/index/index.templ
@@ -23,7 +23,6 @@ templ IndexTempl(albums []utils.Album) {
 				@AlbumCard(album)
 			}
 		</div>
-		@utils.MusicPlayer()
 	}
 }
 
diff --git a/src/utils/utils.templ b/src/utils/utils.templ
index 54459a0..accbdd6 100644
--- a/src/utils/utils.templ
+++ b/src/utils/utils.templ
@@ -16,13 +16,15 @@ templ SkeletonTempl() {
 			<script src="/public/js/htmx.min.js" defer></script>
 			<script src="/public/js/_hyperscript.min.js" defer></script>
 			<script src="/public/js/howler.min.js" defer></script>
+			<script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/persist@3.x.x/dist/cdn.min.js"></script>
 			<script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
 			<script src="https://unpkg.com/htmx-ext-response-targets@2.0.0/response-targets.js" defer></script>
 		</head>
 		<body>
-			<main class="pb-16">
+			<main hx-boost="true" hx-target="this" hx-swap="innerHTML" id="boost-target" class="pb-16">
 				{ children... }
 			</main>
+			@MusicPlayer()
 		</body>
 	</html>
 }
@@ -31,6 +33,7 @@ templ MusicPlayer() {
 	<div
 		id="music-player"
 		class="fixed bottom-0 left-0 w-screen border-t bg-c-bg text-c-on-bg border-sky-500 grid grid-cols-[3rem_auto_3rem_3rem] gap-2 p-1"
+		hx-preserve
 		x-data="player"
 	>
 		<div
@@ -76,20 +79,27 @@ templ MusicPlayer() {
 		</button>
 		@fullMusicPlayer()
 		<script>
+		console.log("I'm being re-run :o");
 		document.addEventListener('alpine:init', () => {
-			Alpine.data("player", () => ({
-				init() {
-					window.replaceQueueAndPlayAt = (...params) => this.replaceQueueAndPlayAt(...params);
-				},
-				queue: [],
-				idx: 0,
-				currentSound: null,
-				nextSound: null,
-				volume: 0.1,
-				playing: false,
-				loading: false,
-				progress: 0,
+			Alpine.data("player", function() {
+			return {
+				queue: this.$persist([]),
+				idx: this.$persist(0),
+				volume: this.$persist(0.1),
+				playing: this.$persist(false),
+				loading: this.$persist(false),
+				progress: this.$persist(0),
+				// These cannot be persisted because they cannot be stored in localstorage
 				listenerInterval: 0,
+				//currentSound: null,
+				//nextSound: null,
+
+				init() {
+					console.log("calling alpine init method...")
+					window.replaceQueueAndPlayAt = (...params) => this.replaceQueueAndPlayAt(...params);
+					window.currentSound = null;
+					window.nextSound = null;
+				},
 
 				// sets the queue, and plays the song at idx
 				replaceQueueAndPlayAt(queue, idx) {
@@ -109,30 +119,30 @@ templ MusicPlayer() {
 				// If preloaded=true, this function will assume that it is the
 				// next song. It will trust that idx is correct.
 				async play(idx) {
-					const preloaded = this.nextSound !== null && idx === this.idx + 1;
+					const preloaded = window.nextSound !== null && idx === this.idx + 1;
 
 					// if a song is currently playing
 					// then fade it out before playing the next sound
 					if (this.playing === true 
-						&& this.currentSound !== null 
+						&& window.currentSound !== null 
 					) {
 						// this will not trigger when next() is called,
 						// because next() sets this.playing=false
 
-						this.currentSound.fade(this.volume, 0.0, 250);
+						window.currentSound.fade(this.volume, 0.0, 250);
 						await wait(250);
 					}
 
-					this.currentSound?.unload?.();
+					window.currentSound?.unload?.();
 					this.playing = false;
-					this.currentSound = null;
+					window.currentSound = null;
 					this.idx = idx;
 
 					// if a song is preloaded, assume it's the next song and play it
-					if (preloaded === true && this.nextSound !== null) {
-						this.currentSound = this.nextSound;
-						this.nextSound = null;
-						this.currentSound.play();
+					if (preloaded === true && window.nextSound !== null) {
+						window.currentSound = window.nextSound;
+						window.nextSound = null;
+						window.currentSound.play();
 						this.playing = true;
 					} else {
 						// otherwise, load the song at idx and play it
@@ -143,7 +153,7 @@ templ MusicPlayer() {
 							html5: true,
 							volume: this.volume,
 						});
-						this.currentSound = sound;
+						window.currentSound = sound;
 						this.loading = true;
 						sound.play();
 						sound.once("load", () => {
@@ -153,7 +163,7 @@ templ MusicPlayer() {
 					}
 
 					// set-up preloading for the next song
-					const sound = this.currentSound;
+					const sound = window.currentSound;
 					sound.once("play", () => {
 						const length = sound.duration();
 						const targetLength = length - 5;
@@ -172,14 +182,14 @@ templ MusicPlayer() {
 						this.playing = false;
 						this.next();
 					});
-					this.currentSound = sound;
+					window.currentSound = sound;
 				},
 
 				// checks the duration of the playing song and:
 				// - updates the song progress (0-100%)
 				// - begins preloading
 				checkDuration() {
-					const sound = this.currentSound;
+					const sound = window.currentSound;
 					if (this.playing) {
 						const length = sound.duration();
 						if (length <= 0) return;
@@ -187,7 +197,7 @@ templ MusicPlayer() {
 						const position = sound.seek();
 
 						// preload 5s before the song ends
-						if (position >= length - 5 && this.nextSound === null) {
+						if (position >= length - 5 && window.nextSound === null) {
 							this.preload();
 						}
 
@@ -199,10 +209,10 @@ templ MusicPlayer() {
 				togglePlayPause() {
 					if (this.playing === true) {
 						this.playing = false;
-						this.currentSound?.pause();
+						window.currentSound?.pause();
 					} else {
 						this.playing = true;
-						this.currentSound?.play();
+						window.currentSound?.play();
 					}
 				},
 				next() {
@@ -236,9 +246,10 @@ templ MusicPlayer() {
 						nextSound.seek(0);
 						nextSound.volume(this.volume);
 					});
-					this.nextSound = nextSound;
+					window.nextSound = nextSound;
 				}
-			}));
+			}
+		});
 		})
 
 		function wait(ms) {