Now it's merged and we're square

All these commits are for the merge