Pull request for dialog box, part 1