Have drag and drop almost working