New time system

MERGE ME