Improved drag and drop woo!