Match on the basic pairs

Addresses #13