Added actual NodeSwapper class