Started the great refactor.