Changed namespace to Time. May have to revert this