Second commit, adding in lab 3 code