Updating for annevk's new world. Making state exposure conditional for testing.
Update with state hiding.