Adds Todos for further refactoring