Refactoring and new Matches kinda being generated