First steps toward better add dialogs.