@dsaff This isn't what I had in mind. I can add it later; let's not add more things to go back and forth about in this change (it's actually pretty close iMHO)