Implement code to pass failing timer test. More tests needed...