Fixed dragging

Not completely, though. More to come...