Added basic framework for natpair stuff.