Extended TODO list.
This is a merge.