Add section on measurements, update consents, reorg