diff --git a/src/blarg/models/files.clj b/src/blarg/models/files.clj
index a666626..3839f2d 100644
--- a/src/blarg/models/files.clj
+++ b/src/blarg/models/files.clj
@@ -1,5 +1,6 @@
 (ns blarg.models.files
-  (:use [blarg.models.db])
+  (:use [blarg.models.db]
+        [blarg.datetime])
   (:require [com.ashafa.clutch :as couch]
             [clojure.java.io :as io]))
 
@@ -17,9 +18,18 @@
             attachment-info))))))
 
 (defn list-files [path]
-  (->view-values
-    (couch/with-db files
-      (couch/get-view "files" "listPublishedByPath" {:key path}))))
+  (if-let [file-list (->view-values
+                       (couch/with-db files
+                         (couch/get-view "files" "listPublishedByPath" {:key path})))]
+    (map
+      (fn [f]
+        (let [attachment (second (first (:_attachments f)))]
+          {:id (:_id f)
+           :filename (:filename f)
+           :last_modified (parse-timestamp (:last_modified_at f))
+           :content-type (:content_type attachment)
+           :size (:length attachment)}))
+      file-list)))
 
 (defn get-tree []
   (->view-keys
diff --git a/src/blarg/routes/files.clj b/src/blarg/routes/files.clj
index 9af2d89..6101986 100644
--- a/src/blarg/routes/files.clj
+++ b/src/blarg/routes/files.clj
@@ -9,7 +9,10 @@
 
 (defn list-files [path]
   (layout/render
-    "files/list.html" {:files (files/list-files path)}))
+    "files/list.html" {:html-title (->html-title [(str "Files in " path)])
+                       :path path
+                       :files (files/list-files path)
+                       :tree (files/get-tree)}))
 
 (defn get-file [path]
   (if-let [file (files/get-file path)]
diff --git a/src/blarg/views/templates/base.html b/src/blarg/views/templates/base.html
index 4f0183e..621cf18 100644
--- a/src/blarg/views/templates/base.html
+++ b/src/blarg/views/templates/base.html
@@ -42,6 +42,7 @@
 		<ul class="nav pull-right">
 {% if user-id %}
 			<li><a href="{{context}}/newpost"><i class="icon-pencil"></i> New Post</a></li>
+			<li><a href="{{context}}/listfiles"><i class="icon-file"></i> Files</a></li>
 			<li class="dropdown">
 				<a class="dropdown-toggle" data-toggle="dropdown" href="#">
 					<i class="icon-user"></i> {{user-id}}<span class="caret"></span>
diff --git a/src/blarg/views/templates/files/list.html b/src/blarg/views/templates/files/list.html
new file mode 100644
index 0000000..75f352d
--- /dev/null
+++ b/src/blarg/views/templates/files/list.html
@@ -0,0 +1,83 @@
+{% extends "blarg/views/templates/base.html" %}
+
+{% block content %}
+
+<div class="page-header">
+	<h2>Index of {{path}}</h2>
+</div>
+
+<div>
+	<div class="pull-left">
+		<select id="tree">
+		{% for folder in tree %}
+		<option{% ifequal folder path %} selected{% endifequal %}>{{folder}}</option>
+		{% endfor %}
+		</select>
+	</div>
+	<div class="pull-right">
+		<a class="btn btn-primary" href="#" data-toggle="modal" data-target="#newFileModal">Upload New File</a>
+	</div>
+	<div class="clearfix"></div>
+</div>
+
+<table class="table table-hover table-condensed">
+	<thead>
+		<tr>
+			<th width="440px">Filename</th>
+			<th width="100px">Size</th>
+			<th width="240px">Last Modified</th>
+			<th width="160px">Actions</th>
+		</tr>
+	</thead>
+	<tbody>
+		{% for file in files %}
+		<tr>
+			<td>
+				<a href="{{context}}/files{{path}}{{file.filename}}"><i class="icon-file"></i>  {{file.filename}}</a><br />
+				<small class="muted">{{file.content-type}}</small>
+			</td>
+			<td>{{file.size}}</td>
+			<td>{{file.last_modified|to_fulltime}}</td>
+			<td>
+				<a class="btn btn-warning" data-updatefileid="{{file.id}}" href="#">Update</a>
+				<a class="btn btn-danger" data-deletefileid="{{file.id}}" href="#">Delete</a>
+			</td>
+		</tr>
+		{% endfor %}
+	</tbody>
+</table>
+
+<div id="newFileModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="newFileModalLabel" aria-hidden="true">
+	<div class="modal-header">
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+		<h3 id="newFileModalLabel">Upload New File</h3>
+	</div>
+	<form action="{{context}}/uploadfile" method="post" enctype="multipart/form-data" class="form-horizontal">
+		<div class="modal-body">
+			<div class="control-group">
+				<label class="control-label" for="newPath">Path</label>
+				<div class="controls">
+					<input type="text" id="newPath" name="path" value="{{path}}" />
+				</div>
+			</div>
+			<div class="control-group">
+				<label class="control-label" for="newFile">Upload File</label>
+				<div class="controls">
+					<input type="file" id="newFile" name="file" placeholder="File" />
+				</div>
+			</div>
+		</div>
+		<div class="modal-footer">
+			<button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+			<button type="submit" class="btn btn-primary">Upload</button>
+		</div>
+	</form>
+</div>
+
+<script type="text/javascript">
+$('#tree').change(function() {
+	window.location.href = '{{context}}/listfiles' + $(this).val();
+})
+</script>
+
+{% endblock %}