Add TODO lists for refactoring