@20m wip: structuring