fixed up timer, turned it into a object