Southpaw

It's always possible, I couldn't get the dev environment to work to test that it was successful.

But I definitely did have to resolve a conflict or two in order to merge.

All fixed :)