add timerLogic
Merge into master from timerLogic