All tests pass! Now must refactor