Finish exercise 1 and 2 from section 3.5