WIP: Add measurements.

WIP PR.