Finish exercise 8.4

everything is in the title

Finish #exercise_8.4