adding in assignment 6 and 7