WIP: Add rollup indicator

Fixes #486