Exercise 6 complete, including Extra Credit