Big update to TODO.md