refactoring to add user matchup skeleton