Add assignments 6 & 7 too