added to lab 1 and finished lab 2