Timer Classes

I seemed to have screwed up some how changing the commits to "Change ID: " I don't know how to fix this :cry: