Oh the refactoring you'll do.