Adding TODOs for exercise 4