Finish implementing block ferrying between main and modal blockspace