First pass on environment.
Merge conflict.