updates to DnD, almost there