refactor - separate data and http for measurements.