Starting refactor.
Starting refactor.