Part 1, Step 1; also, removed old code from HW3