This sounds like a good plan, but I'd like to tackle it in a separate bug.