New time gen

Finalize and address Alex's comments, trial 2.
not really but you have to add the data somewhere. You can probablyjust not re define the init