WIP. Improved drag/drop/dodge behvior. Refs #8