Add start/stop feature