refactoring.
Start::stop

Fixes #13