Timer works
Merge branch 'olsen_timer' into timer