Fixed timer. But need to check with design to see if this is what they want.
Added timer feature.
Merge branch 'fix/timer' into develop
Merged the timer/fixes branch.