Close #38 : Integrate Joe's dialog