More TODOs for thought.