[Added] Base for Environments added, more to come.
Merge branch 'origin/master'