Finished refactoring matchups model