diff --git a/src/app/views/albums/get.zmpl b/src/app/views/albums/get.zmpl
index 3a1641b..1024ec5 100644
--- a/src/app/views/albums/get.zmpl
+++ b/src/app/views/albums/get.zmpl
@@ -10,6 +10,10 @@
 <body>
 @partial partials/header
 <h1>{{.album}}</h1>
+@partial partials/firstlast_listens(scrobbles: .album.scrobbles, rank: .album.rank, firstlast: .firstlast)
+<h3>Yearly Performance</h3>
+@partial partials/timescale(range: .yearly)
+<h2>Songs</h2>
 @partial partials/newtable(T: ColumnChoices, table_data: .songs, columns: columns)
 </body>
 </html>
\ No newline at end of file
diff --git a/src/app/views/artists/get.zmpl b/src/app/views/artists/get.zmpl
index 48c1c25..69bd661 100644
--- a/src/app/views/artists/get.zmpl
+++ b/src/app/views/artists/get.zmpl
@@ -10,8 +10,9 @@
 <body>
 @partial partials/header
 <h1>{{.artist.name}}</h1>
-@partial partials/firstlast_listens(scrobbles: .artist.scrobbles, rank: .artist.rank, last_song: .last, first_song: .first)
-
+@partial partials/firstlast_listens(scrobbles: .artist.scrobbles, rank: .artist.rank, firstlast: .firstlast)
+<h3>Yearly Performance</h3>
+@partial partials/timescale(range: .yearly)
 <h2>Albums</h2>
 @partial partials/newtable(T: ColumnChoices, table_data: .albums, columns: columns)
 
diff --git a/src/app/views/partials/_firstlast_listens.zmpl b/src/app/views/partials/_firstlast_listens.zmpl
index 322a0e8..ed74361 100644
--- a/src/app/views/partials/_firstlast_listens.zmpl
+++ b/src/app/views/partials/_firstlast_listens.zmpl
@@ -1,9 +1,13 @@
-@args scrobbles: i64, rank: []const u8, last_song: *ZmplValue, first_song: *ZmplValue
+@args scrobbles: i64, rank: []const u8, firstlast: *ZmplValue
+
+@zig {
+    const songs = firstlast.items(.array);
+}
 
 <div>
 {{scrobbles}} scrobbles ({{rank}} place)
 <br>
-First listen: <a href="/songs/{{first_song.id}}">{{first_song.name}}</a> ({{first_song.date}})
+First listen: <a href="/songs/{{songs[0].id}}">{{songs[0].name}}</a> ({{songs[0].date}})
 <br>
-Most recent listen: <a href="/songs/{{last_song.id}}">{{last_song.name}}</a> ({{last_song.date}})
+Most recent listen: <a href="/songs/{{songs[1].id}}">{{songs[1].name}}</a> ({{songs[1].date}})
 </div>
\ No newline at end of file
diff --git a/src/app/views/partials/_timescale.zmpl b/src/app/views/partials/_timescale.zmpl
new file mode 100644
index 0000000..fdec7a1
--- /dev/null
+++ b/src/app/views/partials/_timescale.zmpl
@@ -0,0 +1,18 @@
+@args range: *ZmplValue
+
+<table>
+    <thead>
+        <tr>
+            <th>Year</th>
+            <th>Scrobbles</th>
+        </tr>
+    </thead>
+    <tbody>
+@for (range) |itm| {
+        <tr>
+    <td>{{itm.year}}:</td>
+    <td>{{itm.scrobbles}}</td>
+        </tr>
+}
+</tbody>
+</table>
\ No newline at end of file
