q1 finished

Take a look and just double check that I didn't miss something obvious