Added rudimentary drag-n-drop