Partially implemented some more of the env.json approach
Fixed a very silly issue following the previous commit