Finished lab 6, added lab 7