This should be in alignment with the modal mechanism that is being developed in parallel for editoria