Updates for Exercise 2 and 3

Exercise 2 is not fully working yet