Added start/stop ability