Add TODO tasks
slight changes