Refactor
Another test + refactor
Failing test for actual new code zomg