Minor XZing integration work

could not finish because Richert was being a gay cat.