Busy refactoring.