[#1842] Heavily reworking the dynamic for modification chapter - there is still quite a bit left to do