Timer

All tests green. This branch has the latest code from previous pull requests.