Added a small TODO in the file and another in Main