got q1 working (with TA's help)