Finished exercise 6
Finished exercise 7