SwapEngine exposed and some cleanup. Full test suite passes