closes #16 better drag/drop stuff
merge conflicts