diff --git a/TODO.txt b/TODO.txt
index e7907e5..9ee06f2 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,11 +1,16 @@
 
+FEATURE LIST
+
 1) Allow keyword variables to be resolved with a ';resolve' modifier.
-3) Create a method to upload a file directly to a file name to bypass
-buffering on large files.
-5) Call tag is acting wierd. Look at testcall.jet.
-6) Create a tag for uploading of URL data to a specific file instead
-of buffering in an internal variable. Use <upload />. See testcgi.jet
-7) For CGI image and other mime type fields you should be able to get
+2) Create a tag for uploading of URL data to a specific file instead
+of buffering in an internal variable. Use <upload />. See testpost.jet.
+3) For CGI image and other mime type fields you should be able to get
 file name and content length from variable. $[data(filename)] and
 $[data(length)] possibly.
-8) 
+4) 
+
+BUG LIST
+
+1) Call tag is acting wierd. Look at testcall.jet.
+2) Fix the variable retriever to perform all variable translation
+before fetching value processing.