Add ability to stop and pause