Got drag and drop mostly working