added beginnings for drag and drop support