diff --git a/TODO b/TODO
index d916d31..aeb7ad7 100644
--- a/TODO
+++ b/TODO
@@ -49,6 +49,16 @@
 TODO
 ----
 
+- Restructure __HOSTNAME__, __HOSTSHORT__ processing to must make
+  them part of the symbol table.
+
+- Add the following builtins:
+
+  __DATE__
+  __DATETIME__
+  __TIME__
+  __$ENVVAR__
+
 
 
 sudoers Mode