Incomplete Environments
Fixed merge conflicts within Environment