Refactoring. Lotsa refactoring.