Refactor Timer
Merge branch 'add-location-timer'