lots of DnD changes

working towards #16