Another bug, need to refactor as code is getting out of hand
Passes my additional unit test
Passes all the unit tests, now for a refactor