Added the drag and drop, not functional yet