diff --git a/TODO b/TODO
index 6d901af..f4f196a 100644
--- a/TODO
+++ b/TODO
@@ -1,73 +1,8 @@
-NEW
----
+[NEW]
 
-- Added the following builtin variables:
+[CHANGES]
 
-  __DATE__       # Date in YYYYMMDD format
-  __DATETIME__   # Date and time in YYYYMMDDHHMMSS format
-  __HOSTNAME__   # Full name of current host as passed to program
-  __HOSTNUM__    # Count of host being processed, starting at 1
-  __HOSTSHORT__  # Leftmost component of hostname as passed to program
-  __TIME__       # Time in HHMMSS format
-
-- Added an "execution variable".  This runs a command of your
-  choosing (on the local machine) and assigns the results to
-  a user-defined variable.
-  
-- Added -E to redirect all stderr output to stdout instead,
-
-- Added -T timeout option (default is 15 sec).
-
-- Added -a to allow program to continue after file transfer error.
-
-- Added -l logging option. Defaults to /dev/null.  This fixes the error
-  that was previously being reported:
-
-    "No handlers could be found for logger "paramiko.transport"
-
-- Added -q for "quieter" output.
-
-
-CHANGES
--------
-
-- File transfers now properly preserve the permissions mode.
-
-- Changed hostname separator from ':' to '-' when using the -G command.
-
-- The <HOSTNAME> and <HOSTSHORT> builtins have been replaced
-  with the new builtins described above.
-
-- Error messages now more consistent and clear.
-
-- Test mode now expands variable references to their values for
-  all variables except the builtins above (which are only
-  evaluated at runtime).
-
-- Documentation has been rewritten and improved considerably.
-
-
-BUG FIXES
----------
-
-- Fixed bug that prevented the proper dereferencing of
-  __HOSTNAME|SHORT__ (formerly <HOSTNAME|SHORT>) in file transfer
-  specifications.
-
-- Fixed bug that prevented variable substitution in hostnames.
-
-- Fixed bug that prevented '.define' variables from being substituted
-  in file transfer specifications.
-
-- Fixed bug that only recognized sudo invocations if they were the
-  first statement on a command line.  All instances of the string
-  "sudo " will now force sudo password prompting and processing.
-  That string is ignored if it appears inside single- or double quotes.
-  
-- Fixed bug that intermittently occurred during password-based auth
-  sessions because ssh-agent and key searching were still being used.
-
-- Fixed error reporting blowout when key-exchange auth fails.
+[BUG FIXES]
 
 
 TODO
@@ -75,6 +10,10 @@
 
 - File Xfer: Renaming
 
+- File Xfer: Globing - what about dirs, do we recurse?
+
+- Options for searching all the command files and hostlistfiles
+
 
 sudoers Mode
 ------------