More work on drag-and-drop.
Still more work on drag-and-drop.