envvar handling is not reentrant. Need a better solution. Putting this stuff on a branch for now