Rewrote drag-drop to use drag manager
Updated TODO