Implement clean stop

In progress still...