added switch and stop...first draft