Removed overlogging.
Added measurements and rollups.