Adding some TODOS to the project.