Added drag ability, not working 100% yet