dragging mostly works
merge conflicts