HW 7 Baseline with 2 more tests passing from HW6