Made the Time class static and better