Even more work on drag and drop