TEMP STABLE timer and tracker are working
Merge branch 'develop_timer'