Adding exercise 1 and 2 from 3.5