diff --git a/src/app/views/partials/_newtable.zmpl b/src/app/views/partials/_newtable.zmpl
new file mode 100644
index 0000000..bee43c1
--- /dev/null
+++ b/src/app/views/partials/_newtable.zmpl
@@ -0,0 +1,55 @@
+@args table_data *ZmplValue, table_headers: []enum{Song, Album, Artist, Scrobbles, Date}
+
+<table>
+<thead>
+<tr>
+@zig {
+    for (table_headers) |header| {
+        switch (header) {
+            .Artist => {
+                <th>Artist(s)</th>
+            },
+            inline else => |other| {
+                const h = @tagName(other);
+                <th>{{h}}</th>
+            },
+        }
+    }
+}
+</tr>
+</thead>
+<tbody>
+@zig {
+    for (table_data) |data| {
+        <tr>
+        for (table_header) |header| {
+            switch (header) {
+                .Song => {
+                    <td class=cell>
+                    <a href="/songs/{{data.id}}">{{data.name}}</a>
+                    </td>
+                },
+                .Album => {
+                    <td class=cell>
+                    <a href="/albums/{{data.id}}">{{data.name}}</a>
+                    </td>
+                },
+                .Artist => {
+                    <td class=cell>
+                    @for (data.get("artist_info").?) |ai| {
+                        <a href="/artists/{{ai.id}}">{{ai.name}}</a>
+                    }
+                    </td>
+                },
+                .Scrobbles => {
+                    <td class=cell>{{data.scrobbles}}</td>
+                },
+                .Date =>{
+                    <td class=cell>{{data.date}}</td>
+                }
+            };
+        }
+    }
+}
+</tbody>
+</table>
\ No newline at end of file
diff --git a/src/types.zig b/src/types.zig
index 704adc0..2574610 100644
--- a/src/types.zig
+++ b/src/types.zig
@@ -61,3 +61,11 @@ pub const Rule = struct {
 pub const Rules = struct {
     rules: []const Rule,
 };
+
+pub const Headers = []enum {
+    Song,
+    Album,
+    Artist,
+    Scrobbles,
+    Date,
+};