diff --git a/lib/jol_web/controllers/page_controller.ex b/lib/jol_web/controllers/page_controller.ex
index d7375d8..d5a81c7 100644
--- a/lib/jol_web/controllers/page_controller.ex
+++ b/lib/jol_web/controllers/page_controller.ex
@@ -8,14 +8,6 @@ defmodule JOLWeb.PageController do
     |> render(:home)
   end
 
-  @spec tags(Plug.Conn.t(), any()) :: Plug.Conn.t()
-  def tags(conn, _params) do
-    conn
-    |> assign(:tags, JOL.Blog.unique_tag_list())
-    |> assign(:page_title, "Post Tags")
-    |> render(:tags)
-  end
-
   def about(conn, _params) do
     conn
     |> assign(:page_title, "About Jessica")
diff --git a/lib/jol_web/controllers/tag_controller.ex b/lib/jol_web/controllers/tag_controller.ex
new file mode 100644
index 0000000..99f4c86
--- /dev/null
+++ b/lib/jol_web/controllers/tag_controller.ex
@@ -0,0 +1,9 @@
+defmodule JOLWeb.TagController do
+  use JOLWeb, :controller
+
+  def index(conn, _params) do
+    conn
+    |> assign(:page_title, "Jess Uses These Tags")
+    |> render(:index)
+  end
+end
diff --git a/lib/jol_web/controllers/page_html/tags.html.heex b/lib/jol_web/controllers/tag_html/index.html.heex
similarity index 100%
rename from lib/jol_web/controllers/page_html/tags.html.heex
rename to lib/jol_web/controllers/tag_html/index.html.heex
diff --git a/lib/jol_web/router.ex b/lib/jol_web/router.ex
index 2e644a3..4269559 100644
--- a/lib/jol_web/router.ex
+++ b/lib/jol_web/router.ex
@@ -22,7 +22,7 @@ defmodule JOLWeb.Router do
     pipe_through :browser
 
     get "/", PageController, :home
-    get "/tags", PageController, :tags
+    get "/tags", TagController, :index
     get "/archive", PageController, :archive
     get "/about", PageController, :about
     get "/now", PageController, :now