Moved the timer

The timer variables were all over the place, now they are all assemble
in the Calculate class.