drag/drop now works (not to grid), changed lots of minor things, sorry
fix merge conflicts, made some compromises
Merge pull request #10 from Eye-Static/andy

drag/drop now works (not to grid),