Working dayGenerator - needs clenup