Missing files in the previous commit
Adding TODO list at the top of the class