Question 1 done, working on question 2