Added click and drag support
Working