Re-implemented drag and drop. Still needs some code cleanup but
workable.