Updated Time to include Weekdays, shifted constants to it