Finished version 1 of drag and drop