Rosetta stone

@amfarrell in the future start a pull request as soon as you start the branch, as it makes it more visible that it is there (just make it clear that it isn't ready to merge yet)