Drag and drop and more pieces implemented