Expanded the TODO list a bit.