Implement clean stop

Work is COMPLETE!