Moving env

merging early environment branch with master