Attempted different matching algorithm

Since the old algorithm wasn't matching enough data I attempted to add a
different matching routine, without success however. Needs looking at
later,