Make matchId a local variable
Allow clients to determine how confident they want the match to be
Remove TODO
Use LinkedHashMap to maintain order