Added some missing enviroment stuff!
First commit from IDEA!