Add combined Assignment 6 and Assignment 7