7.x

I *think* this is working as intended.  Let me know if i've missed the point.