Rebased some dialogue code :-)