Starting TimerManager.
appeasing git
Merge branch 'master' into sam
More timer stuff
merging kinda and break toast