Good progress. (I guess. Hard to tell because the diff is, uhh, "complected".)