renamed CellMeasureBlock to MeasureBlock
refactored out Wifi backup code