Pushing part of the refactor.