Merge pull request #1 from adamlincoln/master

Adds, gardening, start of drag/drop