diff --git a/src/web.lisp b/src/web.lisp
index 4c09ccb..5e3cc92 100644
--- a/src/web.lisp
+++ b/src/web.lisp
@@ -780,6 +780,7 @@
 		   (utils:set-alert "No files provided.")
 		   (redirect "/dashboard"))
 		  (t (loop :for item :in files :do
+		    ;; TODO: ADD FILES TO DATABASE (IMAGE-TYPE FILE NAME ETC.)
 		    (storage:store-file
 		     "" "media"
 		     (utils:slugify (caddr item)) (cdr item)))
@@ -790,6 +791,22 @@
 	      (utils:set-alert "You are not authorised to view this page.")
 	      (redirect "/login")))))))
 
+
+(defroute ("/storage/manage" :method :GET) ()
+  (hermetic:auth (:logged-in)
+		 ;; Authorised
+		 (let ((alert (utils:get-and-reset-alert)))
+		   (render #P"/user/storage.html"
+			   (append (auth:auth-user-data)
+				   `(:alert ,alert
+				     :files ,(storage:get-file-names
+					      (storage:get-files-in-directory
+					       "" "media"))
+				     :system-data ,(nera:system-data)))))
+		 ;; Not Authorised
+		 (progn (utils:set-alert "You are not logged in.")
+			(redirect "/login"))))
+
 ;;
 ;; Error pages
 
diff --git a/templates/user/dashboard.html b/templates/user/dashboard.html
index 900c1c9..25fb9cb 100644
--- a/templates/user/dashboard.html
+++ b/templates/user/dashboard.html
@@ -5,7 +5,7 @@
 <div>
     <a href="/create/page">Create Page</a>
     <a href="/user/pages">Manage Pages</a>
-    <a href="/storage/files">Manage Files</a>
+    <a href="/storage/manage">Manage Files</a>
     {% if roles.administrator %}
     <a href="/users">Manage Users</a>
     {% endif %}
diff --git a/templates/user/storage.html b/templates/user/storage.html
new file mode 100644
index 0000000..d397271
--- /dev/null
+++ b/templates/user/storage.html
@@ -0,0 +1,27 @@
+{% extends "layouts/default.html" %}
+{% block title %}Manage you archive.{% endblock %}
+{% block content %}
+<h1>Storage</h1>
+
+{% for item in files %}
+{{item}}
+{% endfor %}
+
+<div>
+<h2>File Upload</h2>
+<form action="/storage/upload" method="POST" enctype="multipart/form-data">
+  <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
+    <label>Single File Upload</label>
+    <input required type="file" name="STORAGE-FILE">
+  <input type="submit" value="Upload File"/>
+</form>
+
+<form action="/storage/multi-upload" method="POST" enctype="multipart/form-data">
+  <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
+  <label>Multi-File Upload</label>
+  <input required type="file" name="STORAGE-FILES" multiple>
+  <input type="submit" value="Upload Files"/>
+</form>
+</div>
+
+{% endblock %}