Along the same lines I think that this file needs to be split out into a collection of modules which we then compose into the env.