More TODO notes.