Add a Timer class
Merge Timer classes