Rebase Problems, hackishly readding code.