diff --git a/TODO.txt b/TODO.txt
index 6129da8e..9daef449 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -87,9 +87,6 @@ etg/pen.py
 
 etg/menu.py
 ------------
-    * Move wxMenuItem to its own etg file
-    * We should be able to support GetMenuItems
-    * wxMenuBar::FindItem as well.
     * Figure out what to do about the MSW-only methods in wxMenuItem
 
 
@@ -99,6 +96,20 @@ wxProgressDialog
     * and wxProgressDialog inherits from the generic version
 
 
+Generate Unitests
+-----------------
+    * Autogenerate a skeleton unittest module for each etg module.
+    * It can traverse the items in the module object and use a test
+      template based on what kind of item it is.  Templates could
+      include toplevel window tests, non-toplevel window, event
+      binder, event class, etc.
+    * If the file already exists then don't overwrite it.  Or perhaps
+      we could have a "# AUTOGENERATED" tag in the file that means that
+      it can be overwritten.  If a human wants to take over the file and
+      add additional tests then they just need to remove that tag.
+
+
+
 Deprecated C++ items
 ---------------------
     * Does Doxygen have a standard way to mark items as deprecated
@@ -114,6 +125,8 @@ where it will generate a new function that is passed "self" and that
 you can simply return a value from.
 
 
+
+
 Namespace Diff Tool
 -------------------
 I think that this will be more than just a diff tool, but for now that