getting ready to try rebase