looping through calls better and setting up stop cammands