Starting to incrementally add in refactorings.