Converted to using super pom.  Created safeMove method.