Refactoring out the SDK environment. Looks like each CMD file gets a new environment.