Set up for some refactoring.