Changed currentlyRunning to just be set properly in the first place.