Redid the time system to be more in line with the standards