Adjusted answer to question 1, started question 2