partway done with q2