Committing in a broken state whilst I figure out how to represent a patch