Add first cut of Dialog to fix #14