The undead pull request

Simple changes to check rebasing with..