Added start / stop functionality