Added TODO comments for next phase.