Question 1 and Question 2 almost ready