HW6 - 3rd attempt - More tests passing in Office Hour