Continuing the refactor.