Merge HW3_Cody into Elliot's branch