Started to add rollups, WIP