Question 1&2 done, and submitted to the correct branch