WIP for exercise 7