Last commit before abandoning drag-and-drop.
All sorts of stuff.