This ended up being an almost complete rewrite of the base environment. Note: While the commit is dated Jan 27, the work was finished on Mar 2. original commit: ee29d371c9e6882edfc78621110bd11260ee942a