work in progress
Big CI rework, getting ready to merge