Fixed to be consistent with HW3
Structure for HW4
Updates for Assignment 4