Patched up

Moved funcitons from Time.cpp to Time.h