Incomplete swaps working