some more progress on Imp/Wp

- I'm going to run into a problem due to partial environments.