more WIP on getting new deployment right