Q1 and Q2

Q1 and Q2 is done