Rewrote Time class, and added functionality