Continue to expand simulation
Merge branch 'zippy' of https://github.com/stuartallenmills/timertest into zippy