Adding todo notes for refactoring.