Main CI demo largely in place