Continued work on dialogs, taking a moment to rebase.