Added HW 07-shapes