Drag and drop attachment support

And some more (!) hooking cleanup and rearrangements