Part way commit of code through Lab 5 exercise 2