WIP: Feature/calc datasets using rollups