diff --git a/test/results/conclusions.txt b/test/results/conclusions.txt
index d759573..e2d2aec 100644
--- a/test/results/conclusions.txt
+++ b/test/results/conclusions.txt
@@ -1,212 +1,212 @@
->>>G	boyd IV Secret	woolamce
->>>G	boyd IV Secret	woolampif
->>>G	boyd IV Secret	yahalom
->>>G	boyd IV Secret	yahalomBan
->>>G	boyd IV Secret	yahalompaulson
->>>G	boyd RV Secret	woolamce
->>>G	boyd RV Secret	woolampif
->>>G	boyd RV Secret	yahalom
->>>G	boyd RV Secret	yahalomBan
->>>G	boyd RV Secret	yahalompaulson
->>>G	ccitt509 IV Secret	nssymmetric
->>>G	ccitt509 IV Secret	nssymmetricamended
->>>G	ccitt509 IV Secret	spliceAS
->>>G	ccitt509 IV Secret	tmn
->>>G	ccitt509 RV Secret	nssymmetric
->>>G	ccitt509 RV Secret	nssymmetricamended
->>>G	ccitt509 RV Secret	spliceAS
->>>G	ccitt509 RV Secret	spliceAShc
->>>G	ccitt509 RV Secret	tmn
->>>G	denningsaccosh AV Niagree	nssymmetricamended	yahalom
->>>G	denningsaccosh AV Niagree	wmfbrutus
->>>G	denningsaccosh AV Niagree	wmfbrutus	yahalom
->>>G	denningsaccosh AV Niagree	woolamcmv
->>>G	denningsaccosh AV Niagree	yahalom
->>>G	denningsaccosh AV Niagree	yahalomBan
->>>G	denningsaccosh AV Niagree	yahalomBan	yahalom
->>>G	denningsaccosh AV Niagree	yahalomlowe
->>>G	denningsaccosh AV Niagree	yahalompaulson
->>>G	denningsaccosh AV Niagree	yahalompaulson	yahalom
->>>G	denningsaccosh AV Secret	woolamcmv
->>>G	denningsaccosh AV Secret	yahalomBan
->>>G	denningsaccosh AV Secret	yahalompaulson
->>>G	denningsaccosh BV Niagree	isoiec11770213
->>>G	denningsaccosh BV Niagree	nssymmetric
->>>G	denningsaccosh BV Niagree	nssymmetricamended
->>>G	denningsaccosh BV Niagree	otwayrees
->>>G	denningsaccosh BV Niagree	wmfbrutus
->>>G	denningsaccosh BV Secret	nssymmetric
->>>G	denningsaccosh BV Secret	nssymmetricamended
->>>G	gongnonce IV Niagree	nsl7
->>>G	kaochow2 IV Niagree	nsl7
->>>G	kaochow2 IV Niagree	woolampif
->>>G	kaochow2 IV Niagree	yahalomBan
->>>G	kaochow2 IV Niagree	yahalompaulson
->>>G	kaochow2 IV Secret	woolampif
->>>G	kaochow2 IV Secret	yahalomBan
->>>G	kaochow2 IV Secret	yahalompaulson
->>>G	kaochow2 RV Niagree	nsl7
->>>G	kaochow2 RV Niagree	woolampif
->>>G	kaochow2 RV Niagree	yahalomBan
->>>G	kaochow2 RV Niagree	yahalompaulson
->>>G	kaochow2 RV Secret	gongnonce
->>>G	kaochow2 RV Secret	woolampif
->>>G	kaochow2 RV Secret	yahalomBan
->>>G	kaochow2 RV Secret	yahalompaulson
->>>G	kaochow3 IV Niagree	nsl7
->>>G	kaochow3 IV Niagree	nsl7	yahalomBan
->>>G	kaochow3 IV Niagree	woolampif
->>>G	kaochow3 IV Niagree	yahalompaulson
->>>G	kaochow3 IV Secret	nsl7	yahalomBan
->>>G	kaochow3 IV Secret	woolampif
->>>G	kaochow3 IV Secret	yahalompaulson
->>>G	kaochow3 RV Niagree	nsl7
->>>G	kaochow3 RV Niagree	woolampif
->>>G	kaochow3 RV Niagree	yahalomBan
->>>G	kaochow3 RV Niagree	yahalompaulson
->>>G	kaochow3 RV Nisynch	nsl7	yahalomBan
->>>G	kaochow3 RV Secret	gongnonce
->>>G	kaochow3 RV Secret	woolampif
->>>G	kaochow3 RV Secret	yahalomBan
->>>G	kaochow3 RV Secret	yahalompaulson
->>>G	kaochow IV Niagree	nsl7
->>>G	kaochow IV Niagree	woolamce
->>>G	kaochow IV Niagree	woolampif
->>>G	kaochow IV Niagree	yahalomBan
->>>G	kaochow IV Niagree	yahalomlowe
->>>G	kaochow IV Niagree	yahalompaulson
->>>G	kaochow IV Secret	woolamce
->>>G	kaochow IV Secret	woolampif
->>>G	kaochow IV Secret	yahalomBan
->>>G	kaochow IV Secret	yahalompaulson
->>>G	kaochow RV Niagree	denningsaccosh
->>>G	kaochow RV Niagree	gongnonceb
->>>G	kaochow RV Niagree	nsl7
->>>G	kaochow RV Niagree	woolamce
->>>G	kaochow RV Niagree	woolampif
->>>G	kaochow RV Niagree	yahalomBan
->>>G	kaochow RV Niagree	yahalomlowe
->>>G	kaochow RV Niagree	yahalompaulson
->>>G	kaochow RV Secret	denningsaccosh
->>>G	kaochow RV Secret	denningsaccosh	nsl7
->>>G	kaochow RV Secret	gongnonce
->>>G	kaochow RV Secret	gongnonceb
->>>G	kaochow RV Secret	woolamce
->>>G	kaochow RV Secret	woolampif
->>>G	kaochow RV Secret	yahalomBan
->>>G	kaochow RV Secret	yahalomlowe
->>>G	kaochow RV Secret	yahalompaulson
->>>G	ns3 IV Niagree	bke	tmn
->>>G	ns3 IV Niagree	boyd	tmn
->>>G	ns3 IV Niagree	ccitt509	tmn
->>>G	ns3 IV Niagree	denningsaccosh	tmn
->>>G	ns3 IV Niagree	kaochowPalm	tmn
->>>G	ns3 IV Niagree	nsl3
->>>G	ns3 IV Niagree	nsl7
->>>G	ns3 IV Niagree	nssymmetricamended	tmn
->>>G	ns3 IV Niagree	nssymmetric	tmn
->>>G	ns3 IV Niagree	soph
->>>G	ns3 IV Secret	nssymmetric
->>>G	ns3 IV Secret	nssymmetricamended
->>>G	ns3 IV Secret	soph
->>>G	ns3 IV Secret	spliceAS
->>>G	ns3 IV Secret	spliceAShc
->>>G	ns3 IV Secret	tmn
->>>G	nsl3 IV Niagree	nsl7
->>>G	nsl3 IV Niagree	soph
->>>G	nsl3 IV Secret	nssymmetric
->>>G	nsl3 IV Secret	nssymmetricamended
->>>G	nsl3 IV Secret	soph
->>>G	nsl3 IV Secret	spliceAS
->>>G	nsl3 IV Secret	spliceAShc
->>>G	nsl3 IV Secret	tmn
->>>G	nsl3 RV Secret	nssymmetric
->>>G	nsl3 RV Secret	nssymmetricamended
->>>G	nsl3 RV Secret	soph
->>>G	nsl3 RV Secret	spliceAS
->>>G	nsl3 RV Secret	spliceAShc
->>>G	nsl3 RV Secret	tmn
->>>G	nsl7 RV Secret	nsl3	soph
->>>G	nsl7 RV Secret	nsl3	spliceAS
->>>G	nsl7 RV Secret	nsl3	spliceAShc
->>>G	nsl7 RV Secret	nsl3	tmn
->>>G	nsl7 RV Secret	nssymmetricamended	nsl3
->>>G	nsl7 RV Secret	nssymmetric	nsl3
->>>G	otwayrees BV Secret	yahalom
->>>G	soph IV Niagree	bke	tmn
->>>G	soph IV Niagree	boyd	tmn
->>>G	soph IV Niagree	ccitt509	tmn
->>>G	soph IV Niagree	denningsaccosh	tmn
->>>G	soph IV Niagree	nssymmetricamended	tmn
->>>G	soph IV Niagree	nssymmetric	tmn
->>>G	sophkx IV Secret	soph
->>>G	spliceAShcCJ CV Secret	nssymmetric
->>>G	spliceAShcCJ CV Secret	nssymmetricamended
->>>G	spliceAShcCJ CV Secret	soph
->>>G	spliceAShcCJ CV Secret	spliceAS
->>>G	spliceAShcCJ CV Secret	spliceAShc
->>>G	spliceAShcCJ CV Secret	tmn
->>>G	spliceAShcCJ SV Secret	andrewBan	soph
->>>G	spliceAShcCJ SV Secret	gongnonceb	soph
->>>G	spliceAShcCJ SV Secret	gongnonce	soph
->>>G	spliceAShcCJ SV Secret	isoiec11770213	soph
->>>G	spliceAShcCJ SV Secret	kaochow2	soph
->>>G	spliceAShcCJ SV Secret	kaochow3	soph
->>>G	spliceAShcCJ SV Secret	kaochowPalm	soph
->>>G	spliceAShcCJ SV Secret	kaochow	soph
->>>G	spliceAShcCJ SV Secret	nssymmetric
->>>G	spliceAShcCJ SV Secret	nssymmetricamended
->>>G	spliceAShcCJ SV Secret	soph
->>>G	spliceAShcCJ SV Secret	spliceAS
->>>G	spliceAShcCJ SV Secret	spliceAShc
->>>G	spliceAShcCJ SV Secret	tmn
->>>G	wmfbrutus BV Secret	boyd
->>>G	wmfbrutus BV Secret	gongnonce
->>>G	wmfbrutus BV Secret	gongnonceb
->>>G	wmfbrutus BV Secret	isoiec11770213
->>>G	wmfbrutus BV Secret	kaochow
->>>G	wmfbrutus BV Secret	kaochow2
->>>G	wmfbrutus BV Secret	kaochow3
->>>G	wmfbrutus BV Secret	kaochowPalm
->>>G	wmfbrutus BV Secret	ksl
->>>G	wmfbrutus BV Secret	woolamce
->>>G	wmfbrutus BV Secret	woolampif
->>>G	wmfbrutus BV Secret	yahalom
->>>G	wmfbrutus BV Secret	yahalomBan
->>>G	wmfbrutus BV Secret	yahalompaulson
->>>G	woolamce BV Secret	denningsaccosh	woolamcmv
->>>G	woolamce BV Secret	yahalomBan
->>>G	woolamce BV Secret	yahalompaulson
->>>G	woolamcmv AV Secret	denningsaccosh
->>>G	woolamcmv AV Secret	yahalomBan
->>>G	woolamcmv AV Secret	yahalomlowe
->>>G	woolamcmv AV Secret	yahalompaulson
->>>G	woolamcmv BV Secret	denningsaccosh
->>>G	woolamcmv BV Secret	yahalomBan
->>>G	woolamcmv BV Secret	yahalompaulson
->>>G	woolamcmv SV Secret	denningsaccosh
->>>G	woolamcmv SV Secret	yahalomlowe
->>>G	yahalom AV Secret	denningsaccosh	woolamcmv
->>>G	yahalom AV Secret	yahalomBan
->>>G	yahalom AV Secret	yahalompaulson
->>>G	yahalomBan AV Secret	kaochow	yahalompaulson
->>>G	yahalomBan BV Secret	kaochow	yahalompaulson
->>>G	yahalom BV Secret	yahalomBan
->>>G	yahalom BV Secret	yahalompaulson
->>>G	yahalomlowe IV Niagree	wmfbrutus
->>>G	yahalomlowe IV Niagree	woolamcmv
->>>G	yahalomlowe IV Niagree	yahalom
->>>G	yahalomlowe IV Secret	woolamcmv
->>>G	yahalomlowe RV Niagree	denningsaccosh
->>>G	yahalomlowe RV Niagree	denningsaccosh	yahalomBan
->>>G	yahalomlowe RV Niagree	denningsaccosh	yahalompaulson
->>>G	yahalomlowe RV Niagree	kaochow2	yahalompaulson
->>>G	yahalomlowe RV Niagree	kaochow3	yahalompaulson
->>>G	yahalomlowe RV Niagree	kaochow	yahalompaulson
->>>G	yahalomlowe RV Secret	denningsaccosh
->>>G	yahalomlowe RV Secret	denningsaccosh	yahalomBan
->>>G	yahalomlowe RV Secret	denningsaccosh	yahalompaulson
->>>G	yahalompaulson IV Secret	kaochow
->>>G	yahalompaulson RV Secret	kaochow
->>>G	yahalompaulson RV Secret	woolamcmv
->>>G	yahalompaulson RV Secret	woolampif
+>>>G	boyd IV Secret	[1]	woolampif
+>>>G	boyd IV Secret	[1]	yahalom
+>>>G	boyd IV Secret	[2]	woolamce
+>>>G	boyd IV Secret	[2]	yahalomBan
+>>>G	boyd IV Secret	[2]	yahalompaulson
+>>>G	boyd RV Secret	[1]	woolampif
+>>>G	boyd RV Secret	[1]	yahalom
+>>>G	boyd RV Secret	[2]	woolamce
+>>>G	boyd RV Secret	[2]	yahalomBan
+>>>G	boyd RV Secret	[2]	yahalompaulson
+>>>G	ccitt509 IV Secret	[1]	spliceAS
+>>>G	ccitt509 IV Secret	[1]	tmn
+>>>G	ccitt509 IV Secret	[2]	nssymmetric
+>>>G	ccitt509 IV Secret	[2]	nssymmetricamended
+>>>G	ccitt509 RV Secret	[1]	spliceAS
+>>>G	ccitt509 RV Secret	[1]	spliceAShc
+>>>G	ccitt509 RV Secret	[1]	tmn
+>>>G	ccitt509 RV Secret	[2]	nssymmetric
+>>>G	ccitt509 RV Secret	[2]	nssymmetricamended
+>>>G	denningsaccosh AV Niagree	[1]	nssymmetricamended	yahalom
+>>>G	denningsaccosh AV Niagree	[1]	wmfbrutus	yahalom
+>>>G	denningsaccosh AV Niagree	[1]	woolamcmv
+>>>G	denningsaccosh AV Niagree	[1]	yahalomBan	yahalom
+>>>G	denningsaccosh AV Niagree	[1]	yahalomlowe
+>>>G	denningsaccosh AV Niagree	[1]	yahalompaulson	yahalom
+>>>G	denningsaccosh AV Niagree	[2]	wmfbrutus
+>>>G	denningsaccosh AV Niagree	[2]	yahalom
+>>>G	denningsaccosh AV Niagree	[2]	yahalomBan
+>>>G	denningsaccosh AV Niagree	[2]	yahalompaulson
+>>>G	denningsaccosh AV Secret	[1]	woolamcmv
+>>>G	denningsaccosh AV Secret	[2]	yahalomBan
+>>>G	denningsaccosh AV Secret	[2]	yahalompaulson
+>>>G	denningsaccosh BV Niagree	[2]	isoiec11770213
+>>>G	denningsaccosh BV Niagree	[2]	nssymmetric
+>>>G	denningsaccosh BV Niagree	[2]	nssymmetricamended
+>>>G	denningsaccosh BV Niagree	[2]	otwayrees
+>>>G	denningsaccosh BV Niagree	[2]	wmfbrutus
+>>>G	denningsaccosh BV Secret	[2]	nssymmetric
+>>>G	denningsaccosh BV Secret	[2]	nssymmetricamended
+>>>G	gongnonce IV Niagree	[1]	nsl7
+>>>G	kaochow2 IV Niagree	[0]	nsl7
+>>>G	kaochow2 IV Niagree	[2]	woolampif
+>>>G	kaochow2 IV Niagree	[2]	yahalomBan
+>>>G	kaochow2 IV Niagree	[2]	yahalompaulson
+>>>G	kaochow2 IV Secret	[2]	woolampif
+>>>G	kaochow2 IV Secret	[2]	yahalomBan
+>>>G	kaochow2 IV Secret	[2]	yahalompaulson
+>>>G	kaochow2 RV Niagree	[0]	nsl7
+>>>G	kaochow2 RV Niagree	[2]	woolampif
+>>>G	kaochow2 RV Niagree	[2]	yahalomBan
+>>>G	kaochow2 RV Niagree	[2]	yahalompaulson
+>>>G	kaochow2 RV Secret	[2]	gongnonce
+>>>G	kaochow2 RV Secret	[2]	woolampif
+>>>G	kaochow2 RV Secret	[2]	yahalomBan
+>>>G	kaochow2 RV Secret	[2]	yahalompaulson
+>>>G	kaochow3 IV Niagree	[0]	nsl7
+>>>G	kaochow3 IV Niagree	[2]	nsl7	yahalomBan
+>>>G	kaochow3 IV Niagree	[2]	woolampif
+>>>G	kaochow3 IV Niagree	[2]	yahalompaulson
+>>>G	kaochow3 IV Secret	[2]	nsl7	yahalomBan
+>>>G	kaochow3 IV Secret	[2]	woolampif
+>>>G	kaochow3 IV Secret	[2]	yahalompaulson
+>>>G	kaochow3 RV Niagree	[0]	nsl7
+>>>G	kaochow3 RV Niagree	[2]	woolampif
+>>>G	kaochow3 RV Niagree	[2]	yahalomBan
+>>>G	kaochow3 RV Niagree	[2]	yahalompaulson
+>>>G	kaochow3 RV Nisynch	[2]	nsl7	yahalomBan
+>>>G	kaochow3 RV Secret	[2]	gongnonce
+>>>G	kaochow3 RV Secret	[2]	woolampif
+>>>G	kaochow3 RV Secret	[2]	yahalomBan
+>>>G	kaochow3 RV Secret	[2]	yahalompaulson
+>>>G	kaochow IV Niagree	[0]	nsl7
+>>>G	kaochow IV Niagree	[1]	woolamce
+>>>G	kaochow IV Niagree	[1]	woolampif
+>>>G	kaochow IV Niagree	[1]	yahalomlowe
+>>>G	kaochow IV Niagree	[1]	yahalompaulson
+>>>G	kaochow IV Niagree	[2]	yahalomBan
+>>>G	kaochow IV Secret	[1]	woolamce
+>>>G	kaochow IV Secret	[2]	woolampif
+>>>G	kaochow IV Secret	[2]	yahalomBan
+>>>G	kaochow IV Secret	[2]	yahalompaulson
+>>>G	kaochow RV Niagree	[0]	nsl7
+>>>G	kaochow RV Niagree	[1]	denningsaccosh
+>>>G	kaochow RV Niagree	[1]	woolamce
+>>>G	kaochow RV Niagree	[1]	woolampif
+>>>G	kaochow RV Niagree	[1]	yahalomlowe
+>>>G	kaochow RV Niagree	[1]	yahalompaulson
+>>>G	kaochow RV Niagree	[2]	gongnonceb
+>>>G	kaochow RV Niagree	[2]	yahalomBan
+>>>G	kaochow RV Secret	[1]	denningsaccosh
+>>>G	kaochow RV Secret	[1]	woolamce
+>>>G	kaochow RV Secret	[1]	woolampif
+>>>G	kaochow RV Secret	[1]	yahalomlowe
+>>>G	kaochow RV Secret	[1]	yahalompaulson
+>>>G	kaochow RV Secret	[2]	denningsaccosh	nsl7
+>>>G	kaochow RV Secret	[2]	gongnonce
+>>>G	kaochow RV Secret	[2]	gongnonceb
+>>>G	kaochow RV Secret	[2]	yahalomBan
+>>>G	ns3 IV Niagree	[0]	soph
+>>>G	ns3 IV Niagree	[2]	bke	tmn
+>>>G	ns3 IV Niagree	[2]	boyd	tmn
+>>>G	ns3 IV Niagree	[2]	ccitt509	tmn
+>>>G	ns3 IV Niagree	[2]	denningsaccosh	tmn
+>>>G	ns3 IV Niagree	[2]	kaochowPalm	tmn
+>>>G	ns3 IV Niagree	[2]	nsl3
+>>>G	ns3 IV Niagree	[2]	nsl7
+>>>G	ns3 IV Niagree	[2]	nssymmetricamended	tmn
+>>>G	ns3 IV Niagree	[2]	nssymmetric	tmn
+>>>G	ns3 IV Secret	[0]	soph
+>>>G	ns3 IV Secret	[0]	spliceAS
+>>>G	ns3 IV Secret	[0]	spliceAShc
+>>>G	ns3 IV Secret	[1]	tmn
+>>>G	ns3 IV Secret	[2]	nssymmetric
+>>>G	ns3 IV Secret	[2]	nssymmetricamended
+>>>G	nsl3 IV Niagree	[0]	soph
+>>>G	nsl3 IV Niagree	[1]	nsl7
+>>>G	nsl3 IV Secret	[0]	soph
+>>>G	nsl3 IV Secret	[0]	spliceAS
+>>>G	nsl3 IV Secret	[0]	spliceAShc
+>>>G	nsl3 IV Secret	[1]	tmn
+>>>G	nsl3 IV Secret	[2]	nssymmetric
+>>>G	nsl3 IV Secret	[2]	nssymmetricamended
+>>>G	nsl3 RV Secret	[0]	soph
+>>>G	nsl3 RV Secret	[0]	spliceAS
+>>>G	nsl3 RV Secret	[0]	spliceAShc
+>>>G	nsl3 RV Secret	[1]	tmn
+>>>G	nsl3 RV Secret	[2]	nssymmetric
+>>>G	nsl3 RV Secret	[2]	nssymmetricamended
+>>>G	nsl7 RV Secret	[1]	nsl3	soph
+>>>G	nsl7 RV Secret	[1]	nsl3	spliceAS
+>>>G	nsl7 RV Secret	[1]	nsl3	spliceAShc
+>>>G	nsl7 RV Secret	[1]	nsl3	tmn
+>>>G	nsl7 RV Secret	[2]	nssymmetricamended	nsl3
+>>>G	nsl7 RV Secret	[2]	nssymmetric	nsl3
+>>>G	otwayrees BV Secret	[1]	yahalom
+>>>G	soph IV Niagree	[2]	bke	tmn
+>>>G	soph IV Niagree	[2]	boyd	tmn
+>>>G	soph IV Niagree	[2]	ccitt509	tmn
+>>>G	soph IV Niagree	[2]	denningsaccosh	tmn
+>>>G	soph IV Niagree	[2]	nssymmetricamended	tmn
+>>>G	soph IV Niagree	[2]	nssymmetric	tmn
+>>>G	sophkx IV Secret	[1]	soph
+>>>G	spliceAShcCJ CV Secret	[0]	soph
+>>>G	spliceAShcCJ CV Secret	[0]	spliceAS
+>>>G	spliceAShcCJ CV Secret	[0]	spliceAShc
+>>>G	spliceAShcCJ CV Secret	[1]	tmn
+>>>G	spliceAShcCJ CV Secret	[2]	nssymmetric
+>>>G	spliceAShcCJ CV Secret	[2]	nssymmetricamended
+>>>G	spliceAShcCJ SV Secret	[0]	soph
+>>>G	spliceAShcCJ SV Secret	[0]	spliceAS
+>>>G	spliceAShcCJ SV Secret	[0]	spliceAShc
+>>>G	spliceAShcCJ SV Secret	[1]	tmn
+>>>G	spliceAShcCJ SV Secret	[2]	andrewBan	soph
+>>>G	spliceAShcCJ SV Secret	[2]	gongnonceb	soph
+>>>G	spliceAShcCJ SV Secret	[2]	gongnonce	soph
+>>>G	spliceAShcCJ SV Secret	[2]	isoiec11770213	soph
+>>>G	spliceAShcCJ SV Secret	[2]	kaochow2	soph
+>>>G	spliceAShcCJ SV Secret	[2]	kaochow3	soph
+>>>G	spliceAShcCJ SV Secret	[2]	kaochowPalm	soph
+>>>G	spliceAShcCJ SV Secret	[2]	kaochow	soph
+>>>G	spliceAShcCJ SV Secret	[2]	nssymmetric
+>>>G	spliceAShcCJ SV Secret	[2]	nssymmetricamended
+>>>G	wmfbrutus BV Secret	[0]	yahalomBan
+>>>G	wmfbrutus BV Secret	[1]	yahalompaulson
+>>>G	wmfbrutus BV Secret	[2]	boyd
+>>>G	wmfbrutus BV Secret	[2]	gongnonce
+>>>G	wmfbrutus BV Secret	[2]	gongnonceb
+>>>G	wmfbrutus BV Secret	[2]	isoiec11770213
+>>>G	wmfbrutus BV Secret	[2]	kaochow
+>>>G	wmfbrutus BV Secret	[2]	kaochow2
+>>>G	wmfbrutus BV Secret	[2]	kaochow3
+>>>G	wmfbrutus BV Secret	[2]	kaochowPalm
+>>>G	wmfbrutus BV Secret	[2]	ksl
+>>>G	wmfbrutus BV Secret	[2]	woolamce
+>>>G	wmfbrutus BV Secret	[2]	woolampif
+>>>G	wmfbrutus BV Secret	[2]	yahalom
+>>>G	woolamce BV Secret	[1]	denningsaccosh	woolamcmv
+>>>G	woolamce BV Secret	[2]	yahalomBan
+>>>G	woolamce BV Secret	[2]	yahalompaulson
+>>>G	woolamcmv AV Secret	[1]	denningsaccosh
+>>>G	woolamcmv AV Secret	[1]	yahalomlowe
+>>>G	woolamcmv AV Secret	[2]	yahalomBan
+>>>G	woolamcmv AV Secret	[2]	yahalompaulson
+>>>G	woolamcmv BV Secret	[1]	denningsaccosh
+>>>G	woolamcmv BV Secret	[2]	yahalomBan
+>>>G	woolamcmv BV Secret	[2]	yahalompaulson
+>>>G	woolamcmv SV Secret	[1]	denningsaccosh
+>>>G	woolamcmv SV Secret	[1]	yahalomlowe
+>>>G	yahalom AV Secret	[1]	denningsaccosh	woolamcmv
+>>>G	yahalom AV Secret	[2]	yahalomBan
+>>>G	yahalom AV Secret	[2]	yahalompaulson
+>>>G	yahalomBan AV Secret	[1]	kaochow	yahalompaulson
+>>>G	yahalomBan BV Secret	[1]	kaochow	yahalompaulson
+>>>G	yahalom BV Secret	[0]	yahalomBan
+>>>G	yahalom BV Secret	[1]	yahalompaulson
+>>>G	yahalomlowe IV Niagree	[0]	yahalom
+>>>G	yahalomlowe IV Niagree	[1]	woolamcmv
+>>>G	yahalomlowe IV Niagree	[2]	wmfbrutus
+>>>G	yahalomlowe IV Secret	[1]	woolamcmv
+>>>G	yahalomlowe RV Niagree	[1]	denningsaccosh	yahalomBan
+>>>G	yahalomlowe RV Niagree	[1]	denningsaccosh	yahalompaulson
+>>>G	yahalomlowe RV Niagree	[2]	denningsaccosh
+>>>G	yahalomlowe RV Niagree	[2]	kaochow2	yahalompaulson
+>>>G	yahalomlowe RV Niagree	[2]	kaochow3	yahalompaulson
+>>>G	yahalomlowe RV Niagree	[2]	kaochow	yahalompaulson
+>>>G	yahalomlowe RV Secret	[1]	denningsaccosh	yahalomBan
+>>>G	yahalomlowe RV Secret	[1]	denningsaccosh	yahalompaulson
+>>>G	yahalomlowe RV Secret	[2]	denningsaccosh
+>>>G	yahalompaulson IV Secret	[1]	kaochow
+>>>G	yahalompaulson RV Secret	[1]	kaochow
+>>>G	yahalompaulson RV Secret	[1]	woolamcmv
+>>>G	yahalompaulson RV Secret	[1]	woolampif
diff --git a/test/results/process.py b/test/results/process.py
index 15c3d4c..4ecdfb2 100755
--- a/test/results/process.py
+++ b/test/results/process.py
@@ -7,19 +7,19 @@ import sys
 class buffer:
 
 	def __init__(self, name="unnamed", prefix=">>>"):
-		self.list = []
+		self.claims = {}
 		self.count = 0
 		self.name = name
 		self.prefix = prefix
 	
 	def reset(self):
 		self.count = 0
-		self.list = []
+		self.claims = {}
 
 	def size(self):
 		return self.count
 
-	def add(self,(cl, hl)):
+	def add(self,(cl, hl), match=-1):
 		# cleanup cl
 	 	usloc = cl.rfind("_")
 		if usloc != -1:
@@ -27,9 +27,14 @@ class buffer:
 			cl = cl[:usloc]
 
 		# possibly add
-		if not (cl,hl) in self.list:
-			self.list.append((cl,hl))
+		if not (cl,hl) in self.claims.keys():
+			if match >= 0:
+				self.claims[(cl,hl)] = [match]
+			else:
+				self.claims[(cl,hl)] = []
 			self.count = self.count + 1
+		elif match >= 0 and match not in self.claims[(cl,hl)]:
+			self.claims[(cl,hl)].append(match)
 
 	def dump(self):
 		if self.size() == 0:
@@ -38,7 +43,7 @@ class buffer:
 		print "Dumping buffer " + self.name
 		print
 		counted = 0
-		for (cl,hl) in self.list:
+		for (cl,hl) in self.claims.keys():
 			# Determine whether to print
 			#
 			toprint = True
@@ -47,12 +52,14 @@ class buffer:
 				# Construct comparable Niagree claim
 				newcl = cl.replace("Nisynch","Niagree")
 				# Now check whether this one occurs
-				if (newcl,hl) in self.list:
+				if (newcl,hl) in self.claims.keys():
 					toprint = False
 
 			if toprint:
-				res = self.prefix + "\t"
-				res = res + cl + "\t" + str(hl)
+				res = self.prefix
+				res = res + "\t" + cl
+				res = res + "\t" + str(self.claims[(cl,hl)])
+				res = res + "\t" + str(hl)
 				print res
 				counted = counted + 1
 		print
@@ -65,6 +72,7 @@ def main():
 
 	buf_big = buffer("[Global]",">>>G")
 	buf_small = buffer("[Local]", ">>>L")
+	match = -1
 
 	line = sys.stdin.readline()
 	while line != "":
@@ -77,12 +85,18 @@ def main():
 			# Nope
 			buf_small.dump()
 			print line
+			# Maybe it reports the match type?
+			matchprefix = "Testing match "
+			loc = line.rfind(matchprefix)
+			if loc != -1:
+				match = int(line[loc + len(matchprefix)])
+				print "Detected match type", match
 		else:
 			# Yes!
 			claim = data[3]
 			helpers = "\t".join(data[4:])
-			buf_big.add((claim,helpers))
-			buf_small.add((claim,helpers))
+			buf_big.add((claim,helpers), match)
+			buf_small.add((claim,helpers), match)
 
 		# Proceed to next line
 		line = sys.stdin.readline()