adding state
Merge branch 'master' into 1540_state_restoration
state unit tests and some tweaks around feedback
Adding commentary and making some tests more consistent.
Merge pull request #58 from lbondaryk/1540_state_restoration

1540 state restoration