Added clock
Cleaned up references
Cleaned up code
Added TimeUtil, commented clocks