Complete basic scaffold/functionality for matches including mocks