Finished exercise 1 and 2 (week 6)