Adding in Time and Clock functions