re-wrote timer code
removed unnecessary class