add drag and drop branch testing area
comment out drag code
add drag and drop (somewhat working)
Merge branch 'drag'