Rearrange some Timer code.
Merge pull request #159 from ahmedcharles/replay

Rearrange some Timer code.