Rebase, in the right order now