Added TODO notes.