Big CI rework, getting ready to merge