Completed question 1, but still missing q1.h