Last commit of teh night

No fix for drag-drop issues yet. Much sadness.