Further cleanup/refactoring. Added drag and drop to sets.