This refactor is good good good.