Reorg Timer code -- move into frameworks