Made some more progress on q1 and q2
Made some more progress on q1 and q2