DND Update

Getting closer for dnd