more lab1 progress