Drag.hook re-write, re-organization