Add stop feature

WIP