Finish exercise 8.1
Finish exercise 8.2