Code now passes all tests, both ours and Cyndi's