Update TODO, based on initial feedback.