Praise be, stacking is such a better ux for separating out a feature diff into distinct component units and native support makes it easy.