Updated Evnironment handling
Merge branch 'master' into dev-events-oli
updated execute, removed DRYs