Added rudimentary drag and drop