A refactoring of the Drag and Drop changes which now encorporates the OAEdit refactor.