Changes in StopWatch

Hopefully this all comes together at once