Added TODOs to the exercise