Another rebase attempt.....