diff --git a/docs/hacking.md b/docs/hacking.md
index 8e32cc5..e44b5d8 100644
--- a/docs/hacking.md
+++ b/docs/hacking.md
@@ -222,15 +222,21 @@ PAGE, a content type for static page support, is available as a plugin.
 ### TODO for 0.9.6
 
 * Serious updates to README and themes.md. Skim hacking.md but it's probably okay.
+* Make read-content/load-content more robust.
 * A real test suite with Stefil that at *least* tests:
   * `read-content`
   * `load-config`
+* Merge @PuercoPop's twitter summary cards plugin in some form.
+
+### TODO for 0.9.7
+
+* Test suite improvements:
   * Content Discovery
   * Theme Compilation
   * Content Publishing
   * Common Plugins including Injections
-* Merge @PuercoPop's twitter summary cards plugin in some form.
-* Make read-content/load-content more robust. Improving template debugging will be part of 0.9.7.
+* Improved template debugging? "${" instead of "{$", static checks for valid slots, etc.
+  At least a serious investigation into how such things might be provided.
 * Some minor scripting conveniences with cl-launch? (Scaffold a post/page, Enable incremental, Build, etc).
 
 ### Assorted Cleanups