Have opted to simplify the diffs. Working on the patch/apply.