Initial work on auto-redeployment