* Honor mixed state

* Prepare for change to engine

* Unused vars

* Remove comments

* Skip test for now

* Comment for skip

* Compartmentalize changes

* Justification comments