Update stopwatch, still needs a little work but great progress