added todos and exercise 1.16