Added ability to stop

Not tested