WIP scope NewEnv correctly
WIP update design doc