work from today, everything done except randomization