Almost there with the dragging and updating