enable/disable worked into state machine

Fixes #84