lab 5 and 6 commit