Passing two tests
More tests and a refactor
Combining I and V