Made pairings nicer. Added cross table.