Invasive data collection

Other Lapse issues: