* TODO: Update.
diff --git a/ChangeLog b/ChangeLog
index ef936ad..f945d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-08  Scott James Remnant  <scott@netsplit.com>
 
+	* TODO: Update.
+
 	* nih/option.c (nih_option_help): Allow the usage string to be
 	customised.
 	(nih_option_set_usage): Using this function.
diff --git a/TODO b/TODO
index d7ec3fb..2b142a9 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,21 @@
+option parser:
+- should be able to give a description for the program that appears
+  after usage
+- should be able to give an extensive help that appears after the
+  options
+- might not want log level stuff by default, likewise help/version
+
+command parser:
+- based on option parser, works in form [OPTION...] CMD [OPTION...]
+- also switches on argv[0]
+
+timers:
+- calendar scheduled timers
+
+file matching functions
+common pathnames?
+
+
 allocator/slab module
 restore list_entry code somewhere else