diff --git a/_config.yml b/_config.yml
index 2c28fcd..738a0de 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,7 @@
 # 'jekyll serve'. If you change this file, please restart the server process.
 
 # Site settings
-title: annabunches
+title: Anna and the Bunches
 email: annabunches@gmail.com
 description: > # this means to ignore newlines until "baseurl:"
   The story of Anna and her lifelong friends, Left Bunch and Right Bunch.
diff --git a/_includes/category_list.html b/_includes/category_list.html
new file mode 100644
index 0000000..3155d03
--- /dev/null
+++ b/_includes/category_list.html
@@ -0,0 +1,13 @@
+<h1 class="page-heading">{{ include.category | capitalize }}</h1>
+
+<ul class="post-list">
+  {% for post in site.categories[include.category] limit:5 %}
+    <li>
+      <span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
+      <h2>
+        <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+      </h2>
+    </li>
+  {% endfor %}
+</ul>
+
diff --git a/_includes/footer.html b/_includes/footer.html
index 72239f1..8ff2203 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,9 +1,6 @@
 <footer class="site-footer">
 
   <div class="wrapper">
-
-    <h2 class="footer-heading">{{ site.title }}</h2>
-
     <div class="footer-col-wrapper">
       <div class="footer-col footer-col-1">
         <ul class="contact-list">
diff --git a/_plugins/auto_categories.rb b/_plugins/auto_categories.rb
new file mode 100644
index 0000000..bdff537
--- /dev/null
+++ b/_plugins/auto_categories.rb
@@ -0,0 +1,9 @@
+# Very simple plugin that adds a subdirectory under _posts as a category
+
+def get_category_from_subdir(path)
+  path.sub(/^.*_posts\/(.*?)\/.*$/, "\\1")
+end
+
+Jekyll::Hooks.register :posts, :pre_render do |post, payload|
+  post.data['categories'] << get_category_from_subdir(post.path)
+end
diff --git a/index.html b/index.html
index 4f313bc..cb3d1a8 100644
--- a/index.html
+++ b/index.html
@@ -1,25 +1,15 @@
 ---
 layout: default
 ---
-
 <div class="home">
   {% for category in site.categories %}
-    <h1 class="page-heading">{{ category }}</h1>
-
-    <ul class="post-list">
-      {% for post in site.categories.{{category}} %}
-        <li>
-          <span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
-
-          <h2>
-            <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
-          </h2>
-        </li>
-      {% endfor %}
-    </ul>
-
+  {% if category.first == "meta" %} {% continue %} {% endif %}
+    <div class="column">
+      {% include category_list.html category=category.first %}
+    </div>
   {% endfor %}
-    
-  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>
 
+  <div class="site-updates">
+    
+  </div>
 </div>