incorporating changes from first code and design review of deployment engine