A lot of refactoring, fixing DeployVariables