Added matching and a scoring system