Updated TODO.md for later.  I don't have time to continue working on this today.