Implement Drag and Drop
Merge conflicts supressed
Merge stuff