Start adding swapping component