Working!  Added some logic so that changes are still processed when ensure states are changes along with other properties (unless the change is a termination).  Done some tests and it appears to be working as intended. :)