I like that, but save it for a follow-up PR>