Added stuff for Exercise 10. Not fully working