non-working pairing test
Added mass, other improvements