All wrapped up, pre-merge.