Minimal state refactoring

refs #4
Stopping without error

refs #4
Works well on error etc.

refs #4
Version 0.1.1