Completed requested debugging etc for lab 6