separate timer out into partial
fix merge conflict
Merge pull request #24 from tsamb/SRB/timer_location

Srb/timer location