Still working CI failures fwiw, but not getting far. Going to pick things back up after some lunch.