updated init for Mac
Merge branch 'landonMOE'
Environment is now a singleton