Remove junk
Add support for pausing and stopping