Bunch more rearrangement in readiness for undo