refactored rollups into a separate Measurement branch