WIP on generator