to wit: I'd suggest landing this, filing a follow up to refactor, and then refactoring.