Pull state reporting changes into 1606_ox branch

Cool.  It looks like you still need to update the server to respond to the ping though, right?