Untested commit.

Refactor TimerManager.