Added TODOs after code review.