major progress on drag and drop