WIP on Generator near completion