diff --git a/TODO b/TODO
index 8b8d3fce..1adaac83 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,17 @@
-FS Core
+Core
 -------
 
-* Possibly rename to "ostree"?  It sounds nicer...doesn't appear to be taken
-
 * branches
 
+Base
+----
+
+* Replace Debian network scripts with NM
+* Builder should get source packages for everything too
+ - Try rebuilding them
+* Infrastructure for overlaying artifacts on top
+ - jhbuild
+
 Deployment
 ----------