Partial refactor.