WIP better drag and drop