Updated to use a run.py that can sub in env vars