Made the revised version work.
WIP: starting on drang-n-drop