Commit before I rewrite the drag listener because it is very silly.