WIP - Refactoring to provide proxy support in EnvironmentContext.  Everything compiles.