Branch/drag drop

@eric79 Please review.