Tests, efficiency, refactor.