Split right

Not ready for merge.
Did you want to do this before merging the change?