Rebase and get it recompiling