Fleshing out generator some more