Adding stop/start functionality