initial work on environment-control fork