@wip work on takeup, need to extract aggregator