GR-56 - add dimension to measurements

Not for merge yet, just comments and testing in staging. Needs unit tests.