more work done on the drag and drop side of things