Got swapping working