WIP on raw generator