time to refactor dragndrop