Removed env stuff since it didn't seem to be useful (you can achieve the same thing with a module)