Began refactoring.