Still need to provide switch for environment.

No user-level work yet.