More DnD testing and editing/duplication/adding code