Experimental stuff broke dragging capabilities
Merged dragging changes