Infrastructure for dyads in place.
Further work on supporting dyads.