Exercise 7: initial commit
Completed exercise 7 and 8