Removed singleton. Added enable/disable dragging methods