Exercise 2 and 3 done

TODO: Test if exercise 3 is correct