[Evgeny, Jason] drag drop refactor progress