Made MatchMakers templated instead of polymorphic
Incremental commit