New time gen

Finalize and address Alex's comments, trial 2.
XXX still relevant?