Timer works
Merge branch 'olsen_timer' into timer
Merge branch 'timer' into aj_timer
too many changes