Exercise 6 final commit