diff --git a/TODO b/TODO
index 0458204..5f407a2 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,13 @@
 NEW
 ---
 
+- Added the following builtins:
+
+  __DATE__       # Date in YYYYMMDD format
+  __DATETIME__   # Date and time in YYYYMMDDHHMMSS format
+  __HOSTNUM__    # Count of host being processed, starting at 1
+  __TIME__       # Time in HHMMSS format
+
 - Added -E to redirect all stderr output to stdout instead,
 
 - Added -T timeout option (default is 15 sec).
@@ -18,10 +25,8 @@
 
 - Changed hostname separator from ':' to '-' when using the -G command.
 
-- The HOSTNAME and HOSTSHORT built-in names no longer use < and > as
-  delimiters, but use a double underbar instead as in: __HOSTNAME__.
-  This change was made to avoid having to quote these metacharacters
-  since they are used by the shell for redirection.
+- The <HOSTNAME> and <HOSTSHORT> builtins have been replaced
+  with the new builtins described above.
 
 - Error messages now more consistent and clear.
 
@@ -49,15 +54,6 @@
 TODO
 ----
 
-- Restructure __HOSTNAME__, __HOSTSHORT__ processing to must make
-  them part of the symbol table.
-
-- Add the following builtins:
-
-  __DATE__
-  __DATETIME__
-  __HOSTNUM__
-  __TIME__
 
 - Add:  .define foo = ! string
 
@@ -75,6 +71,10 @@
 
   Runtime __HOSTSHORT__ == ozzie
 
+- Write a new section on builtins.  Note that they are evaluated
+  *locally* and are reevaluated for each new host being processed.
+  e.g., Timestamp will change with a big list of hosts.
+
 
 
 sudoers Mode