work on Time, still not final