merge with lab 7 initial code