Added simple form for new match
Merge in Natalie's commits on scorer_feature