Working on adding environment