More rework to clean interface
Further factoring of CI, appears to be working in parallel correctly