Added TODO comments from draft email.