Pull state reporting changes into 1606_ox branch

Haha, red means removed.  I need to learn how to use GitHub apparently!