diff --git a/doclet/README.md b/doclet/README.md
index 95e40c1..6f41638 100644
--- a/doclet/README.md
+++ b/doclet/README.md
@@ -1,9 +1,9 @@
 This doclet generates the play-clj doc site.
 
-## Usage
+## Directions
 
 1. Download and extract the [LibGDX source code](https://github.com/libgdx/libgdx/releases)
 2. Run `lein uberjar` in this directory
 3. Run the following command in this directory:
 
-`javadoc -sourcepath ~/path/to/libgdx/gdx/src/ -subpackages com.badlogic -doclet play_clj_doclet.core.Start -docletpath target/play-clj-doclet-0.0.1-SNAPSHOT-standalone.jar`
+`javadoc -sourcepath path/to/libgdx/gdx/src/ -subpackages com.badlogic -doclet play_clj_doclet.core.Start -docletpath target/play-clj-doclet-0.0.1-SNAPSHOT-standalone.jar`
diff --git a/doclet/project.clj b/doclet/project.clj
index ea42f9c..520f2c0 100644
--- a/doclet/project.clj
+++ b/doclet/project.clj
@@ -1,7 +1,8 @@
 (defproject play-clj-doclet "0.0.1-SNAPSHOT"
   :description "FIXME: write description"
-  :dependencies [[org.clojure/clojure "1.6.0"]
-                 [hiccup "1.0.5"]]
+  :dependencies [[hiccup "1.0.5"]
+                 [marginalia "0.7.1"]
+                 [org.clojure/clojure "1.6.0"]]
   :source-paths ["src/clojure"]
   :java-source-paths ["src/java"]
   :javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"]
diff --git a/doclet/src/clojure/play_clj_doclet/core.clj b/doclet/src/clojure/play_clj_doclet/core.clj
index 1085d55..c1d2487 100644
--- a/doclet/src/clojure/play_clj_doclet/core.clj
+++ b/doclet/src/clojure/play_clj_doclet/core.clj
@@ -1,7 +1,8 @@
 (ns play-clj-doclet.core
   (:require [clojure.edn :as edn]
-            [clojure.string :as string]
             [clojure.java.io :as io]
+            [clojure.string :as string]
+            [marginalia.core :as marg]
             [play-clj-doclet.html :as html])
   (:import [com.sun.javadoc ClassDoc ConstructorDoc Doc ExecutableMemberDoc
             Parameter RootDoc]))
@@ -50,15 +51,49 @@
            (map #(vector (first %) (parse-class-entry c (second %))))
            (into {})))
 
-(defn save
+(def ^:const valid-syms #{'defn 'defmacro})
+
+(defn match?
+  [doc-name sym-name]
+  (or (= doc-name sym-name)
+      (.startsWith doc-name (str sym-name " "))))
+
+(defn process-group
+  [{:keys [type raw] :as group} doc-map]
+  (let [form (read-string raw)
+        n (second form)]
+    (when (and (contains? valid-syms (first form))
+               (-> n meta :private not))
+      (assoc group
+             :name (str n)
+             :java (filter #(match? (first %) (str n)) doc-map)))))
+
+(defn process-groups
+  [{:keys [groups] :as parsed-file} doc-map]
+  (->> (map #(process-group % doc-map) groups)
+       (remove #(nil? (:name %)))
+       (assoc parsed-file :groups)))
+
+(defn parse-clj
   [doc-map]
-  (->> doc-map pr-str (spit (io/file "uberdoc.edn")))
-  (->> doc-map html/create (spit (io/file "uberdoc.html"))))
+  (->> (io/file "../src/")
+       file-seq
+       (filter #(-> % .getName (.endsWith ".clj")))
+       (sort-by #(.getName %))
+       (map #(.getCanonicalPath %))
+       (map marg/path-to-doc)
+       (map #(process-groups % doc-map))))
+
+(defn save
+  [parsed-files]
+  (->> parsed-files pr-str (spit (io/file "uberdoc.edn")))
+  (->> parsed-files html/create (spit (io/file "uberdoc.html"))))
 
 (defn parse
   [^RootDoc root]
   (->> (map parse-class (.classes root))
        (filter some?)
        (into {})
+       parse-clj
        save)
   (println "Created uberdoc.html and uberdoc.edn."))
diff --git a/doclet/src/clojure/play_clj_doclet/html.clj b/doclet/src/clojure/play_clj_doclet/html.clj
index d6b0a01..a9e7fca 100644
--- a/doclet/src/clojure/play_clj_doclet/html.clj
+++ b/doclet/src/clojure/play_clj_doclet/html.clj
@@ -23,14 +23,20 @@
     [:b (str name)]
     " "
     (string/join ", " (map param params))]
-   [:i text]])
+   (when (> (count text) 0)
+     [:i text])])
 
-(defn section
-  [[clj-name items]]
-  [:div
-   [:h2 {} clj-name]
-   (map item (sort-by first items))])
+(defn create-from-file
+  [parsed-file]
+  (for [group (:groups parsed-file)]
+    [:div
+     [:h1 {} (:name group)]
+     (for [[name items] (:java group)]
+       [:div
+        (when (not= (:name group) name)
+          [:h3 name])
+        (map item (sort-by first items))])]))
 
 (defn create
-  [doc-map]
-  (html (map section doc-map)))
+  [parsed-files]
+  (html (map create-from-file parsed-files)))