Preparing for refactor.