Actually, I'm just going to apply it and use it as the basis for the refactoring. What was I thinking? Must eat breakfast now....