Starting updates to EnvironmentAccessor. More cleanup needed inside before we start pulling it apart.