Refactors deployment strategy, and again