Annother rejig of where the env stuff goes