added expressionSwap class & helpers