Split right

Not ready for merge.
No -- I think this change is going to destabilize things, it should go in quickly if it's going in this month.