diff --git a/html/album.py b/html/album.py
new file mode 100644
index 00000000..81206cd2
--- /dev/null
+++ b/html/album.py
@@ -0,0 +1,24 @@
+# Bryan Schumaker (11/17/2010)
+
+from libsaria.sources import library
+
+def header(wfile):
+	wfile.write("<html><body>")
+
+def footer(wfile):
+	wfile.write("</body></html>")
+
+def body(wfile, args):
+	wfile.write("<table border=1>")
+
+	artist = library.tag_tree[args["artist"]].value
+	album  = library.tag_tree[args["artist"]][args["album"]].value
+	wfile.write("<tr><td>%s</td></tr><br>" % artist)
+	wfile.write("<tr><td>%s</td></tr>" % album)
+	wfile.write("</table>")
+
+
+def to_html(wfile, args):
+	header(wfile)
+	body(wfile, args)
+	footer(wfile)
diff --git a/html/library.py b/html/library.py
index 4924becc..5810f6d1 100644
--- a/html/library.py
+++ b/html/library.py
@@ -11,12 +11,14 @@ def footer(wfile):
 	wfile.write("</body></html>")
 
 def body(wfile):
+	link = "<a href=\"album.py?artist=%s&album=%s\">%s</a><br>"
 	for artist, ar_key in library.artists():
 		wfile.write("<h2>%s</h2>" % artist)
 		for album, al_key in library.albums(ar_key):
-			wfile.write("%s<br>" % album)
+			wfile.write(link % (ar_key, al_key, album))
+			#wfile.write("<a href=\"album.py?artist=\">%s</a><br>" % album)
 
-def to_html(wfile):
+def to_html(wfile, args):
 	header(wfile)
 	body(wfile)
 	footer(wfile)
