Nearly finished with the refactoring.