Updated TODO list on Thu 11-07 12:31