Disruption refactoring

*DO NOT MERGE*

pr to open the discussion on disruption handling