Rebasing things at the latest and greatest. Ready to start hacking!