Working on resetting state.
Merge branch 'master' of github.com:a-price/rubble