Bit more work on rebaser, merging object changes. Not finished.