working on dialogs. need to pull code
merged some stuff