Move Timer to separate class