Features/interactive exit

Possible implementation for #911