Adding a few TODO notes.