Lots of changes in the environment package ... very work in progress