Cell.Swap now checks both cells to see if they are locked.