Class1::swap function improved

All of us improved the Class1::swap function, using skimdog’s computer.
Still needs work!