diff --git a/app/Http/Controllers/Player/PlayerHeroesController.php b/app/Http/Controllers/Player/PlayerHeroesController.php
index d6582479..2a785544 100644
--- a/app/Http/Controllers/Player/PlayerHeroesController.php
+++ b/app/Http/Controllers/Player/PlayerHeroesController.php
@@ -78,535 +78,4 @@ public function showSingle(Request $request, $battletag, $blizz_id, $region, $he
                 'regions' => $this->globalDataService->getRegionIDtoString(),
                 ]);
     }
-
-    public function getHeroData(Request $request){
-        //return response()->json($request->all());
-
-        $validator = \Validator::make($request->only(['blizz_id', 'region', 'minimumgames', 'type']), [
-            'blizz_id' => 'required|integer',
-            'region' => 'required|integer',
-            'minimumgames' => 'integer',
-            'type' => 'required|in:all,single'
-        ]);
-
-        $blizz_id = $request['blizz_id'];
-        $region = $request['region'];
-        $gameType = (new GameTypeInputValidation())->passes('game_type', $request["game_type"]);
-        $hero = (new HeroInputByIDValidation())->passes('statfilter', $request["hero"]);
-        $role = (new RoleInputValidation())->passes('role', $request["role"]);
-        $minimum_games = $request["minimumgames"];
-        $type = $request["type"];
- 
-
-        if(count($gameType) == 6){
-            $gameType = [];
-        }
-
-        $result = Replay::join('player', 'player.replayID', '=', 'replay.replayID')
-                ->join('scores', function($join) {
-                    $join->on('scores.replayID', '=', 'replay.replayID')
-                         ->on('scores.battletag', '=', 'player.battletag');
-                })
-                ->join('talents', function($join) {
-                    $join->on('talents.replayID', '=', 'replay.replayID')
-                         ->on('talents.battletag', '=', 'player.battletag');
-                })
-                ->where('region', $region)
-                ->when(!empty($gameType), function ($query) use ($gameType) {
-                        return $query->whereIn("game_type", $gameType);
-                    })
-                ->whereNot("game_type", 0)
-                ->where('blizz_id', $blizz_id)
-                ->when($type == "single", function ($query) use ($hero) {
-                        return $query->where("hero", $hero);
-                })
-                ->select([
-                    'replay.replayID',
-                    'hero',
-                    'hero_level',
-                    'game_date',
-                    'game_map',
-                    'game_type',
-                    'stack_size',
-                    'mastery_taunt',
-                    'player_conservative_rating',
-                    'player_change',
-                    'hero_conservative_rating',
-                    'hero_change',
-                    'role_conservative_rating',
-                    'role_change',
-                    'winner',
-                    'kills',
-                    'assists',
-                    'takedowns',
-                    'deaths',
-                    'highest_kill_streak',
-                    'hero_damage',
-                    'siege_damage',
-                    'structure_damage',
-                    'minion_damage',
-                    'creep_damage',
-                    'summon_damage',
-                    'time_cc_enemy_heroes',
-                    'healing',
-                    'self_healing',
-                    'damage_taken',
-                    'experience_contribution',
-                    'town_kills',
-                    'time_spent_dead',
-                    'merc_camp_captures',
-                    'watch_tower_captures',
-                    'meta_experience',
-                    'match_award',
-                    'protection_allies',
-                    'silencing_enemies',
-                    'rooting_enemies',
-                    'stunning_enemies',
-                    'clutch_heals',
-                    'escapes',
-                    'vengeance',
-                    'outnumbered_deaths',
-                    'teamfight_escapes',
-                    'teamfight_healing',
-                    'teamfight_damage_taken',
-                    'teamfight_hero_damage',
-                    'multikill',
-                    'physical_damage',
-                    'spell_damage',
-                    'regen_globes',
-                    'first_to_ten',
-                    'time_on_fire',
-                    'level_one', 'level_four', 'level_seven', 'level_ten', 'level_thirteen', 'level_sixteen', 'level_twenty'
-                    ])
-                ->get();
-
-
-
-
-
-        $heroData = $this->globalDataService->getHeroes();
-        $heroData = $heroData->keyBy('id');
-
-        $maps = Map::all();
-        $maps = $maps->keyBy('map_id');
-
-        $talentData = HeroesDataTalent::all();
-        $talentData = $talentData->keyBy('talent_id');
-
-        $gameTypes = $this->globalDataService->getGameTypeIDtoString();
-
-        $qm_mmr_data = null;
-        $ud_mmr_data = null;
-        $hl_mmr_data = null;
-        $tl_mmr_data = null;
-        $sl_mmr_data = null;
-        $ar_mmr_data = null;
-
-        $seasonData = $this->globalDataService->getSeasonsData();
-        $newSeasonData = null;
-        $latestGames = null;
-        $winRateFiltered = null;
-        $mapData = null;
-
-
-        if($type == "single"){
-            $mapData = $result->groupBy('game_map');
-
-            $qm_mmr_data = MasterMMRDataQM::select("conservative_rating", "win", "loss")->filterByType($hero)->filterByGametype(1)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
-            if($qm_mmr_data){
-                $qm_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(1, $hero), $qm_mmr_data->mmr);
-            }
-
-            $ud_mmr_data = MasterMMRDataUD::select("conservative_rating", "win", "loss")->filterByType($hero)->filterByGametype(2)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
-            if($ud_mmr_data){
-                $ud_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(2, $hero), $ud_mmr_data->mmr);
-            }
-
-            $hl_mmr_data = MasterMMRDataHL::select("conservative_rating", "win", "loss")->filterByType($hero)->filterByGametype(3)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
-            if($hl_mmr_data){
-                $hl_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(3, $hero), $hl_mmr_data->mmr);
-            }
-
-            $tl_mmr_data = MasterMMRDataTL::select("conservative_rating", "win", "loss")->filterByType($hero)->filterByGametype(4)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
-            if($tl_mmr_data){
-                $tl_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(4, $hero), $tl_mmr_data->mmr);
-            }
-
-            $sl_mmr_data = MasterMMRDataSL::select("conservative_rating", "win", "loss")->filterByType($hero)->filterByGametype(5)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
-            if($sl_mmr_data){
-                $sl_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(5, $hero), $sl_mmr_data->mmr);
-            }
-            $ar_mmr_data = MasterMMRDataAR::select("conservative_rating", "win", "loss")->filterByType($hero)->filterByGametype(6)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
-            if($ar_mmr_data){
-                $ar_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(6, $hero), $ar_mmr_data->mmr);
-            }
-
-
-
-
-            $latestGames = $result->sortByDesc('game_date')->take(5)->values();
-            $latestGames = $latestGames->map(function($game) use($heroData, $maps, $talentData, $gameTypes) {
-                unset(
-                    $game['hero_level'],
-                    $game['stack_size'],
-                    $game['mastery_taunt'],
-                    $game['kills'],
-                    $game['assists'],
-                    $game['takedowns'],
-                    $game['deaths'],
-                    $game['highest_kill_streak'],
-                    $game['hero_damage'],
-                    $game['siege_damage'],
-                    $game['structure_damage'],
-                    $game['minion_damage'],
-                    $game['creep_damage'],
-                    $game['summon_damage'],
-                    $game['time_cc_enemy_heroes'],
-                    $game['healing'],
-                    $game['self_healing'],
-                    $game['damage_taken'],
-                    $game['experience_contribution'],
-                    $game['town_kills'],
-                    $game['time_spent_dead'],
-                    $game['merc_camp_captures'],
-                    $game['watch_tower_captures'],
-                    $game['meta_experience'],
-                    $game['match_award'],
-                    $game['protection_allies'],
-                    $game['silencing_enemies'],
-                    $game['rooting_enemies'],
-                    $game['stunning_enemies'],
-                    $game['clutch_heals'],
-                    $game['escapes'],
-                    $game['vengeance'],
-                    $game['outnumbered_deaths'],
-                    $game['teamfight_escapes'],
-                    $game['teamfight_healing'],
-                    $game['teamfight_damage_taken'],
-                    $game['teamfight_hero_damage'],
-                    $game['multikill'],
-                    $game['physical_damage'],
-                    $game['spell_damage'],
-                    $game['regen_globes'],
-                    $game['first_to_ten'],
-                    $game['time_on_fire'],
-                );
-
-                $game->game_type = $gameTypes[$game->game_type];
-                $game->hero_object = $heroData[$game->hero];
-                $game->game_map = $maps[$game->game_map];
-                $game->level_one = $game->level_one ? $talentData[$game->level_one] : null;
-                $game->level_four = $game->level_four ? $talentData[$game->level_four] : null;
-                $game->level_seven = $game->level_seven ? $talentData[$game->level_seven] : null;
-                $game->level_ten = $game->level_ten ? $talentData[$game->level_ten] : null;
-                $game->level_thirteen = $game->level_thirteen ? $talentData[$game->level_thirteen] : null;
-                $game->level_sixteen = $game->level_sixteen ? $talentData[$game->level_sixteen] : null;
-                $game->level_twenty = $game->level_twenty ? $talentData[$game->level_twenty] : null;
-
-                $game->player_conservative_rating = round(1800 + 40 * $game->player_conservative_rating);
-                $game->hero_conservative_rating = round(1800 + 40 * $game->hero_conservative_rating);
-                $game->role_conservative_rating = round(1800 + 40 * $game->role_conservative_rating);
-
-                $game->player_change = round($game->player_change, 2);
-                $game->hero_change = round($game->hero_change, 2);
-                $game->role_change = round($game->role_change, 2);
-
-
-                return $game;
-            });
-
-            $newSeasonData = $result->map(function ($item) use ($seasonData) {
-                $gameDate = $item->game_date;
-                $season = null;
-                $id = null;
-
-                foreach ($seasonData as $seasonItem) {
-                    $startDate = $seasonItem->start_date;
-                    $endDate = $seasonItem->end_date;
-
-                    if ($gameDate >= $startDate && $gameDate <= $endDate) {
-                        $season = $seasonItem->season;
-                        $id = $seasonItem->id;
-                        break;
-                    }
-                }
-
-                $seasonData = [
-                    'id' => $id, 
-                    'season' => $season, 
-                    'year' => $seasonItem->year, 
-                    'wins' => $item->winner === 1 ? 1 : 0,
-                    'losses' => $item->winner === 0 ? 1 : 0,
-                    'games_played' => 1,
-                ];
-
-                return $seasonData;
-            });
-
-            $newSeasonData = $newSeasonData->groupBy('id')->map(function ($group) {
-                $wins = $group->sum('wins');
-                $losses = $group->sum('losses');
-                $gamesPlayed = $group->sum('games_played');
-
-                $winRate = ($wins / $gamesPlayed) * 100;
-
-                return [
-                    'id' => $group->first()['id'], 
-                    'x_label' => $group->first()['year'] . " Season " . $group->first()['season'],
-                    'season' => $group->first()['season'], 
-                    'year' => $group->first()['year'], 
-                    'wins' => $wins,
-                    'losses' => $losses,
-                    'games_played' => $gamesPlayed,
-                    'win_rate' => round($winRate, 2),
-                ];
-            })->sortBy('id');
-
-
-
-
-            $mapData = $mapData->map(function($games, $map) use ($maps){
-                $gamesPlayed = $games->count();
-                $wins = $games->where('winner', 1)->count();
-                $losses = $games->where('winner', 0)->count();
-                $winRate = ($gamesPlayed > 0) ? ($wins / $gamesPlayed) * 100 : 0;
-                $latestGameDate = $games->max('game_date');
-
-
-            
-                return [
-                    'name' => $maps[$map]["name"],
-                    'game_map' => $maps[$map],
-                    'games_played' => $gamesPlayed,
-                    'latest_game' => $latestGameDate,
-                    'wins' => $wins,
-                    'losses' => $losses,
-                    'win_rate' => round($winRate, 2),
-                ];
-            
-            });
-
-      
-            $winRateFiltered = $mapData->filter(function ($data) {
-                return $data['games_played'] > 5;
-            });
-
-            if ($winRateFiltered->count() < 3) {
-                $winRateFiltered = $mapData->filter(function ($data) {
-                    return $data['games_played'] > 2;
-                });
-            }
-
-            if ($winRateFiltered->count() < 3) {
-                $winRateFiltered = $mapData->filter(function ($data) {
-                    return $data['games_played'] > 0;
-                });
-            }
-        }
-
-    
-
-        $returnData = $result->groupBy('hero')->map(function($heroStats) use ($heroData, $qm_mmr_data, $ud_mmr_data, $hl_mmr_data, $tl_mmr_data, $sl_mmr_data, $ar_mmr_data, $newSeasonData, $mapData, $winRateFiltered, $latestGames){
-            $deaths = $heroStats->sum('deaths');
-            $avg_kills = $heroStats->avg('kills');
-            $avg_takedowns = $heroStats->avg('takedowns');
-
-            $wins = $heroStats->where('winner', 1)->count();
-            $losses = $heroStats->where('winner', 0)->count();
-            $games_played = $wins + $losses;
-
-            $combined_healing = $heroStats->avg('healing') + $heroStats->avg('self_healing');
-
-            $stack_size_one_wins = $heroStats->whereNotNull('stack_size')->where('stack_size', 0)->where('winner', 1)->count();
-            $stack_size_one_losses = $heroStats->whereNotNull('stack_size')->where('stack_size', 0)->where('winner', 0)->count();
-            $stack_size_one_total = $stack_size_one_wins + $stack_size_one_losses;
-
-
-            $stack_size_two_wins = $heroStats->where('stack_size', 2)->where('winner', 1)->count();
-            $stack_size_two_losses = $heroStats->where('stack_size', 2)->where('winner', 0)->count();
-            $stack_size_two_total = $stack_size_two_wins + $stack_size_two_losses;
-
-            $stack_size_three_wins = $heroStats->where('stack_size', 3)->where('winner', 1)->count();
-            $stack_size_three_losses = $heroStats->where('stack_size', 3)->where('winner', 0)->count();
-            $stack_size_three_total = $stack_size_three_wins + $stack_size_three_losses;
-
-            $stack_size_four_wins = $heroStats->where('stack_size', 4)->where('winner', 1)->count();
-            $stack_size_four_losses = $heroStats->where('stack_size', 4)->where('winner', 0)->count();
-            $stack_size_four_total = $stack_size_four_wins + $stack_size_four_losses;
-
-            $stack_size_five_wins = $heroStats->where('stack_size', 5)->where('winner', 1)->count();
-            $stack_size_five_losses = $heroStats->where('stack_size', 5)->where('winner', 0)->count();
-            $stack_size_five_total = $stack_size_five_wins + $stack_size_five_losses;
-
-            return [
-                "name" => $heroData[$heroStats->pluck('hero')->first()]["name"],
-                "hero" => $heroData[$heroStats->pluck('hero')->first()],
-                'wins' => $wins,
-                'losses' => $losses,
-                'games_played' => $games_played,
-                'kda' => $deaths > 0 ? round($heroStats->sum('takedowns') / $deaths, 2) : $heroStats->sum('takedowns'),
-                'kdr' => $deaths > 0 ? round($heroStats->sum('kills') / $deaths, 2) : $heroStats->sum('kills'),
-                'win_rate' => $games_played > 0 ? round(($wins / $games_played) * 100, 2) : 0,
-                'qm_mmr_data' => $qm_mmr_data,
-                'ud_mmr_data' => $ud_mmr_data,
-                'hl_mmr_data' => $hl_mmr_data,
-                'tl_mmr_data' => $tl_mmr_data,
-                'sl_mmr_data' => $sl_mmr_data,
-                'ar_mmr_data' => $ar_mmr_data,
-
-                'stack_size_one_wins' => $stack_size_one_wins,
-                'stack_size_one_losses' => $stack_size_one_losses,
-                'stack_size_one_total' => $stack_size_one_total,
-                'stack_size_one_win_rate' => $stack_size_one_total > 0 ? round(($stack_size_one_wins / $stack_size_one_total) * 100, 2): 0,
-
-                'stack_size_two_wins' => $stack_size_two_wins,
-                'stack_size_two_losses' => $stack_size_two_losses,
-                'stack_size_two_total' => $stack_size_two_total,
-                'stack_size_two_win_rate' => $stack_size_two_total > 0 ? round(($stack_size_two_wins / $stack_size_two_total) * 100, 2): 0,
-
-                'stack_size_three_wins' => $stack_size_three_wins,
-                'stack_size_three_losses' => $stack_size_three_losses,
-                'stack_size_three_total' => $stack_size_three_total,
-                'stack_size_three_win_rate' => $stack_size_three_total > 0 ? round(($stack_size_three_wins / $stack_size_three_total) * 100, 2) : 0,
-
-                'stack_size_four_wins' => $stack_size_four_wins,
-                'stack_size_four_losses' => $stack_size_four_losses,
-                'stack_size_four_total' => $stack_size_four_total,
-                'stack_size_four_win_rate' => $stack_size_four_total > 0 ? round(($stack_size_four_wins / $stack_size_four_total) * 100, 2) : 0,
-
-                'stack_size_five_wins' => $stack_size_five_wins,
-                'stack_size_five_losses' => $stack_size_five_losses,
-                'stack_size_five_total' => $stack_size_five_total,
-                'stack_size_five_win_rate' => $stack_size_five_total > 0 ? round(($stack_size_five_wins / $stack_size_five_total) * 100, 2) : 0,
-
-                'max_kills' => $heroStats->max('kills'),
-                'max_assists' => $heroStats->max('assists'),
-                'max_takedowns' => $heroStats->max('takedowns'),
-                'max_deaths' => $heroStats->max('deaths'),
-                'max_highest_kill_streak' => $heroStats->max('highest_kill_streak'),
-                'max_hero_damage' => $heroStats->max('hero_damage'),
-                'max_siege_damage' => $heroStats->max('siege_damage'),
-                'max_structure_damage' => $heroStats->max('structure_damage'),
-                'max_minion_damage' => $heroStats->max('minion_damage'),
-                'max_creep_damage' => $heroStats->max('creep_damage'),
-                'max_summon_damage' => $heroStats->max('summon_damage'),
-                'max_time_cc_enemy_heroes' => $heroStats->max('time_cc_enemy_heroes'),
-                'max_healing' => $heroStats->max('healing'),
-                'max_self_healing' => $heroStats->max('self_healing'),
-                'max_damage_taken' => $heroStats->max('damage_taken'),
-                'max_experience_contribution' => $heroStats->max('experience_contribution'),
-                'max_town_kills' => $heroStats->max('town_kills'),
-                'max_time_spent_dead' => $heroStats->max('time_spent_dead'),
-                'max_merc_camp_captures' => $heroStats->max('merc_camp_captures'),
-                'max_watch_tower_captures' => $heroStats->max('watch_tower_captures'),
-                'max_protection_allies' => $heroStats->max('protection_allies'),
-                'max_silencing_enemies' => $heroStats->max('silencing_enemies'),
-                'max_rooting_enemies' => $heroStats->max('rooting_enemies'),
-                'max_stunning_enemies' => $heroStats->max('stunning_enemies'),
-                'max_clutch_heals' => $heroStats->max('clutch_heals'),
-                'max_escapes' => $heroStats->max('escapes'),
-                'max_vengeance' => $heroStats->max('vengeance'),
-                'max_outnumbered_deaths' => $heroStats->max('outnumbered_deaths'),
-                'max_teamfight_escapes' => $heroStats->max('teamfight_escapes'),
-                'max_teamfight_healing' => $heroStats->max('teamfight_healing'),
-                'max_teamfight_damage_taken' => $heroStats->max('teamfight_damage_taken'),
-                'max_teamfight_hero_damage' => $heroStats->max('teamfight_hero_damage'),
-                'max_multikill' => $heroStats->max('multikill'),
-                'max_physical_damage' => $heroStats->max('physical_damage'),
-                'max_spell_damage' => $heroStats->max('spell_damage'),
-                'max_regen_globes' => $heroStats->max('regen_globes'),
-                'max_first_to_ten' => $heroStats->max('first_to_ten'),
-                'max_time_on_fire' => $heroStats->max('time_on_fire'),
-                
-
-                'combined_healing' => round($combined_healing, 2),
-                'avg_assists' => round($avg_takedowns - $avg_kills, 2),
-                'avg_kills' => round($avg_kills, 2),
-                'avg_assists' => round($heroStats->avg('assists'), 2),
-                'avg_takedowns' => round($avg_takedowns, 2),
-                'avg_deaths' => round($heroStats->avg('deaths'), 2),
-                'avg_highest_kill_streak' => round($heroStats->avg('highest_kill_streak'), 2),
-                'avg_hero_damage' => round($heroStats->avg('hero_damage'), 2),
-                'avg_siege_damage' => round($heroStats->avg('siege_damage'), 2),
-                'avg_structure_damage' => round($heroStats->avg('structure_damage'), 2),
-                'avg_minion_damage' => round($heroStats->avg('minion_damage'), 2),
-                'avg_creep_damage' => round($heroStats->avg('creep_damage'), 2),
-                'avg_summon_damage' => round($heroStats->avg('summon_damage'), 2),
-                'avg_time_cc_enemy_heroes' => round($heroStats->avg('time_cc_enemy_heroes'), 2),
-                'avg_healing' => round($heroStats->avg('healing'), 2),
-                'avg_self_healing' => round($heroStats->avg('self_healing'), 2),
-                'avg_damage_taken' => round($heroStats->avg('damage_taken'), 2),
-                'avg_experience_contribution' => round($heroStats->avg('experience_contribution'), 2),
-                'avg_town_kills' => round($heroStats->avg('town_kills'), 2),
-                'avg_time_spent_dead' => round($heroStats->avg('time_spent_dead'), 2),
-                'avg_merc_camp_captures' => round($heroStats->avg('merc_camp_captures'), 2),
-                'avg_watch_tower_captures' => round($heroStats->avg('watch_tower_captures'), 2),
-                'avg_protection_allies' => round($heroStats->avg('protection_allies'), 2),
-                'avg_silencing_enemies' => round($heroStats->avg('silencing_enemies'), 2),
-                'avg_rooting_enemies' => round($heroStats->avg('rooting_enemies'), 2),
-                'avg_stunning_enemies' => round($heroStats->avg('stunning_enemies'), 2),
-                'avg_clutch_heals' => round($heroStats->avg('clutch_heals'), 2),
-                'avg_escapes' => round($heroStats->avg('escapes'), 2),
-                'avg_vengeance' => round($heroStats->avg('vengeance'), 2),
-                'avg_outnumbered_deaths' => round($heroStats->avg('outnumbered_deaths'), 2),
-                'avg_teamfight_escapes' => round($heroStats->avg('teamfight_escapes'), 2),
-                'avg_teamfight_healing' => round($heroStats->avg('teamfight_healing'), 2),
-                'avg_teamfight_damage_taken' => round($heroStats->avg('teamfight_damage_taken'), 2),
-                'avg_teamfight_hero_damage' => round($heroStats->avg('teamfight_hero_damage'), 2),
-                'avg_multikill' => round($heroStats->avg('multikill'), 2),
-                'avg_physical_damage' => round($heroStats->avg('physical_damage'), 2),
-                'avg_spell_damage' => round($heroStats->avg('spell_damage'), 2),
-                'avg_regen_globes' => round($heroStats->avg('regen_globes'), 2),
-                'avg_first_to_ten' => round($heroStats->avg('first_to_ten'), 2),
-                'avg_time_on_fire' => round($heroStats->avg('time_on_fire'), 2),
-
-                'sum_kills' => $heroStats->sum('kills'),
-                'sum_assists' => $heroStats->sum('assists'),
-                'sum_takedowns' => $heroStats->sum('takedowns'),
-                'sum_deaths' => $heroStats->sum('deaths'),
-                'sum_highest_kill_streak' => $heroStats->sum('highest_kill_streak'),
-                'sum_hero_damage' => $heroStats->sum('hero_damage'),
-                'sum_siege_damage' => $heroStats->sum('siege_damage'),
-                'sum_structure_damage' => $heroStats->sum('structure_damage'),
-                'sum_minion_damage' => $heroStats->sum('minion_damage'),
-                'sum_creep_damage' => $heroStats->sum('creep_damage'),
-                'sum_summon_damage' => $heroStats->sum('summon_damage'),
-                'sum_time_cc_enemy_heroes' => $heroStats->sum('time_cc_enemy_heroes'),
-                'sum_healing' => $heroStats->sum('healing'),
-                'sum_self_healing' => $heroStats->sum('self_healing'),
-                'sum_damage_taken' => $heroStats->sum('damage_taken'),
-                'sum_experience_contribution' => $heroStats->sum('experience_contribution'),
-                'sum_town_kills' => $heroStats->sum('town_kills'),
-                'sum_time_spent_dead' => $heroStats->sum('time_spent_dead'),
-                'sum_merc_camp_captures' => $heroStats->sum('merc_camp_captures'),
-                'sum_watch_tower_captures' => $heroStats->sum('watch_tower_captures'),
-                'sum_protection_allies' => $heroStats->sum('protection_allies'),
-                'sum_silencing_enemies' => $heroStats->sum('silencing_enemies'),
-                'sum_rooting_enemies' => $heroStats->sum('rooting_enemies'),
-                'sum_stunning_enemies' => $heroStats->sum('stunning_enemies'),
-                'sum_clutch_heals' => $heroStats->sum('clutch_heals'),
-                'sum_escapes' => $heroStats->sum('escapes'),
-                'sum_vengeance' => $heroStats->sum('vengeance'),
-                'sum_outnumbered_deaths' => $heroStats->sum('outnumbered_deaths'),
-                'sum_teamfight_escapes' => $heroStats->sum('teamfight_escapes'),
-                'sum_teamfight_healing' => $heroStats->sum('teamfight_healing'),
-                'sum_teamfight_damage_taken' => $heroStats->sum('teamfight_damage_taken'),
-                'sum_teamfight_hero_damage' => $heroStats->sum('teamfight_hero_damage'),
-                'sum_multikill' => $heroStats->sum('multikill'),
-                'sum_physical_damage' => $heroStats->sum('physical_damage'),
-                'sum_spell_damage' => $heroStats->sum('spell_damage'),
-                'sum_regen_globes' => $heroStats->sum('regen_globes'),
-                'sum_first_to_ten' => $heroStats->sum('first_to_ten'),
-                'sum_time_on_fire' => $heroStats->sum('time_on_fire'),
-                'season_win_rate_data' => $newSeasonData,
-                'map_data' => $mapData ? $mapData->sortBy('name')->values() : null,
-                'map_data_top5_played' => $mapData ? $mapData->sortByDesc('games_played')->take(3)->values() : null,
-                'map_data_top5_win_rate' => $winRateFiltered ? $winRateFiltered->sortByDesc('win_rate')->take(3)->values() : null,
-                'map_data_top5_latest_played' => $mapData ? $mapData->sortByDesc('game_date')->take(3)->values() : null,
-                'latestGames' => $latestGames,
-            ];
-        })->values()->sortBy('name')->values()->all();
-
-        return $returnData;
-    }
 }
diff --git a/app/Http/Controllers/Player/PlayerHeroesMapsRolesController.php b/app/Http/Controllers/Player/PlayerHeroesMapsRolesController.php
new file mode 100644
index 00000000..cf4bec25
--- /dev/null
+++ b/app/Http/Controllers/Player/PlayerHeroesMapsRolesController.php
@@ -0,0 +1,650 @@
+<?php
+
+namespace App\Http\Controllers\Player;
+use App\Services\GlobalDataService;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+use App\Rules\GameTypeInputValidation;
+use App\Rules\GameMapInputValidation;
+use App\Rules\HeroInputByIDValidation;
+use App\Rules\HeroInputValidation;
+use App\Rules\RoleInputValidation;
+
+use App\Models\Replay;
+use App\Models\Map;
+use App\Models\HeroesDataTalent;
+
+use App\Models\MasterMMRDataQM;
+use App\Models\MasterMMRDataUD;
+use App\Models\MasterMMRDataHL;
+use App\Models\MasterMMRDataTL;
+use App\Models\MasterMMRDataSL;
+use App\Models\MasterMMRDataAR;
+use App\Models\MMRTypeID;
+
+class PlayerHeroesMapsRolesController extends Controller
+{
+    protected $globalDataService;
+
+    public function __construct(GlobalDataService $globalDataService)
+    {
+        $this->globalDataService = $globalDataService;
+    }
+    public function getData(Request $request){
+        
+        //return response()->json($request->all());
+
+        $validator = \Validator::make($request->only(['blizz_id', 'region', 'minimumgames', 'type']), [
+            'blizz_id' => 'required|integer',
+            'region' => 'required|integer',
+            'minimumgames' => 'integer',
+            'type' => 'required|in:all,single',
+            'page' => 'required|in:hero,map,role',
+        ]);
+
+        $blizz_id = $request['blizz_id'];
+        $region = $request['region'];
+        $gameType = (new GameTypeInputValidation())->passes('game_type', $request["game_type"]);
+        $hero = (new HeroInputByIDValidation())->passes('statfilter', $request["hero"]);
+        $minimum_games = $request["minimumgames"];
+        $type = $request["type"];
+        $page = $request["page"];
+        $role = (new RoleInputValidation())->passes('role', $request["role"]);
+        $map = $request["map"];
+
+        if(count($gameType) == 6){
+            $gameType = [];
+        }
+
+        $result = Replay::join('player', 'player.replayID', '=', 'replay.replayID')
+                ->join('scores', function($join) {
+                    $join->on('scores.replayID', '=', 'replay.replayID')
+                         ->on('scores.battletag', '=', 'player.battletag');
+                })
+                ->join('talents', function($join) {
+                    $join->on('talents.replayID', '=', 'replay.replayID')
+                         ->on('talents.battletag', '=', 'player.battletag');
+                })
+                ->join('heroes', 'heroes.id', '=', 'player.hero')
+                ->where('region', $region)
+                ->when(!empty($gameType), function ($query) use ($gameType) {
+                        return $query->whereIn("game_type", $gameType);
+                    })
+                ->whereNot("game_type", 0)
+                ->where('blizz_id', $blizz_id)
+                ->when($type == "single" && $page == "hero", function ($query) use ($hero) {
+                        return $query->where("hero", $hero);
+                })
+                ->when($type == "single" && $page == "role", function ($query) use ($role) {
+                        return $query->where("new_role", $role);
+                })
+                ->when($type == "single" && $page == "map", function ($query) use ($map) {
+                        return $query->where("game_map", $map);
+                })
+                ->select([
+                    'replay.replayID',
+                    'hero',
+                    'hero_level',
+                    'game_date',
+                    'game_map',
+                    'game_type',
+                    'stack_size',
+                    'mastery_taunt',
+                    'new_role',
+                    'player_conservative_rating',
+                    'player_change',
+                    'hero_conservative_rating',
+                    'hero_change',
+                    'role_conservative_rating',
+                    'role_change',
+                    'winner',
+                    'kills',
+                    'assists',
+                    'takedowns',
+                    'deaths',
+                    'highest_kill_streak',
+                    'hero_damage',
+                    'siege_damage',
+                    'structure_damage',
+                    'minion_damage',
+                    'creep_damage',
+                    'summon_damage',
+                    'time_cc_enemy_heroes',
+                    'healing',
+                    'self_healing',
+                    'damage_taken',
+                    'experience_contribution',
+                    'town_kills',
+                    'time_spent_dead',
+                    'merc_camp_captures',
+                    'watch_tower_captures',
+                    'meta_experience',
+                    'match_award',
+                    'protection_allies',
+                    'silencing_enemies',
+                    'rooting_enemies',
+                    'stunning_enemies',
+                    'clutch_heals',
+                    'escapes',
+                    'vengeance',
+                    'outnumbered_deaths',
+                    'teamfight_escapes',
+                    'teamfight_healing',
+                    'teamfight_damage_taken',
+                    'teamfight_hero_damage',
+                    'multikill',
+                    'physical_damage',
+                    'spell_damage',
+                    'regen_globes',
+                    'first_to_ten',
+                    'time_on_fire',
+                    'level_one', 'level_four', 'level_seven', 'level_ten', 'level_thirteen', 'level_sixteen', 'level_twenty'
+                    ])
+                ->get();
+
+        $heroData = $this->globalDataService->getHeroes();
+        $heroData = $heroData->keyBy('id');
+
+        $maps = Map::all();
+        $maps = $maps->keyBy('map_id');
+
+        $talentData = HeroesDataTalent::all();
+        $talentData = $talentData->keyBy('talent_id');
+
+        $gameTypes = $this->globalDataService->getGameTypeIDtoString();
+
+        $qm_mmr_data = null;
+        $ud_mmr_data = null;
+        $hl_mmr_data = null;
+        $tl_mmr_data = null;
+        $sl_mmr_data = null;
+        $ar_mmr_data = null;
+
+        $seasonData = $this->globalDataService->getSeasonsData();
+        $newSeasonData = null;
+        $latestGames = null;
+        $mapWinRateFiltered= null;
+        $heroWinRateFiltered = null;
+
+        $mapData = null;
+        $heroDataStats = null;
+
+        
+        if($type == "single"){
+            $mapData = $result->groupBy('game_map');
+            $heroDataStats = $result->groupBy('hero');
+
+            $filterByType = $hero;
+            if($page == "role"){
+                $filterByType = MMRTypeID::select("mmr_type_id")->filterByName($role)->first()->mmr_type_id;
+            }
+
+            $qm_mmr_data = MasterMMRDataQM::select("conservative_rating", "win", "loss")->filterByType($filterByType)->filterByGametype(1)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
+            if($qm_mmr_data){
+                $qm_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(1, $filterByType), $qm_mmr_data->mmr);
+            }
+
+            $ud_mmr_data = MasterMMRDataUD::select("conservative_rating", "win", "loss")->filterByType($filterByType)->filterByGametype(2)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
+            if($ud_mmr_data){
+                $ud_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(2, $filterByType), $ud_mmr_data->mmr);
+            }
+
+            $hl_mmr_data = MasterMMRDataHL::select("conservative_rating", "win", "loss")->filterByType($filterByType)->filterByGametype(3)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
+            if($hl_mmr_data){
+                $hl_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(3, $filterByType), $hl_mmr_data->mmr);
+            }
+
+            $tl_mmr_data = MasterMMRDataTL::select("conservative_rating", "win", "loss")->filterByType($filterByType)->filterByGametype(4)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
+            if($tl_mmr_data){
+                $tl_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(4, $filterByType), $tl_mmr_data->mmr);
+            }
+
+            $sl_mmr_data = MasterMMRDataSL::select("conservative_rating", "win", "loss")->filterByType($filterByType)->filterByGametype(5)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
+            if($sl_mmr_data){
+                $sl_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(5, $filterByType), $sl_mmr_data->mmr);
+            }
+            $ar_mmr_data = MasterMMRDataAR::select("conservative_rating", "win", "loss")->filterByType($filterByType)->filterByGametype(6)->filterByBlizzID($blizz_id)->filterByRegion($region)->first();
+            if($ar_mmr_data){
+                $ar_mmr_data->rank_tier = $this->globalDataService->calculateSubTier($this->globalDataService->getRankTiers(6, $filterByType), $ar_mmr_data->mmr);
+            }
+
+
+
+
+            $latestGames = $result->sortByDesc('game_date')->take(5)->values();
+
+            $latestGames = $latestGames->map(function($game) use($heroData, $maps, $talentData, $gameTypes) {
+                $game = clone $game;
+                unset(
+                    $game['hero_level'],
+                    $game['stack_size'],
+                    $game['mastery_taunt'],
+                    $game['kills'],
+                    $game['assists'],
+                    $game['takedowns'],
+                    $game['deaths'],
+                    $game['highest_kill_streak'],
+                    $game['hero_damage'],
+                    $game['siege_damage'],
+                    $game['structure_damage'],
+                    $game['minion_damage'],
+                    $game['creep_damage'],
+                    $game['summon_damage'],
+                    $game['time_cc_enemy_heroes'],
+                    $game['healing'],
+                    $game['self_healing'],
+                    $game['damage_taken'],
+                    $game['experience_contribution'],
+                    $game['town_kills'],
+                    $game['time_spent_dead'],
+                    $game['merc_camp_captures'],
+                    $game['watch_tower_captures'],
+                    $game['meta_experience'],
+                    $game['match_award'],
+                    $game['protection_allies'],
+                    $game['silencing_enemies'],
+                    $game['rooting_enemies'],
+                    $game['stunning_enemies'],
+                    $game['clutch_heals'],
+                    $game['escapes'],
+                    $game['vengeance'],
+                    $game['outnumbered_deaths'],
+                    $game['teamfight_escapes'],
+                    $game['teamfight_healing'],
+                    $game['teamfight_damage_taken'],
+                    $game['teamfight_hero_damage'],
+                    $game['multikill'],
+                    $game['physical_damage'],
+                    $game['spell_damage'],
+                    $game['regen_globes'],
+                    $game['first_to_ten'],
+                    $game['time_on_fire'],
+                );
+
+                $game->game_type = $gameTypes[$game->game_type];
+                $game->hero = $heroData[$game->hero];
+                $game->game_map = $maps[$game->game_map];
+                $game->level_one = $game->level_one ? $talentData[$game->level_one] : null;
+                $game->level_four = $game->level_four ? $talentData[$game->level_four] : null;
+                $game->level_seven = $game->level_seven ? $talentData[$game->level_seven] : null;
+                $game->level_ten = $game->level_ten ? $talentData[$game->level_ten] : null;
+                $game->level_thirteen = $game->level_thirteen ? $talentData[$game->level_thirteen] : null;
+                $game->level_sixteen = $game->level_sixteen ? $talentData[$game->level_sixteen] : null;
+                $game->level_twenty = $game->level_twenty ? $talentData[$game->level_twenty] : null;
+
+                $game->player_conservative_rating = round(1800 + 40 * $game->player_conservative_rating);
+                $game->hero_conservative_rating = round(1800 + 40 * $game->hero_conservative_rating);
+                $game->role_conservative_rating = round(1800 + 40 * $game->role_conservative_rating);
+
+                $game->player_change = round($game->player_change, 2);
+                $game->hero_change = round($game->hero_change, 2);
+                $game->role_change = round($game->role_change, 2);
+
+
+                return $game;
+            });
+
+
+            $newSeasonData = $result->map(function ($item) use ($seasonData) {
+                $gameDate = $item->game_date;
+                $season = null;
+                $id = null;
+
+                foreach ($seasonData as $seasonItem) {
+                    $startDate = $seasonItem->start_date;
+                    $endDate = $seasonItem->end_date;
+
+                    if ($gameDate >= $startDate && $gameDate <= $endDate) {
+                        $season = $seasonItem->season;
+                        $id = $seasonItem->id;
+                        break;
+                    }
+                }
+
+                $seasonData = [
+                    'id' => $id, 
+                    'season' => $season, 
+                    'year' => $seasonItem->year, 
+                    'wins' => $item->winner === 1 ? 1 : 0,
+                    'losses' => $item->winner === 0 ? 1 : 0,
+                    'games_played' => 1,
+                ];
+
+                return $seasonData;
+            });
+
+            $newSeasonData = $newSeasonData->groupBy('id')->map(function ($group) {
+                $wins = $group->sum('wins');
+                $losses = $group->sum('losses');
+                $gamesPlayed = $group->sum('games_played');
+
+                $winRate = ($wins / $gamesPlayed) * 100;
+
+                return [
+                    'id' => $group->first()['id'], 
+                    'x_label' => $group->first()['year'] . " Season " . $group->first()['season'],
+                    'season' => $group->first()['season'], 
+                    'year' => $group->first()['year'], 
+                    'wins' => $wins,
+                    'losses' => $losses,
+                    'games_played' => $gamesPlayed,
+                    'win_rate' => round($winRate, 2),
+                ];
+            })->sortBy('id');
+
+
+
+
+            $mapData = $mapData->map(function($games, $map) use ($maps){
+                $gamesPlayed = $games->count();
+                $wins = $games->where('winner', 1)->count();
+                $losses = $games->where('winner', 0)->count();
+                $winRate = ($gamesPlayed > 0) ? ($wins / $gamesPlayed) * 100 : 0;
+                $latestGameDate = $games->max('game_date');
+
+
+            
+                return [
+                    'name' => $maps[$map]["name"],
+                    'game_map' => $maps[$map],
+                    'games_played' => $gamesPlayed,
+                    'latest_game' => $latestGameDate,
+                    'wins' => $wins,
+                    'losses' => $losses,
+                    'win_rate' => round($winRate, 2),
+                ];
+            
+            });
+      
+            $mapWinRateFiltered = $mapData->filter(function ($data) {
+                return $data['games_played'] > 5;
+            });
+
+            if ($mapWinRateFiltered->count() < 3) {
+                $mapWinRateFiltered = $mapData->filter(function ($data) {
+                    return $data['games_played'] > 2;
+                });
+            }
+
+            if ($mapWinRateFiltered->count() < 3) {
+                $mapWinRateFiltered = $mapData->filter(function ($data) {
+                    return $data['games_played'] > 0;
+                });
+            }
+
+            $heroDataStats = $heroDataStats->map(function($games, $hero) use ($heroData){
+                $gamesPlayed = $games->count();
+                $wins = $games->where('winner', 1)->count();
+                $losses = $games->where('winner', 0)->count();
+                $winRate = ($gamesPlayed > 0) ? ($wins / $gamesPlayed) * 100 : 0;
+                $latestGameDate = $games->max('game_date');
+
+
+            
+                return [
+                    'name' => $heroData[$hero]["name"],
+                    'hero' => $heroData[$hero],
+                    'games_played' => $gamesPlayed,
+                    'latest_game' => $latestGameDate,
+                    'wins' => $wins,
+                    'losses' => $losses,
+                    'win_rate' => round($winRate, 2),
+                ];
+            
+            });
+
+
+
+            $heroWinRateFiltered = $heroDataStats->filter(function ($data) {
+                return $data['games_played'] > 5;
+            });
+
+            if ($heroWinRateFiltered->count() < 3) {
+                $heroWinRateFiltered = $heroDataStats->filter(function ($data) {
+                    return $data['games_played'] > 2;
+                });
+            }
+
+            if ($heroWinRateFiltered->count() < 3) {
+                $heroWinRateFiltered = $heroDataStats->filter(function ($data) {
+                    return $data['games_played'] > 0;
+                });
+            }
+
+        }
+        
+
+        $groupBy = "";
+        if($page == "hero"){
+            $groupBy = 'hero';
+        }else if($page == "map"){
+            $groupBy = 'game_map';
+        }else if($page == "role"){
+            $groupBy = 'new_role';
+        }
+
+
+        $returnData = $result->groupBy($groupBy)->map(function($heroStats, $index) use ($heroData, $qm_mmr_data, $ud_mmr_data, $hl_mmr_data, $tl_mmr_data, $sl_mmr_data, $ar_mmr_data, $newSeasonData, $mapData, $mapWinRateFiltered, $latestGames, $page, $heroWinRateFiltered, $heroDataStats, $maps){
+            $deaths = $heroStats->sum('deaths');
+            $avg_kills = $heroStats->avg('kills');
+            $avg_takedowns = $heroStats->avg('takedowns');
+
+            $wins = $heroStats->where('winner', 1)->count();
+            $losses = $heroStats->where('winner', 0)->count();
+            $games_played = $wins + $losses;
+
+            $combined_healing = $heroStats->avg('healing') + $heroStats->avg('self_healing');
+
+            $stack_size_one_wins = $heroStats->whereNotNull('stack_size')->where('stack_size', 0)->where('winner', 1)->count();
+            $stack_size_one_losses = $heroStats->whereNotNull('stack_size')->where('stack_size', 0)->where('winner', 0)->count();
+            $stack_size_one_total = $stack_size_one_wins + $stack_size_one_losses;
+
+
+            $stack_size_two_wins = $heroStats->where('stack_size', 2)->where('winner', 1)->count();
+            $stack_size_two_losses = $heroStats->where('stack_size', 2)->where('winner', 0)->count();
+            $stack_size_two_total = $stack_size_two_wins + $stack_size_two_losses;
+
+            $stack_size_three_wins = $heroStats->where('stack_size', 3)->where('winner', 1)->count();
+            $stack_size_three_losses = $heroStats->where('stack_size', 3)->where('winner', 0)->count();
+            $stack_size_three_total = $stack_size_three_wins + $stack_size_three_losses;
+
+            $stack_size_four_wins = $heroStats->where('stack_size', 4)->where('winner', 1)->count();
+            $stack_size_four_losses = $heroStats->where('stack_size', 4)->where('winner', 0)->count();
+            $stack_size_four_total = $stack_size_four_wins + $stack_size_four_losses;
+
+            $stack_size_five_wins = $heroStats->where('stack_size', 5)->where('winner', 1)->count();
+            $stack_size_five_losses = $heroStats->where('stack_size', 5)->where('winner', 0)->count();
+            $stack_size_five_total = $stack_size_five_wins + $stack_size_five_losses;
+
+          
+            if($page == "hero"){
+                //$name = $heroData[$heroStats->pluck('hero')->first()]["name"];
+            }else if($page == "map"){
+                //$name = $maps[$heroStats->pluck('game_map')->first()]["name"];
+            }else if($page == "role"){
+                $name = $heroStats->pluck('new_role')->first();
+            }
+
+            return [
+                "name" => $index,
+                //"hero" => $heroData[$heroStats->pluck('hero')->first()],
+                //"game_map" => $maps[$heroStats->pluck('game_map')->first()],
+                'wins' => $wins,
+                'losses' => $losses,
+                'games_played' => $games_played,
+                'kda' => $deaths > 0 ? round($heroStats->sum('takedowns') / $deaths, 2) : $heroStats->sum('takedowns'),
+                'kdr' => $deaths > 0 ? round($heroStats->sum('kills') / $deaths, 2) : $heroStats->sum('kills'),
+                'win_rate' => $games_played > 0 ? round(($wins / $games_played) * 100, 2) : 0,
+                'qm_mmr_data' => $qm_mmr_data,
+                'ud_mmr_data' => $ud_mmr_data,
+                'hl_mmr_data' => $hl_mmr_data,
+                'tl_mmr_data' => $tl_mmr_data,
+                'sl_mmr_data' => $sl_mmr_data,
+                'ar_mmr_data' => $ar_mmr_data,
+
+                'stack_size_one_wins' => $stack_size_one_wins,
+                'stack_size_one_losses' => $stack_size_one_losses,
+                'stack_size_one_total' => $stack_size_one_total,
+                'stack_size_one_win_rate' => $stack_size_one_total > 0 ? round(($stack_size_one_wins / $stack_size_one_total) * 100, 2): 0,
+
+                'stack_size_two_wins' => $stack_size_two_wins,
+                'stack_size_two_losses' => $stack_size_two_losses,
+                'stack_size_two_total' => $stack_size_two_total,
+                'stack_size_two_win_rate' => $stack_size_two_total > 0 ? round(($stack_size_two_wins / $stack_size_two_total) * 100, 2): 0,
+
+                'stack_size_three_wins' => $stack_size_three_wins,
+                'stack_size_three_losses' => $stack_size_three_losses,
+                'stack_size_three_total' => $stack_size_three_total,
+                'stack_size_three_win_rate' => $stack_size_three_total > 0 ? round(($stack_size_three_wins / $stack_size_three_total) * 100, 2) : 0,
+
+                'stack_size_four_wins' => $stack_size_four_wins,
+                'stack_size_four_losses' => $stack_size_four_losses,
+                'stack_size_four_total' => $stack_size_four_total,
+                'stack_size_four_win_rate' => $stack_size_four_total > 0 ? round(($stack_size_four_wins / $stack_size_four_total) * 100, 2) : 0,
+
+                'stack_size_five_wins' => $stack_size_five_wins,
+                'stack_size_five_losses' => $stack_size_five_losses,
+                'stack_size_five_total' => $stack_size_five_total,
+                'stack_size_five_win_rate' => $stack_size_five_total > 0 ? round(($stack_size_five_wins / $stack_size_five_total) * 100, 2) : 0,
+
+                'max_kills' => $heroStats->max('kills'),
+                'max_assists' => $heroStats->max('assists'),
+                'max_takedowns' => $heroStats->max('takedowns'),
+                'max_deaths' => $heroStats->max('deaths'),
+                'max_highest_kill_streak' => $heroStats->max('highest_kill_streak'),
+                'max_hero_damage' => $heroStats->max('hero_damage'),
+                'max_siege_damage' => $heroStats->max('siege_damage'),
+                'max_structure_damage' => $heroStats->max('structure_damage'),
+                'max_minion_damage' => $heroStats->max('minion_damage'),
+                'max_creep_damage' => $heroStats->max('creep_damage'),
+                'max_summon_damage' => $heroStats->max('summon_damage'),
+                'max_time_cc_enemy_heroes' => $heroStats->max('time_cc_enemy_heroes'),
+                'max_healing' => $heroStats->max('healing'),
+                'max_self_healing' => $heroStats->max('self_healing'),
+                'max_damage_taken' => $heroStats->max('damage_taken'),
+                'max_experience_contribution' => $heroStats->max('experience_contribution'),
+                'max_town_kills' => $heroStats->max('town_kills'),
+                'max_time_spent_dead' => $heroStats->max('time_spent_dead'),
+                'max_merc_camp_captures' => $heroStats->max('merc_camp_captures'),
+                'max_watch_tower_captures' => $heroStats->max('watch_tower_captures'),
+                'max_protection_allies' => $heroStats->max('protection_allies'),
+                'max_silencing_enemies' => $heroStats->max('silencing_enemies'),
+                'max_rooting_enemies' => $heroStats->max('rooting_enemies'),
+                'max_stunning_enemies' => $heroStats->max('stunning_enemies'),
+                'max_clutch_heals' => $heroStats->max('clutch_heals'),
+                'max_escapes' => $heroStats->max('escapes'),
+                'max_vengeance' => $heroStats->max('vengeance'),
+                'max_outnumbered_deaths' => $heroStats->max('outnumbered_deaths'),
+                'max_teamfight_escapes' => $heroStats->max('teamfight_escapes'),
+                'max_teamfight_healing' => $heroStats->max('teamfight_healing'),
+                'max_teamfight_damage_taken' => $heroStats->max('teamfight_damage_taken'),
+                'max_teamfight_hero_damage' => $heroStats->max('teamfight_hero_damage'),
+                'max_multikill' => $heroStats->max('multikill'),
+                'max_physical_damage' => $heroStats->max('physical_damage'),
+                'max_spell_damage' => $heroStats->max('spell_damage'),
+                'max_regen_globes' => $heroStats->max('regen_globes'),
+                'max_first_to_ten' => $heroStats->max('first_to_ten'),
+                'max_time_on_fire' => $heroStats->max('time_on_fire'),
+                
+
+                'combined_healing' => round($combined_healing, 2),
+                'avg_assists' => round($avg_takedowns - $avg_kills, 2),
+                'avg_kills' => round($avg_kills, 2),
+                'avg_assists' => round($heroStats->avg('assists'), 2),
+                'avg_takedowns' => round($avg_takedowns, 2),
+                'avg_deaths' => round($heroStats->avg('deaths'), 2),
+                'avg_highest_kill_streak' => round($heroStats->avg('highest_kill_streak'), 2),
+                'avg_hero_damage' => round($heroStats->avg('hero_damage'), 2),
+                'avg_siege_damage' => round($heroStats->avg('siege_damage'), 2),
+                'avg_structure_damage' => round($heroStats->avg('structure_damage'), 2),
+                'avg_minion_damage' => round($heroStats->avg('minion_damage'), 2),
+                'avg_creep_damage' => round($heroStats->avg('creep_damage'), 2),
+                'avg_summon_damage' => round($heroStats->avg('summon_damage'), 2),
+                'avg_time_cc_enemy_heroes' => round($heroStats->avg('time_cc_enemy_heroes'), 2),
+                'avg_healing' => round($heroStats->avg('healing'), 2),
+                'avg_self_healing' => round($heroStats->avg('self_healing'), 2),
+                'avg_damage_taken' => round($heroStats->avg('damage_taken'), 2),
+                'avg_experience_contribution' => round($heroStats->avg('experience_contribution'), 2),
+                'avg_town_kills' => round($heroStats->avg('town_kills'), 2),
+                'avg_time_spent_dead' => round($heroStats->avg('time_spent_dead'), 2),
+                'avg_merc_camp_captures' => round($heroStats->avg('merc_camp_captures'), 2),
+                'avg_watch_tower_captures' => round($heroStats->avg('watch_tower_captures'), 2),
+                'avg_protection_allies' => round($heroStats->avg('protection_allies'), 2),
+                'avg_silencing_enemies' => round($heroStats->avg('silencing_enemies'), 2),
+                'avg_rooting_enemies' => round($heroStats->avg('rooting_enemies'), 2),
+                'avg_stunning_enemies' => round($heroStats->avg('stunning_enemies'), 2),
+                'avg_clutch_heals' => round($heroStats->avg('clutch_heals'), 2),
+                'avg_escapes' => round($heroStats->avg('escapes'), 2),
+                'avg_vengeance' => round($heroStats->avg('vengeance'), 2),
+                'avg_outnumbered_deaths' => round($heroStats->avg('outnumbered_deaths'), 2),
+                'avg_teamfight_escapes' => round($heroStats->avg('teamfight_escapes'), 2),
+                'avg_teamfight_healing' => round($heroStats->avg('teamfight_healing'), 2),
+                'avg_teamfight_damage_taken' => round($heroStats->avg('teamfight_damage_taken'), 2),
+                'avg_teamfight_hero_damage' => round($heroStats->avg('teamfight_hero_damage'), 2),
+                'avg_multikill' => round($heroStats->avg('multikill'), 2),
+                'avg_physical_damage' => round($heroStats->avg('physical_damage'), 2),
+                'avg_spell_damage' => round($heroStats->avg('spell_damage'), 2),
+                'avg_regen_globes' => round($heroStats->avg('regen_globes'), 2),
+                'avg_first_to_ten' => round($heroStats->avg('first_to_ten'), 2),
+                'avg_time_on_fire' => round($heroStats->avg('time_on_fire'), 2),
+
+                'sum_kills' => $heroStats->sum('kills'),
+                'sum_assists' => $heroStats->sum('assists'),
+                'sum_takedowns' => $heroStats->sum('takedowns'),
+                'sum_deaths' => $heroStats->sum('deaths'),
+                'sum_highest_kill_streak' => $heroStats->sum('highest_kill_streak'),
+                'sum_hero_damage' => $heroStats->sum('hero_damage'),
+                'sum_siege_damage' => $heroStats->sum('siege_damage'),
+                'sum_structure_damage' => $heroStats->sum('structure_damage'),
+                'sum_minion_damage' => $heroStats->sum('minion_damage'),
+                'sum_creep_damage' => $heroStats->sum('creep_damage'),
+                'sum_summon_damage' => $heroStats->sum('summon_damage'),
+                'sum_time_cc_enemy_heroes' => $heroStats->sum('time_cc_enemy_heroes'),
+                'sum_healing' => $heroStats->sum('healing'),
+                'sum_self_healing' => $heroStats->sum('self_healing'),
+                'sum_damage_taken' => $heroStats->sum('damage_taken'),
+                'sum_experience_contribution' => $heroStats->sum('experience_contribution'),
+                'sum_town_kills' => $heroStats->sum('town_kills'),
+                'sum_time_spent_dead' => $heroStats->sum('time_spent_dead'),
+                'sum_merc_camp_captures' => $heroStats->sum('merc_camp_captures'),
+                'sum_watch_tower_captures' => $heroStats->sum('watch_tower_captures'),
+                'sum_protection_allies' => $heroStats->sum('protection_allies'),
+                'sum_silencing_enemies' => $heroStats->sum('silencing_enemies'),
+                'sum_rooting_enemies' => $heroStats->sum('rooting_enemies'),
+                'sum_stunning_enemies' => $heroStats->sum('stunning_enemies'),
+                'sum_clutch_heals' => $heroStats->sum('clutch_heals'),
+                'sum_escapes' => $heroStats->sum('escapes'),
+                'sum_vengeance' => $heroStats->sum('vengeance'),
+                'sum_outnumbered_deaths' => $heroStats->sum('outnumbered_deaths'),
+                'sum_teamfight_escapes' => $heroStats->sum('teamfight_escapes'),
+                'sum_teamfight_healing' => $heroStats->sum('teamfight_healing'),
+                'sum_teamfight_damage_taken' => $heroStats->sum('teamfight_damage_taken'),
+                'sum_teamfight_hero_damage' => $heroStats->sum('teamfight_hero_damage'),
+                'sum_multikill' => $heroStats->sum('multikill'),
+                'sum_physical_damage' => $heroStats->sum('physical_damage'),
+                'sum_spell_damage' => $heroStats->sum('spell_damage'),
+                'sum_regen_globes' => $heroStats->sum('regen_globes'),
+                'sum_first_to_ten' => $heroStats->sum('first_to_ten'),
+                'sum_time_on_fire' => $heroStats->sum('time_on_fire'),
+                'season_win_rate_data' => $newSeasonData,
+                'map_data' => $mapData ? $mapData->sortBy('name')->values() : null,
+                'map_data_top_played' => $mapData ? $mapData->sortByDesc('games_played')->values() : null,
+                'map_data_top_win_rate' => $mapWinRateFiltered ? $mapWinRateFiltered->sortByDesc('win_rate')->values() : null,
+                'map_data_top_latest_played' => $mapData ? $mapData->sortByDesc('game_date')->values() : null,
+            
+                'hero_data_top_played' => $heroDataStats ? $heroDataStats->sortByDesc('games_played')->values() : null,
+                'hero_data_top_win_rate' => $heroWinRateFiltered ? $heroWinRateFiltered->sortByDesc('win_rate')->values() : null,
+                'hero_data_all_heroes' => $heroDataStats ? $heroDataStats->sortBy('name')->values() : null,
+
+                
+                'latestGames' => $latestGames,
+            ];
+        })->values()->sortBy('name')->values()->all();
+
+        return $returnData;
+    }
+    
+}
+
diff --git a/app/Http/Controllers/Player/PlayerMapsController.php b/app/Http/Controllers/Player/PlayerMapsController.php
new file mode 100644
index 00000000..ca13ef97
--- /dev/null
+++ b/app/Http/Controllers/Player/PlayerMapsController.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Http\Controllers\Player;
+use App\Services\GlobalDataService;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+use App\Rules\SingleGameMapInputValidation;
+
+class PlayerMapsController extends Controller
+{
+    protected $globalDataService;
+
+    public function __construct(GlobalDataService $globalDataService)
+    {
+        $this->globalDataService = $globalDataService;
+    }
+
+    public function showAll(Request $request, $battletag, $blizz_id, $region)
+    {
+        $validator = \Validator::make(compact('battletag', 'blizz_id', 'region'), [
+            'battletag' => 'required|string',
+            'blizz_id' => 'required|integer',
+            'region' => 'required|integer'
+        ]);
+
+        if ($validator->fails()) {
+            return redirect('/');
+        }
+
+
+        return view('Player.Maps.allMapData')->with([
+                'battletag' => $battletag,
+                'blizz_id' => $blizz_id,
+                'region' => $region,
+                'filters' => $this->globalDataService->getFilterData(),
+                ]);
+    }
+
+    public function showSingle(Request $request, $battletag, $blizz_id, $region, $role){
+        $validator = \Validator::make(compact('battletag', 'blizz_id', 'region'), [
+            'battletag' => 'required|string',
+            'blizz_id' => 'required|integer',
+            'region' => 'required|integer'
+        ]);
+
+        if ($validator->fails()) {
+            return redirect('/');
+        }
+        $map = (new SingleGameMapInputValidation())->passes('map', $request["map"]);
+
+
+        return view('Player.Maps.singleMapData')->with([
+                'battletag' => $battletag,
+                'blizz_id' => $blizz_id,
+                'region' => $region,
+                'map' => $map,
+                'filters' => $this->globalDataService->getFilterData(),
+                'regions' => $this->globalDataService->getRegionIDtoString(),
+                ]);
+    }
+}
diff --git a/app/Http/Controllers/Player/PlayerMatchupsController.php b/app/Http/Controllers/Player/PlayerMatchupsController.php
new file mode 100644
index 00000000..049bf795
--- /dev/null
+++ b/app/Http/Controllers/Player/PlayerMatchupsController.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace App\Http\Controllers\Player;
+use App\Services\GlobalDataService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+use App\Rules\SeasonInputValidation;
+use App\Rules\GameMapInputValidation;
+use App\Rules\GameTypeInputValidation;
+use App\Rules\HeroInputByIDValidation;
+
+
+class PlayerMatchupsController extends Controller
+{
+    protected $globalDataService;
+
+    public function __construct(GlobalDataService $globalDataService)
+    {
+        $this->globalDataService = $globalDataService;
+    }
+
+    public function show(Request $request, $battletag, $blizz_id, $region)
+    {
+        $validator = \Validator::make(compact('battletag', 'blizz_id', 'region'), [
+            'battletag' => 'required|string',
+            'blizz_id' => 'required|integer',
+            'region' => 'required|integer'
+        ]);
+
+        if ($validator->fails()) {
+            return redirect('/');
+        }
+
+
+        return view('Player.matchupData')->with([
+                'battletag' => $battletag,
+                'blizz_id' => $blizz_id,
+                'region' => $region,
+                'filters' => $this->globalDataService->getFilterData(),
+                ]);
+    }
+
+    public function getMatchupData(Request $request){
+        //return response()->json($request->all());
+
+        $validator = \Validator::make($request->only(['blizz_id', 'region']), [
+            'blizz_id' => 'required|integer',
+            'region' => 'required|integer',
+        ]);
+
+        $blizz_id = $request['blizz_id'];
+        $region = $request['region'];
+
+        $gameType = (new GameTypeInputValidation())->passes('game_type', $request["game_type"]);
+        $gameMap = (new GameMapInputValidation())->passes('map', $request["map"]);
+        $hero = (new HeroInputByIDValidation())->passes('statfilter', $request["hero"]);
+        $season = (new SeasonInputValidation())->passes('season', $request["season"]);
+
+        $returnData = [];
+
+        $heroData = $this->globalDataService->getHeroes();
+
+        foreach ($heroData as $hero) {
+            $returnData[$hero->id]['ally_wins'] = 0;
+            $returnData[$hero->id]['ally_losses'] = 0;
+            $returnData[$hero->id]['enemy_wins'] = 0;
+            $returnData[$hero->id]['enemy_losses'] = 0;
+        }
+        $heroData = $heroData->keyBy('id');
+
+        for($i = 0; $i <= 1; $i++){
+            $subquery = DB::table('player')
+                ->join('replay', 'replay.replayID', '=', 'player.replayID')
+                ->where('blizz_id', $blizz_id)
+                ->where('region', $region)
+                ->where('team', $i)
+                ->where('replay.game_type', '<>', 0)
+                ->select('player.replayID');
+
+            $result = DB::table('player')
+                ->whereIn('replayID', $subquery)
+                ->where('blizz_id', '<>', $blizz_id)
+                ->groupBy('hero', 'team', 'winner')
+                ->select('hero', 'team', 'winner', DB::raw('COUNT(*) AS total'))
+                ->get();
+
+            foreach($result as $hero => $value)
+            {
+                $returnData[$value->hero]["hero"] = $heroData[$value->hero];
+                $returnData[$value->hero]["name"] = $heroData[$value->hero]["name"];
+                if($value->team == $i){
+                    if($value->winner == 0){
+                        $returnData[$value->hero]["ally_losses"] += $value->total;
+                    }else{
+                        $returnData[$value->hero]["ally_wins"] += $value->total;
+                    }
+                    $returnData[$value->hero]["ally_games_played"] = $returnData[$value->hero]["ally_wins"] + $returnData[$value->hero]["ally_losses"];
+                    $returnData[$value->hero]["ally_win_rate"] = $returnData[$value->hero]["ally_games_played"] ? round(($returnData[$value->hero]["ally_wins"] / $returnData[$value->hero]["ally_games_played"]) * 100, 2): 0;
+                }else{
+                    if($value->winner == 0){
+                        $returnData[$value->hero]["enemy_losses"] += $value->total;
+                    }else{
+                        $returnData[$value->hero]["enemy_wins"] += $value->total;
+                    }
+                    $returnData[$value->hero]["enemy_games_played"] = $returnData[$value->hero]["enemy_wins"] + $returnData[$value->hero]["enemy_losses"];
+                    $returnData[$value->hero]["enemy_win_rate"] = $returnData[$value->hero]["enemy_games_played"] ? round(100 - ($returnData[$value->hero]["enemy_wins"] / $returnData[$value->hero]["enemy_games_played"]) * 100, 2): 0;
+                }
+            }
+        }
+        $topFiveAllyHeroes = collect($returnData)
+            ->filter(function($value, $key) {
+                return $value['ally_games_played'] >= 5;
+            })
+            ->sortByDesc('ally_win_rate')
+            ->take(5)->values();
+
+        $topFiveEnemyHeroes = collect($returnData)
+            ->filter(function($value, $key) {
+                return $value['enemy_games_played'] >= 5;
+            })
+            ->sortBy('enemy_win_rate')
+            ->take(5)->values();
+
+        $returnData = array_values($returnData);
+
+        usort($returnData, function ($a, $b) {
+            return strcmp($a['name'], $b['name']);
+        });
+        
+        return ["tabledata" => $returnData, "top_five_heroes" => $topFiveAllyHeroes , "top_five_enemies" => $topFiveEnemyHeroes];
+    }
+
+}
diff --git a/app/Http/Controllers/Player/PlayerRolesController.php b/app/Http/Controllers/Player/PlayerRolesController.php
new file mode 100644
index 00000000..2c7a9e67
--- /dev/null
+++ b/app/Http/Controllers/Player/PlayerRolesController.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers\Player;
+use App\Services\GlobalDataService;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+use App\Rules\RoleInputValidation;
+
+
+class PlayerRolesController extends Controller
+{
+    protected $globalDataService;
+
+    public function __construct(GlobalDataService $globalDataService)
+    {
+        $this->globalDataService = $globalDataService;
+    }
+
+    public function showAll(Request $request, $battletag, $blizz_id, $region)
+    {
+        $validator = \Validator::make(compact('battletag', 'blizz_id', 'region'), [
+            'battletag' => 'required|string',
+            'blizz_id' => 'required|integer',
+            'region' => 'required|integer'
+        ]);
+
+        if ($validator->fails()) {
+            return redirect('/');
+        }
+
+
+        return view('Player.Roles.allRoleData')->with([
+                'battletag' => $battletag,
+                'blizz_id' => $blizz_id,
+                'region' => $region,
+                'filters' => $this->globalDataService->getFilterData(),
+                ]);
+    }
+
+    public function showSingle(Request $request, $battletag, $blizz_id, $region, $role){
+        $validator = \Validator::make(compact('battletag', 'blizz_id', 'region'), [
+            'battletag' => 'required|string',
+            'blizz_id' => 'required|integer',
+            'region' => 'required|integer'
+        ]);
+
+        if ($validator->fails()) {
+            return redirect('/');
+        }
+        $role = (new RoleInputValidation())->passes('role', $request["role"]);
+
+
+        return view('Player.Roles.singleRoleData')->with([
+                'battletag' => $battletag,
+                'blizz_id' => $blizz_id,
+                'region' => $region,
+                'role' => $role,
+                'filters' => $this->globalDataService->getFilterData(),
+                'regions' => $this->globalDataService->getRegionIDtoString(),
+                ]);
+    }
+}
diff --git a/app/Rules/SingleGameMapInputValidation.php b/app/Rules/SingleGameMapInputValidation.php
new file mode 100644
index 00000000..814b3fd8
--- /dev/null
+++ b/app/Rules/SingleGameMapInputValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+use App\Models\Map;
+
+class SingleGameMapInputValidation implements Rule
+{
+    public function passes($attribute, $value)
+    {
+        $validMaps = Map::where('playable', '<>', 0)
+            ->pluck('name')
+            ->toArray();
+        
+        if(!in_array($value, $validMaps)){
+            return;
+        }
+
+        $mapId = Map::where('name', $value)
+                    ->pluck('map_id')->first();
+
+        return $mapId;
+    }
+
+    public function message()
+    {
+        return 'The selected game types are invalid.';
+    }
+}
diff --git a/app/Rules/SingleGameTypeInputValidation.php b/app/Rules/SingleGameTypeInputValidation.php
index b9e534f2..7f139392 100644
--- a/app/Rules/SingleGameTypeInputValidation.php
+++ b/app/Rules/SingleGameTypeInputValidation.php
@@ -12,13 +12,12 @@ public function passes($attribute, $value)
         $validGameTypes = GameType::pluck('short_name')->toArray();
         $validGameTypes = array_diff($validGameTypes, ['br', 'cu']);
 
-        if(!in_array($value, $validGameTypes)){  // corrected from $this->validGameTypes
+        if(!in_array($value, $validGameTypes)){
             return 5;
         }
 
-        // Assume $filteredGameTypes is defined elsewhere or pass it as an argument
         $typeId = GameType::whereIn('short_name', $filteredGameTypes)
-                    ->pluck('type_id')->first(); // corrected from ->type_id
+                    ->pluck('type_id')->first();
 
         return $typeId;
     }
diff --git a/composer.lock b/composer.lock
index 9f0ffd62..87d39e58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -626,16 +626,16 @@
         },
         {
             "name": "google/cloud-core",
-            "version": "v1.52.3",
+            "version": "v1.52.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-cloud-php-core.git",
-                "reference": "2ae714abfbf979cb52de26227a87e42bfdfb6347"
+                "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2ae714abfbf979cb52de26227a87e42bfdfb6347",
-                "reference": "2ae714abfbf979cb52de26227a87e42bfdfb6347",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/21c004745a32c71e03ab62effd7fbee0cf3ae7c6",
+                "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6",
                 "shasum": ""
             },
             "require": {
@@ -685,22 +685,22 @@
             ],
             "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
             "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.3"
+                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.4"
             },
-            "time": "2023-08-25T20:04:15+00:00"
+            "time": "2023-09-15T20:50:36+00:00"
         },
         {
             "name": "google/cloud-logging",
-            "version": "v1.28.0",
+            "version": "v1.28.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-cloud-php-logging.git",
-                "reference": "2ebaa460e0d41659ad1deccd6f12b164afafc437"
+                "reference": "818c654fa5cb01db8f8e625d43602683448e26b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-logging/zipball/2ebaa460e0d41659ad1deccd6f12b164afafc437",
-                "reference": "2ebaa460e0d41659ad1deccd6f12b164afafc437",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-logging/zipball/818c654fa5cb01db8f8e625d43602683448e26b1",
+                "reference": "818c654fa5cb01db8f8e625d43602683448e26b1",
                 "shasum": ""
             },
             "require": {
@@ -752,9 +752,9 @@
             ],
             "description": "Stackdriver Logging Client for PHP",
             "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-logging/tree/v1.28.0"
+                "source": "https://github.com/googleapis/google-cloud-php-logging/tree/v1.28.1"
             },
-            "time": "2023-07-07T20:46:38+00:00"
+            "time": "2023-09-15T20:50:36+00:00"
         },
         {
             "name": "google/common-protos",
@@ -810,16 +810,16 @@
         },
         {
             "name": "google/gax",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/gax-php.git",
-                "reference": "2566bce7081f17e4f4c35a215864c6d4a62f010f"
+                "reference": "e5de66d5cec6e5d5a3ee6b629c7717e43a817b9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/gax-php/zipball/2566bce7081f17e4f4c35a215864c6d4a62f010f",
-                "reference": "2566bce7081f17e4f4c35a215864c6d4a62f010f",
+                "url": "https://api.github.com/repos/googleapis/gax-php/zipball/e5de66d5cec6e5d5a3ee6b629c7717e43a817b9a",
+                "reference": "e5de66d5cec6e5d5a3ee6b629c7717e43a817b9a",
                 "shasum": ""
             },
             "require": {
@@ -859,9 +859,9 @@
             ],
             "support": {
                 "issues": "https://github.com/googleapis/gax-php/issues",
-                "source": "https://github.com/googleapis/gax-php/tree/v1.22.1"
+                "source": "https://github.com/googleapis/gax-php/tree/v1.23.0"
             },
-            "time": "2023-08-04T14:32:15+00:00"
+            "time": "2023-09-14T18:30:51+00:00"
         },
         {
             "name": "google/grpc-gcp",
diff --git a/resources/css/app.css b/resources/css/app.css
index 67ed0e20..00e9bc1f 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -19,6 +19,7 @@ html{background-color:lightgrey; font-family: 'Open Sans', sans-serif; box-sizin
 
 body{
   font-size:18px;
+  letter-spacing: .03em;
 }
 
 .search-input{
diff --git a/resources/js/app.js b/resources/js/app.js
index 24a1ed19..42f8aa08 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -16,7 +16,6 @@ import SearchPlayer from './components/Compare/SearchPlayer.vue';
 
 
 //Random Pieces - rename later to what you want and place in folder
-import MainNav from './components/MainNav.vue';
 import PageHeading from './components/PageHeading.vue';
 import Infobox from './components/Infobox.vue';
 import TalentBox from './components/TalentBox.vue';
@@ -25,8 +24,9 @@ import SingleSelectFilter from './components/SingleSelectFilter.vue';
 import MultiSelectFilter from './components/MultiSelectFilter.vue';
 import BubbleChart from './components/BubbleChart.vue';
 import BarChart from './components/BarChart.vue';
-import HeroBoxSmall from './components/HeroBoxSmall.vue';
+import RoundBoxSmall from './components/RoundBoxSmall.vue';
 import HeroGroupBox from './components/HeroGroupBox.vue';
+import GroupBox from './components/GroupBox.vue';
 import HeroBoxLarge from './components/HeroBoxLarge.vue';
 import RoleBox from './components/RoleBox.vue';
 import CustomButton from './components/CustomButton.vue';
@@ -37,6 +37,7 @@ import MapGroupBox from './components/MapGroupBox.vue';
 import GameSummaryBox from './components/GameSummaryBox.vue';
 import MmrBox from './components/MmrBox.vue';
 import StatBox from './components/StatBox.vue';
+import StatBarBox from './components/StatBarBox.vue';
 import SearchedBattletagHolding from './components/SearchedBattletagHolding.vue';
 
 //Global Pages
@@ -63,6 +64,11 @@ import PlayerStats from './components/Player/PlayerStats.vue';
 import FriendFoe from './components/Player/FriendFoe.vue';
 import PlayerHeroesAllStats from './components/Player/Heroes/PlayerHeroesAllStats.vue';
 import PlayerHeroSingleStats from './components/Player/Heroes/PlayerHeroSingleStats.vue';
+import PlayerMatchup from './components/Player/PlayerMatchup.vue';
+import PlayerRolesAllStats from './components/Player/Roles/PlayerRolesAllStats.vue';
+import PlayerRoleSingleStats from './components/Player/Roles/PlayerRoleSingleStats.vue';
+import PlayerMapsAllStats from './components/Player/Maps/PlayerMapsAllStats.vue';
+import PlayerMapSingleStats from './components/Player/Maps/PlayerMapSingleStats.vue';
 
 
 // Automatically register Vue components
diff --git a/resources/js/components/CustomButton.vue b/resources/js/components/CustomButton.vue
index 7e1a68cd..57a1a01b 100644
--- a/resources/js/components/CustomButton.vue
+++ b/resources/js/components/CustomButton.vue
@@ -41,6 +41,7 @@
       default: 'blue'
       },
       disabled: Boolean,
+      targetblank: Boolean,
     },
     data(){
       return {
@@ -69,7 +70,11 @@
     methods: {
      handleClick() {
       if(!this.disabled) {
-        window.location.href = this.href;
+        if(this.targetblank){
+          window.open(this.href, '_blank');
+        }else{
+          window.location.href = this.href;
+        }
       }
     }
   }
diff --git a/resources/js/components/CustomTable.vue b/resources/js/components/CustomTable.vue
index 0a35d41b..20af1900 100644
--- a/resources/js/components/CustomTable.vue
+++ b/resources/js/components/CustomTable.vue
@@ -21,7 +21,7 @@
             </div>
             <div v-else-if="column.value === 'most_played_hero'">
               <div class="flex gap-x-2 items-center">
-                <hero-box-small :hero="row.most_played_hero"></hero-box-small>
+                <round-box-small :hero="row.most_played_hero"></round-box-small>
                 {{ row.hero_build_games_played }}
               </div>
             </div>
diff --git a/resources/js/components/GameSummaryBox.vue b/resources/js/components/GameSummaryBox.vue
index 4e4f607b..45c6a01f 100644
--- a/resources/js/components/GameSummaryBox.vue
+++ b/resources/js/components/GameSummaryBox.vue
@@ -3,12 +3,12 @@
     class="relative flex border border-white bg-cover bg-no-repeat bg-center"
     :style="{ backgroundImage: `url('/images/maps/match/match-${data.game_map.sanitized_map_name}.jpg')` }"
   >    
-    <div class="flex-1 bg-red-500 p-4"><hero-box-small :hero="data.hero"></hero-box-small></div>
+    <div class="flex-1 bg-red-500 p-4"><round-box-small :hero="data.hero"></round-box-small></div>
     <div class="flex-1 bg-green-500 p-4"><mmr-box :winner="data.winner" :title="'Player'" :mmr="data.player_conservative_rating" :change="data.player_change"></mmr-box></div>
     <div class="flex-1 bg-blue-500 p-4"><mmr-box :winner="data.winner" :title="'Hero'" :mmr="data.hero_conservative_rating" :change="data.hero_change"></mmr-box></div>
     <div class="flex-1 bg-yellow-500 p-4"><mmr-box :winner="data.winner" :title="'Role'" :mmr="data.role_conservative_rating" :change="data.role_change"></mmr-box></div>
 
-    <div class="flex-1">
+    <div class="flex-1 flex gap-x-1">
       <talent-box v-if="data.level_one" :talent="data.level_one"></talent-box>
       <talent-box v-if="data.level_four" :talent="data.level_four"></talent-box>
       <talent-box v-if="data.level_seven" :talent="data.level_seven"></talent-box>
diff --git a/resources/js/components/Global/Compositions/CompositionsStats.vue b/resources/js/components/Global/Compositions/CompositionsStats.vue
index 7028faf8..b502d572 100644
--- a/resources/js/components/Global/Compositions/CompositionsStats.vue
+++ b/resources/js/components/Global/Compositions/CompositionsStats.vue
@@ -81,19 +81,19 @@
                 <tbody>
                   <div v-for="index in range">
                     <td>
-                      <hero-box-small :hero="getHeroData(1, row, row.compositionheroes[row.role_one.name], index)"></hero-box-small>
+                      <round-box-small :hero="getHeroData(1, row, row.compositionheroes[row.role_one.name], index)"></round-box-small>
                     </td>
                     <td>
-                      <hero-box-small :hero="getHeroData(2, row, row.compositionheroes[row.role_two.name], index)"></hero-box-small>
+                      <round-box-small :hero="getHeroData(2, row, row.compositionheroes[row.role_two.name], index)"></round-box-small>
                     </td>
                     <td>
-                      <hero-box-small :hero="getHeroData(3, row, row.compositionheroes[row.role_three.name], index)"></hero-box-small>
+                      <round-box-small :hero="getHeroData(3, row, row.compositionheroes[row.role_three.name], index)"></round-box-small>
                     </td>
                     <td>
-                      <hero-box-small :hero="getHeroData(4, row, row.compositionheroes[row.role_four.name], index)"></hero-box-small>
+                      <round-box-small :hero="getHeroData(4, row, row.compositionheroes[row.role_four.name], index)"></round-box-small>
                     </td>
                     <td>
-                      <hero-box-small :hero="getHeroData(5, row, row.compositionheroes[row.role_five.name], index)"></hero-box-small>
+                      <round-box-small :hero="getHeroData(5, row, row.compositionheroes[row.role_five.name], index)"></round-box-small>
                     </td>
                   </div>
                 </tbody>
diff --git a/resources/js/components/Global/Draft/GlobalDraftStats.vue b/resources/js/components/Global/Draft/GlobalDraftStats.vue
index f8ff732c..bcd40296 100644
--- a/resources/js/components/Global/Draft/GlobalDraftStats.vue
+++ b/resources/js/components/Global/Draft/GlobalDraftStats.vue
@@ -10,7 +10,7 @@
       <!-- Should turn into a component for easy styling? -->
       <div class="flex flex-wrap gap-1" v-if="!selectedHero">
         <div v-for="hero in heroes" :key="hero.id">
-          <hero-box-small :hero="hero" @click="clickedHero(hero)"></hero-box-small>
+          <round-box-small :hero="hero" @click="clickedHero(hero)"></round-box-small>
         </div>
       </div>
 
diff --git a/resources/js/components/Global/Hero/GlobalHeroStats.vue b/resources/js/components/Global/Hero/GlobalHeroStats.vue
index 5e9cd5da..22c6eb11 100644
--- a/resources/js/components/Global/Hero/GlobalHeroStats.vue
+++ b/resources/js/components/Global/Hero/GlobalHeroStats.vue
@@ -110,7 +110,7 @@
         <tbody>
           <template v-for="(row, index) in sortedData">
             <tr>
-              <td class="py-2 px-3 border-b border-gray-200 flex items-center gap-1"><hero-box-small :hero="row" :includehover="false"></hero-box-small>{{ row.name }}</td>
+              <td class="py-2 px-3 border-b border-gray-200 flex items-center gap-1"><round-box-small :hero="row" :includehover="false"></round-box-small>{{ row.name }}</td>
               <td class="py-2 px-3 border-b border-gray-200">{{ row.win_rate }}</td>
               <td class="py-2 px-3 border-b border-gray-200"><span v-html="'&#177;'"></span>{{ row.confidence_interval }}</td>
               <td class="py-2 px-3 border-b border-gray-200">{{ row.win_rate_change }}</td>
diff --git a/resources/js/components/Global/Hero/Map/GlobalHeroMapStats.vue b/resources/js/components/Global/Hero/Map/GlobalHeroMapStats.vue
index b2a0f426..2895ee24 100644
--- a/resources/js/components/Global/Hero/Map/GlobalHeroMapStats.vue
+++ b/resources/js/components/Global/Hero/Map/GlobalHeroMapStats.vue
@@ -6,7 +6,7 @@
     <!-- Should turn into a component for easy styling? -->
     <div class="flex flex-wrap gap-1" v-if="!selectedHero">
       <div v-for="hero in heroes" :key="hero.id">
-        <hero-box-small :hero="hero" @click="clickedHero(hero)"></hero-box-small>
+        <round-box-small :hero="hero" @click="clickedHero(hero)"></round-box-small>
       </div>
     </div>
 
diff --git a/resources/js/components/Global/Matchups/GlobalMatchupsStats.vue b/resources/js/components/Global/Matchups/GlobalMatchupsStats.vue
index ad0df020..ad47bbd4 100644
--- a/resources/js/components/Global/Matchups/GlobalMatchupsStats.vue
+++ b/resources/js/components/Global/Matchups/GlobalMatchupsStats.vue
@@ -6,7 +6,7 @@
     <!-- Should turn into a component for easy styling? -->
     <div class="flex flex-wrap gap-1" v-if="!selectedHero">
       <div v-for="hero in heroes" :key="hero.id">
-        <hero-box-small :hero="hero" @click="clickedHero(hero)"></hero-box-small>
+        <round-box-small :hero="hero" @click="clickedHero(hero)"></round-box-small>
       </div>
     </div>
 
@@ -37,8 +37,8 @@
 
 
     <div v-if="allyenemydata" class="flex flex-wrap gap-4">
-      <hero-group-box :text="'TOP 5 ALLIES ON HEROS TEAM'" :data="allyenemydata.ally.slice(0, 5)"></hero-group-box>
-      <hero-group-box :text="'TOP 5 THREATS ON ENEMIES TEAM'" :data="allyenemydata.enemy.slice(0, 5)"></hero-group-box>
+      <group-box :text="'TOP 5 ALLIES ON HEROS TEAM'" :data="allyenemydata.ally.slice(0, 5)"></group-box>
+      <group-box :text="'TOP 5 THREATS ON ENEMIES TEAM'" :data="allyenemydata.enemy.slice(0, 5)"></group-box>
 
 
 
@@ -52,7 +52,7 @@
               Win Rate as Ally %
             </th>            
             <th @click="sortTable('win_rate_against')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
-              Win Rate Against Abathur %
+              Win Rate Against  {{ this.selectedHero.name }} %
             </th>
             <th @click="sortTable('games_played_as_ally')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
               Games Played As Ally
diff --git a/resources/js/components/GroupBox.vue b/resources/js/components/GroupBox.vue
new file mode 100644
index 00000000..0b480405
--- /dev/null
+++ b/resources/js/components/GroupBox.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class=" w-auto inline-block m-1">
+       <h2 class="bg-blue rounded-t  p-2 text-sm text-center uppercase"> {{ this.text }}</h2>
+
+    <div class=" bg-black rounded-b  p-5 flex flex-wrap gap-5">
+
+      <round-box-small v-for="(item, index) in data" :key="index" :obj="item.hero !== undefined ? item.hero : (item.game_map !== undefined ? item.game_map : item.talent)" :hovertext="item.hovertext" size="big"></round-box-small>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'GroupBox',
+  components: {
+  },
+  props: {
+    text: String,
+    data: Array,
+  },
+  data(){
+    return {
+    }
+  },
+  created(){
+    console.log('this.data', this.data);
+  },
+  mounted() {
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {
+  }
+}
+</script>
\ No newline at end of file
diff --git a/resources/js/components/HeroBoxSmall.vue b/resources/js/components/HeroBoxSmall.vue
index 34b62bcd..7511bff1 100644
--- a/resources/js/components/HeroBoxSmall.vue
+++ b/resources/js/components/HeroBoxSmall.vue
@@ -1,6 +1,7 @@
 <template>
-  <div v-if="hero" class="relative group flex items-center " @mouseover="showTooltip = true" @mouseleave="showTooltip = false">
-    <img class="card-img-top relative hover:opacity-75 w-10 h-10 rounded-full" :src="getHeroImage()" :alt="hero.name" >
+  <div v-if="this.thisObj" class="relative group flex items-center " @mouseover="showTooltip = true" @mouseleave="showTooltip = false">
+    CHANGE THIS TO round-box-small
+    <img class="card-img-top relative hover:opacity-75 w-10 h-10 rounded-full" :src="getHeroImage()" :alt="this.thisObj.name" >
     <div v-if="includehover && showTooltip" class="absolute hidden bottom-11 -left-24  bg-gray-dark  text-s p-1  group-hover:block  text-white z-50 drop-shadow-md w-60 rounded-md px-2 text-center">
       {{ popuptext }}
     </div>
@@ -10,36 +11,68 @@
 
 <script>
 export default {
-  name: 'HeroBoxSmall',
+  name: 'RoundBoxSmall',
   components: {
   },
   props: {
+    obj: Object,
     hero: Object,
+    map: Object,
     hovertext: String,
+    type: String,
     includehover: Boolean
   },
   data(){
     return {
       showTooltip: false,
       popuptext: "",
+      
     }
   },
   created(){
-    if(this.hero){
-      this.popuptext = this.hovertext ? this.hovertext : this.hero.name;
+    
+    if(this.thisObj){
+      this.popuptext = this.hovertext ? this.hovertext : this.thisObj.name;
     }else{
-      console.log("hero is null")
+      console.log("obj is null")
     }
   },
   mounted() {
+    
+      
+      
+
+    
   },
   computed: {
+    thisObj(){
+      
+      if(typeof this.hero != 'undefined'){
+
+        return this.hero;
+      }
+      if(typeof this.map != 'undefined'){
+       
+        return this.map;
+      }
+      else{
+        return this.obj;
+      }
+    }
   },
   watch: {
   },
   methods: {
     getHeroImage(){
-      return `/images/heroes/${this.hero.short_name}.png`;
+     console.log(this);
+      if(this.type == "map")
+      {
+        return `/images/maps/icon/bg_${this.thisObj.sanitized_map_name}.jpg`;
+      }
+      else{
+        return `/images/heroes/${this.thisObj.short_name}.png`;
+      }
+      
     }
   }
 }
diff --git a/resources/js/components/HeroGroupBox.vue b/resources/js/components/HeroGroupBox.vue
index 3cde6d40..a9923ded 100644
--- a/resources/js/components/HeroGroupBox.vue
+++ b/resources/js/components/HeroGroupBox.vue
@@ -3,7 +3,8 @@
         {{ this.text }}
 
     <div class="border border-gray-300 p-4 flex flex-wrap gap-0">
-      <hero-box-small v-for="(item, index) in data" :key="index" :hero="item.hero" :hovertext="item.hovertext"></hero-box-small>
+      CHANGE THIS TO group-box
+      <round-box-small v-for="(item, index) in data" :key="index" :obj="item.hero" :hovertext="item.hovertext"></round-box-small>
     </div>
   </div>
 </template>
@@ -22,6 +23,8 @@ export default {
     }
   },
   created(){
+    console.log('data', this.data);
+
   },
   mounted() {
   },
diff --git a/resources/js/components/MainNav.vue b/resources/js/components/MainNav.vue
deleted file mode 100644
index 87f10b33..00000000
--- a/resources/js/components/MainNav.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <div>
-    <nav class="bg-gray-dark text-white p-4 z-50 relative">
-      <div class="flex justify-between items-center space-x-5 flex-wrap md:flex-nowrap">
-        <a class="text-blue-600 hover:text-blue-800 flex items-center font-logo text-2xl" href="/">
-          Heroes
-          <img class="w-10 mx-2" src="/images/logo/heroesprofilelogo.png" />
-          Profile
-        </a>
-        <div class="flex items-center space-x-4 flex-wrap md:flex-row">
-          <div class="relative group inline-block z-50 ">
-            <a class="text-blue-600 hover:text-blue-800 cursor-pointer">Global Hero Stats</a>
-            <div class="absolute left-0  hidden   group group-hover:block hover:block z-50 pt-5">
-              <div class="bg-blue border border-gray-300 rounded-md">
-                <a href="/Global/Hero" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Hero Stats</a>
-                <a href="/Global/Talents" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Talent Stats</a>
-                <a href="/Global/Hero/Maps" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Map Stats</a>
-                <a href="/Global/Matchups" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Matchup Stats</a>
-                <a href="/Global/Matchups/Talents" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Matchup Talent Stats</a>
-                <a href="/Global/Compositions" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Compositional Stats</a>
-                <a href="/Global/Draft/General" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Draft Stats</a>
-                <a href="/Global/Party" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Party Stats</a>
-                <a href="/Global/Extra" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Extra Stats</a>
-              </div>
-            </div>
-          </div>
-          <a class="text-blue-600 hover:text-blue-800" href="/Global/Leaderboard">Leaderboards</a>
-          <div class="relative group inline-block">
-            <a class="text-blue-600 hover:text-blue-800 cursor-pointer">Tools</a>
-            <div class="absolute left-0  hidden   group group-hover:block hover:block z-50 pt-5">
-              <div class="bg-blue border border-gray-300 rounded-md">
-                <a href="/" class="block px-4 py-2 text-gray-400 hover:bg-gray-200 cursor-not-allowed pointer-events-none">Talent Builder</a>
-                <a href="/Compare" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Compare</a>
-                <a href="https://drafter.heroesprofile.com/Drafter" target="_blank" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Drafter</a>
-                <a href="https://dev.heroesprofile.com/" target="_blank" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Game Data</a>
-                <a href="https://api.heroesprofile.com/upload" target="_blank" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Replay Uploader</a>
-                <a href="/" class="block px-4 py-2 text-gray-400 hover:bg-gray-200 cursor-not-allowed pointer-events-none">Activity Graphs</a>
-                <a href="/" class="block px-4 py-2 text-gray-400 hover:bg-gray-200 cursor-not-allowed pointer-events-none">Auto Battler</a>
-              </div>
-            </div>
-          </div>
-          <div v-if="mainSearchAccount" class="relative group inline-block">
-            <a class="text-blue-600 hover:text-blue-800 cursor-pointer">{{ mainSearchAccount.battletag }}</a>
-            <div class="absolute left-0 hidden group group-hover:block hover:block z-50 pt-5">
-              <div class="bg-blue border border-gray-300 rounded-md">
-                <a :href="'/Player/' + mainSearchAccount.battletag + '/' + mainSearchAccount.blizz_id + '/' + mainSearchAccount.region" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Profile</a>
-                <a :href="'/Player/FriendFoe/' + mainSearchAccount.battletag + '/' + mainSearchAccount.blizz_id + '/' + mainSearchAccount.region" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Friends and Foes</a>
-                <a :href="'/Player/Hero/All/' + mainSearchAccount.battletag + '/' + mainSearchAccount.blizz_id + '/' + mainSearchAccount.region" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Heroes</a>
-              </div>
-            </div>
-          </div>
-          <search-component :type="'alt'" :buttonText="'Find Player'" :labelText="'Enter a battletag'"></search-component>
-        </div>
-        <div class="flex space-x-4">
-          <custom-button :href="'#'" :text="'API'" :alt="'API'" :size="'small'" :color="'teal'"></custom-button>
-          <custom-button :href="'#'" :text="'Replay Uploader'" :alt="'Replay Uploader'" :size="'small'" :color="'blue'"></custom-button>
-          <custom-button :href="'#'" :text="'Patreon'" :alt="'Patreon'" :size="'small'" :color="'red'"></custom-button>
-        </div>
-
-        <div v-if="isAuthenticated">
-          <div class="relative group inline-block">
-            <div class="flex items-center cursor-pointer mr-5">
-              <img 
-              class="card-img-top relative hover:opacity-75 w-12 h-12 rounded-full" 
-              :src="'/images/heroes/auto_select.jpg'" 
-              :alt="'Settings'" 
-              >
-            </div>
-            <div class="absolute right-0 mt-2 hidden group-hover:block z-50 bg-blue border border-gray-300 rounded-md">
-              <a href="/Profile/Settings" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Settings</a>
-              <a href="/Battlenet/Logout" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Logout</a>
-            </div>
-          </div>
-        </div>
-
-        <div v-else>
-          <custom-button :href="'/Authenticate/Battlenet'" :text="'Login'" :alt="'Login'" :size="'small'" :color="'teal'" ></custom-button>
-        </div>
-      </div>
-    </nav>
-    <nav class="flex justify-start">
-      <template v-for="(account, index) in altSearchAccounts" :key="index" >
-        <div v-if="account" class="relative group inline-block ml-4 pr-2">
-          <a class="text-blue-600 hover:text-blue-800 cursor-pointer">{{ account.battletag }}</a>
-          <div class="absolute right-0 mt-2 hidden group-hover:block z-50 bg-blue border border-gray-300 rounded-md">
-            <a :href="'/Player/' + account.battletag + '/' + account.blizz_id + '/' + account.region" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Profile</a>
-            <a :href="'/Player/FriendFoe/' + account.battletag + '/' + account.blizz_id + '/' + account.region" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Friends and Foes</a>
-            <a :href="'/Player/Hero/All/' + account.battletag + '/' + account.blizz_id + '/' + account.region" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Heroes</a>
-          </div>
-        </div>
-      </template>
-    </nav>
-
-
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'MainNav',
-    components: {
-    },
-    props: {
-      isAuthenticated: Boolean,
-      mainSearchAccount: Object,
-      altSearchAccount1: Object,
-      altSearchAccount2: Object,
-      altSearchAccount3: Object,
-    },
-    data(){
-      return {
-      }
-    },
-    created(){
-    },
-    mounted() {
-    },
-    computed: {
-      altSearchAccounts() {
-        return [this.altSearchAccount1, this.altSearchAccount2, this.altSearchAccount3];
-      }
-    },
-    watch: {
-    },
-    methods: {
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/resources/js/components/MapBoxSmall.vue b/resources/js/components/MapBoxSmall.vue
index df65264b..7b48c96e 100644
--- a/resources/js/components/MapBoxSmall.vue
+++ b/resources/js/components/MapBoxSmall.vue
@@ -1,5 +1,6 @@
 <template>
   <div v-if="map" class="relative group flex items-center " @mouseover="showTooltip = true" @mouseleave="showTooltip = false">
+    CHANGE THIS TO round-box-small
     <img class="card-img-top relative hover:opacity-75 w-10 h-10 rounded-full" :src="getMapImage()" :alt="map.name" >
     <div v-if="includehover && showTooltip" class="absolute hidden bottom-11 -left-24  bg-gray-dark  text-s p-1  group-hover:block  text-white z-50 drop-shadow-md w-60 rounded-md px-2 text-center">
       {{ popuptext }}
@@ -25,6 +26,7 @@ export default {
     }
   },
   created(){
+
     if(this.map){
       this.popuptext = this.hovertext ? this.hovertext : this.hero.name;
     }else{
diff --git a/resources/js/components/MapGroupBox.vue b/resources/js/components/MapGroupBox.vue
index 4190a5eb..727574fa 100644
--- a/resources/js/components/MapGroupBox.vue
+++ b/resources/js/components/MapGroupBox.vue
@@ -1,9 +1,10 @@
 <template>
   <div>
+    CHANGE THIS TO group-box
         {{ this.text }}
 
     <div class="border border-gray-300 p-4 flex flex-wrap gap-0">
-      <map-box-small v-for="(item, index) in data" :key="index" :map="item.game_map" :hovertext="'I am not sure if this is the right way to do it'"></map-box-small>
+      <round-box-small v-for="(item, index) in data" :key="index" :obj="item.game_map" :type="'map'" :hovertext="'I am not sure if this is the right way to do it'"></round-box-small>
     </div>
   </div>
 </template>
@@ -22,6 +23,7 @@ export default {
     }
   },
   created(){
+    console.log('map-data', this.data);
   },
   mounted() {
     //console.log(this.data);
diff --git a/resources/js/components/Player/FriendFoe.vue b/resources/js/components/Player/FriendFoe.vue
index 1eb06a87..1e5b7b69 100644
--- a/resources/js/components/Player/FriendFoe.vue
+++ b/resources/js/components/Player/FriendFoe.vue
@@ -8,7 +8,7 @@
       :gametypedefault="gametypedefault"
       :includehero="true"
       :includegamemap="true"
-      :includegametype="true"
+      :includegametypefull="true"
       :includeseason="true"
       >
     </filters>
diff --git a/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue b/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue
index 6116bb20..c0305aff 100644
--- a/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue
+++ b/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue
@@ -53,13 +53,13 @@
           <infobox :input="'Click a map to see more information and stats, or select all maps to view maps regardless of hero.'"></infobox>
 
           <div class="flex">
-            <map-group-box :data="data.map_data_top5_played"></map-group-box>
-            <map-group-box :data="data.map_data_top5_win_rate"></map-group-box>
-            <map-group-box :data="data.map_data_top5_latest_played"></map-group-box>
+            <group-box :data="data.map_data_top_played.slice(0, 3)"></group-box>
+            <group-box :data="data.map_data_top_win_rate.slice(0, 3)"></group-box>
+            <group-box :data="data.map_data_top_latest_played.slice(0, 3)"></group-box>
           </div>
 
           <div class="flex">
-            <map-box-small v-for="(item, index) in data.map_data" :key="index" :map="item.map_object" :hovertext="'I am not sure if this is the right way to do it'"></map-box-small>
+            <round-box-small v-for="(item, index) in data.map_data" :key="index" :map="item.map_object" :hovertext="'I am not sure if this is the right way to do it'"></round-box-small>
           </div>
         </div>
 
@@ -137,6 +137,7 @@ export default {
           game_type: this.gametype,
           hero: this.hero,
           type: "single",
+          page: "hero",
         });
 
         this.data = response.data[0];
@@ -156,7 +157,7 @@ export default {
       }
     },
     getTalentPageUrl(){
-      return "/Player/Talents/" + this.battletag + "/" + this.blizzid + "/" + this.region + "/" + this.heroname;
+      return "/Player/" + this.battletag + "/" + this.blizzid + "/" + this.region  + "/Talents/" + "/" + this.heroname;
     },
   }
 }
diff --git a/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue b/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue
index c95fc207..a865323f 100644
--- a/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue
+++ b/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue
@@ -231,6 +231,7 @@ export default {
           role: this.role,
           minimumgames: this.minimumgames,
           type: "all",
+          page: "hero",
         });
 
         this.data = response.data;
@@ -261,7 +262,7 @@ export default {
       return this.gametype.includes(game_type);
     },
     getPlayerHeroPageUrl(hero){
-      return "/Player/Hero/Single/" + this.battletag + "/" + this.blizzid + "/" + this.region + "/" + hero;
+      return "/Player/" + this.battletag + "/" + this.blizzid + "/" + this.region + "/Hero/" + hero;
     },
     isDisabled(stat) {
       return this.selectedStatsCount >= 15 && !stat.selected;
diff --git a/resources/js/components/Player/Maps/PlayerMapSingleStats.vue b/resources/js/components/Player/Maps/PlayerMapSingleStats.vue
new file mode 100644
index 00000000..6568f029
--- /dev/null
+++ b/resources/js/components/Player/Maps/PlayerMapSingleStats.vue
@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <single-select-filter :values="this.filters.heroes" :text="'Heroes'" @input-changed="handleInputChange" :defaultValue="hero"></single-select-filter>
+    as played by {{ battletag }}({{ getRegionName(region) }})
+
+
+
+      <multi-select-filter :values="filters.game_types_full" :text="'Game Type'" @input-changed="handleInputChange" :defaultValue="gametype"></multi-select-filter>
+      <single-select-filter :values="filters.seasons" :text="'Season'" @input-changed="handleInputChange"></single-select-filter>
+     
+
+      <div v-if="data">
+        <span>Wins = </span><span>{{ data.wins }}</span><br>
+        <span>Losses = </span><span>{{ data.losses }}</span><br>
+        <span>Win Rate = </span><span>{{ data.win_rate }}</span><br>
+        <span>KDR = </span><span>{{ data.kdr }}</span><br>
+        <span>KDA = </span><span>{{ data.kda }}</span><br>
+        <span>Takedowns = </span><span>{{ data.sum_takedowns }}</span><br>
+        <span>Kills = </span><span>{{ data.sum_kills }}</span><br>
+        <span>Assists = </span><span>{{ data.sum_assists }}</span><br>
+        <span>Games Played = </span><span>{{ data.games_played }}</span><br>
+        <span>Deaths = </span><span>{{ data.sum_deaths }}</span><br>
+
+
+        <span>QM MMR = </span><span>{{ data.qm_mmr_data ? data.qm_mmr_data.mmr : 0 }}</span><br>
+        <span>QM MMR Tier = </span><span>{{ data.qm_mmr_data ? data.qm_mmr_data.rank_tier : "" }}</span><br>
+
+        <span>UD MMR = </span><span>{{ data.ud_mmr_data ? data.ud_mmr_data.mmr : 0 }}</span><br>
+        <span>UD MMR Tier = </span><span>{{ data.ud_mmr_data ? data.ud_mmr_data.rank_tier : "" }}</span><br>
+
+        <span>HL MMR = </span><span>{{ data.hl_mmr_data ? data.hl_mmr_data.mmr : 0 }}</span><br>
+        <span>HL MMR Tier = </span><span>{{ data.hl_mmr_data ? data.hl_mmr_data.rank_tier : "" }}</span><br>
+
+        <span>TL MMR = </span><span>{{ data.tl_mmr_data ? data.tl_mmr_data.mmr : 0 }}</span><br>
+        <span>TL MMR Tier = </span><span>{{ data.tl_mmr_data ? data.tl_mmr_data.rank_tier : "" }}</span><br>
+
+        <span>SL MMR = </span><span>{{ data.sl_mmr_data ? data.sl_mmr_data.mmr : 0 }}</span><br>
+        <span>SL MMR Tier = </span><span>{{ data.sl_mmr_data ? data.sl_mmr_data.rank_tier : "" }}</span><br>
+
+        <span>AR MMR = </span><span>{{ data.ar_mmr_data ? data.ar_mmr_data.mmr : 0 }}</span><br>
+        <span>AR MMR Tier = </span><span>{{ data.ar_mmr_data ? data.ar_mmr_data.rank_tier : "" }}</span><br>
+
+        <line-chart v-if="seasonWinRateDataArray" :data="seasonWinRateDataArray"></line-chart>
+
+        <div>
+          <span>Maps played on {{ heroname }}</span>
+
+          <infobox :input="'Click a map to see more information and stats, or select all maps to view maps regardless of hero.'"></infobox>
+
+          <div class="flex">
+            <map-group-box :data="data.map_data_top_played.slice(0, 3)"></map-group-box>
+            <map-group-box :data="data.map_data_top_win_rate.slice(0, 3)"></map-group-box>
+            <map-group-box :data="data.map_data_top_latest_played.slice(0, 3)"></map-group-box>
+          </div>
+
+          <div class="flex">
+            <map-box-small v-for="(item, index) in data.map_data" :key="index" :map="item.map_object" :hovertext="'I am not sure if this is the right way to do it'"></map-box-small>
+          </div>
+        </div>
+
+        <div>
+          <h1>Party Size Win Rates</h1>
+          solo: total games: {{ data.stack_size_one_total }} wins: {{ data.stack_size_one_wins }} losses: {{ data.stack_size_one_losses }} win rate: {{ data.stack_size_one_win_rate }}% <br>
+
+          three-man: total games: {{ data.stack_size_three_total }} wins: {{ data.stack_size_three_wins }} losses: {{ data.stack_size_three_losses }} win rate: {{ data.stack_size_three_win_rate }}% <br>
+
+          four-man: total games: {{ data.stack_size_four_total }} wins: {{ data.stack_size_four_wins }} losses: {{ data.stack_size_four_losses }} win rate: {{ data.stack_size_four_win_rate }}% <br>
+
+          five-man: total games: {{ data.stack_size_five_total }} wins: {{ data.stack_size_five_wins }} losses: {{ data.stack_size_five_losses }} win rate: {{ data.stack_size_five_win_rate }}% <br>
+
+        </div>
+
+        <div v-if="data && data.latestGames">
+          <h1>Most Recent matches</h1>
+
+          <template v-for="(item, index) in data.latestGames">
+            <div>{{ item.game_map.name }} | {{ item.game_type.name }} | {{ item.game_date }}</div>
+            <game-summary-box :data="item"></game-summary-box>
+          </template>
+        </div>
+
+      </div>
+    
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PlayerHeroSingleStats',
+  components: {
+  },
+  props: {
+    filters: Object,
+    hero: Number,
+    battletag: String,
+    blizzid: {
+      type: [String, Number]
+    },
+    region: Number,
+    regions: Object,
+    map: String,
+  },
+  data(){
+    return {
+      inputhero: null,
+      gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+      data: null,
+    }
+  },
+  created(){
+    this.inputhero = this.hero;
+  },
+  mounted() {
+    this.getData();
+  },
+  computed: {
+    heroname(){
+      return this.filters.heroes.find(hero => hero.code === this.inputhero).name;
+    },
+    seasonWinRateDataArray() {
+      return this.data && this.data.season_win_rate_data ? Object.values(this.data.season_win_rate_data) : null;
+    }
+  },
+  watch: {
+  },
+  methods: {
+    async getData(type){
+      try{
+        const response = await this.$axios.post("/api/v1/player/maps/single", {
+          blizz_id: this.blizzid,
+          region: this.region,
+          game_type: this.gametype,
+          hero: this.hero,
+          type: "single",
+          page: "map",
+          map: this.map,
+        });
+
+        this.data = response.data[0];
+      }catch(error){
+        console.log(error);
+      }
+    },
+    getRegionName(regionID){
+      return this.regions[regionID];
+    },
+    handleInputChange(eventPayload) {
+      if (eventPayload.field === "Heroes") {
+        this.inputhero = eventPayload.value;
+
+        //Might have to url encode this...who knows
+        history.pushState(null, null, this.heroname);
+      }
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/resources/js/components/Player/Maps/PlayerMapsAllStats.vue b/resources/js/components/Player/Maps/PlayerMapsAllStats.vue
new file mode 100644
index 00000000..022cc794
--- /dev/null
+++ b/resources/js/components/Player/Maps/PlayerMapsAllStats.vue
@@ -0,0 +1,293 @@
+/PlayerMapsAllStats.vue<template>
+  <div>
+    All Maps
+    as played by
+    <span><a :href="`/Player/${battletag}/${blizzid}/${region}`" target="_blank">{{ battletag }}</a></span>
+
+    <infobox :input="infoText"></infobox>
+
+    <filters 
+      :onFilter="filterData" 
+      :filters="filters" 
+      :gametypedefault="gametype"
+      :minimumgamesdefault="'0'"
+      :includehero="true"
+      :includerole="true"
+      :includegametypefull="true"
+      :includeseason="true"
+      :includeminimumgames="true"
+
+      >
+    </filters>
+
+    <div>
+      <input type="text" v-model="searchQuery" placeholder="Search..." />
+
+     <div v-for="(stat, index) in filteredStats" :key="index" class="flex items-center">
+        <input type="checkbox" v-model="stat.selected" :disabled="isDisabled(stat)" @change="onCheckboxChange(stat)" />
+        <label>{{ stat.name }}</label>
+      </div>
+    </div>
+
+    <div>
+      <table class="min-w-full bg-white">
+        <thead>
+          <tr>
+            <th @click="sortTable('name')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              Map
+            </th>    
+            <th @click="sortTable('win_rate')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              Games
+            </th>
+            <th @click="sortTable('kda')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              KDA
+            </th>  
+            <th @click="sortTable('kdr')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              KDR
+            </th>
+            <template   v-for="stat in stats">
+              <th  v-if="stat.selected" @click="sortTable(stat.value)" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+                {{ stat.name }}
+              </th>
+            </template> 
+         
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="row in sortedData" :key="row.id">
+            <td class="py-2 px-3 border-b border-gray-200"><a :href="getPlayerMapPageUrl(row.name)">{{ row.name }}</a></td>
+            <td class="py-2 px-3 border-b border-gray-200">{{ row.wins }}|{{ row.losses }} {{ row.win_rate }} %</td>
+            <td class="py-2 px-3 border-b border-gray-200">{{ row.kda }} <br>{{ row.avg_kills }}/{{ row.avg_deaths }}/{{ row.avg_assists }}</td>
+            <td class="py-2 px-3 border-b border-gray-200">{{ row.kdr }} <br>{{ row.avg_kills }}/{{ row.avg_deaths }}</td>
+            
+            <template v-for="stat in stats" >
+              <td 
+                v-if="stat.selected" 
+                :class="{ flash: stat.flash }"
+                class="py-2 px-3 border-b border-gray-200">
+                {{ row[stat.value] }}
+              </td>
+            </template>
+
+    
+          </tr>
+        </tbody>
+      </table>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PlayerHeroesAllStats',
+  components: {
+  },
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    battletag: String,
+    blizzid: String, 
+    region: String,
+  },
+  data(){
+    return {
+      infoText: "Select a hero below to view detailed stats for that hero. Use the search box above to filter the list of heroes. Or scroll down to the advanced section for table view.",
+      gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+      data: null,
+      sortKey: '',
+      sortDir: 'asc',
+      role: null,
+      hero: null,
+      minimumgames: 0,
+      searchQuery: '',
+      stats: [
+        { name: "Avg Assists", value: 'avg_assists', selected: false, flash: false},
+        { name: "Avg Clutch Heals", value: 'avg_clutch_heals', selected: false, flash: false},
+        { name: "Avg Creep Damage", value: 'avg_creep_damage', selected: false, flash: false},
+        { name: "Avg Damage Taken", value: 'avg_damage_taken', selected: false, flash: false},
+        { name: "Avg Deaths", value: 'avg_deaths', selected: false, flash: false},
+        { name: "Avg Escapes", value: 'avg_escapes', selected: false, flash: false},
+        { name: "Avg Experience Contribution", value: 'avg_experience_contribution', selected: false, flash: false},
+        { name: "Avg First to Ten", value: 'avg_first_to_ten', selected: false, flash: false},
+        { name: "Avg Healing", value: 'avg_healing', selected: false, flash: false},
+        { name: "Avg Hero Damage", value: 'avg_hero_damage', selected: true, flash: false},
+        { name: "Avg Highest Kill Streak", value: 'avg_highest_kill_streak', selected: false, flash: false},
+        { name: "Avg Kills", value: 'avg_kills', selected: true, flash: false},
+        { name: "Avg Merc Camp Captures", value: 'avg_merc_camp_captures', selected: false, flash: false},
+        { name: "Avg Minion Damage", value: 'avg_minion_damage', selected: false, flash: false},
+        { name: "Avg Multikill", value: 'avg_multikill', selected: false, flash: false},
+        { name: "Avg Outnumbered Deaths", value: 'avg_outnumbered_deaths', selected: false, flash: false},
+        { name: "Avg Physical Damage", value: 'avg_physical_damage', selected: false, flash: false},
+        { name: "Avg Protection Allies", value: 'avg_protection_allies', selected: false, flash: false},
+        { name: "Avg Regen Globes", value: 'avg_regen_globes', selected: false, flash: false},
+        { name: "Avg Rooting Enemies", value: 'avg_rooting_enemies', selected: false, flash: false},
+        { name: "Avg Self Healing", value: 'avg_self_healing', selected: false, flash: false},
+        { name: "Avg Siege Damage", value: 'avg_siege_damage', selected: true, flash: false},
+        { name: "Avg Silencing Enemies", value: 'avg_silencing_enemies', selected: false, flash: false},
+        { name: "Avg Spell Damage", value: 'avg_spell_damage', selected: false, flash: false},
+        { name: "Avg Structure Damage", value: 'avg_structure_damage', selected: false, flash: false},
+        { name: "Avg Stunning Enemies", value: 'avg_stunning_enemies', selected: false, flash: false},
+        { name: "Avg Summon Damage", value: 'avg_summon_damage', selected: false, flash: false},
+        { name: "Avg Takedowns", value: 'avg_takedowns', selected: false, flash: false},
+        { name: "Avg Teamfight Damage Taken", value: 'avg_teamfight_damage_taken', selected: false, flash: false},
+        { name: "Avg Teamfight Escapes", value: 'avg_teamfight_escapes', selected: false, flash: false},
+        { name: "Avg Teamfight Escapes", value: 'avg_teamfight_escapes', selected: false, flash: false},
+        { name: "Avg Teamfight Healing", value: 'avg_teamfight_healing', selected: false, flash: false},
+        { name: "Avg Teamfight Hero Damage", value: 'avg_teamfight_hero_damage', selected: false, flash: false},
+        { name: "Avg Time CC Enemy Heroes", value: 'avg_time_cc_enemy_heroes', selected: false, flash: false},
+        { name: "Avg Time on Fire", value: 'avg_time_on_fire', selected: false, flash: false},
+        { name: "Avg Time Spent Dead", value: 'avg_time_spent_dead', selected: false, flash: false},
+        { name: "Avg Town Kills", value: 'avg_town_kills', selected: false, flash: false},
+        { name: "Avg Vengeance", value: 'avg_vengeance', selected: false, flash: false},
+        { name: "Avg Watch Tower Captures", value: 'avg_watch_tower_captures', selected: false, flash: false},
+        { name: "Avg Total Healing", value: 'combined_healing', selected: true, flash: false},
+        { name: "Hero", value: 'hero', selected: false, flash: false},
+        { name: "KDA", value: 'kda', selected: false, flash: false},
+        { name: "KDR", value: 'kdr', selected: false, flash: false},
+        { name: "Losses", value: 'losses', selected: false, flash: false},
+        { name: "Max Assists", value: 'max_assists', selected: false, flash: false},
+        { name: "Max Clutch Heals", value: 'max_clutch_heals', selected: false, flash: false},
+        { name: "Max Creep Damage", value: 'max_creep_damage', selected: false, flash: false},
+        { name: "Max Damage Taken", value: 'max_damage_taken', selected: false, flash: false},
+        { name: "Max Deaths", value: 'max_deaths', selected: false, flash: false},
+        { name: "Max Escapes", value: 'max_escapes', selected: false, flash: false},
+        { name: "Max Experience Contribution", value: 'max_experience_contribution', selected: false, flash: false},
+        { name: "Max First to Ten", value: 'max_first_to_ten', selected: false, flash: false},
+        { name: "Max Healing", value: 'max_healing', selected: false, flash: false},
+        { name: "Max Hero Damage", value: 'max_hero_damage', selected: false, flash: false},
+        { name: "Max Highest Kill Streak", value: 'max_highest_kill_streak', selected: false, flash: false},
+        { name: "Max Kills", value: 'max_kills', selected: false, flash: false},
+        { name: "Max Merc Camp Captures", value: 'max_merc_camp_captures', selected: false, flash: false},
+        { name: "Max Minion Damage", value: 'max_minion_damage', selected: false, flash: false},
+        { name: "Max Multikill", value: 'max_multikill', selected: false, flash: false},
+        { name: "Max Outnumbered Deaths", value: 'max_outnumbered_deaths', selected: false, flash: false},
+        { name: "Max Physical Damage", value: 'max_physical_damage', selected: false, flash: false},
+        { name: "Max Protection Allies", value: 'max_protection_allies', selected: false, flash: false},
+        { name: "Max Regen Globes", value: 'max_regen_globes', selected: false, flash: false},
+        { name: "Max Rooting Enemies", value: 'max_rooting_enemies', selected: false, flash: false},
+        { name: "Max Self Healing", value: 'max_self_healing', selected: false, flash: false},
+        { name: "Max Siege Damage", value: 'max_siege_damage', selected: false, flash: false},
+        { name: "Max Silencing Enemies", value: 'max_silencing_enemies', selected: false, flash: false},
+        { name: "Max Spell Damage", value: 'max_spell_damage', selected: false, flash: false},
+        { name: "Max Structure Damage", value: 'max_structure_damage', selected: false, flash: false},
+        { name: "Max Stunning Enemies", value: 'max_stunning_enemies', selected: false, flash: false},
+        { name: "Max Summon Damage", value: 'max_summon_damage', selected: false, flash: false},
+        { name: "Max Takedowns", value: 'max_takedowns', selected: false, flash: false},
+        { name: "Max Teamfight Damage Taken", value: 'max_teamfight_damage_taken', selected: false, flash: false},
+        { name: "Max Teamfight Escapes", value: 'max_teamfight_escapes', selected: false, flash: false},
+        { name: "Max Teamfight Healing", value: 'max_teamfight_healing', selected: false, flash: false},
+        { name: "Max Teamfight Hero Damage", value: 'max_teamfight_hero_damage', selected: false, flash: false},
+        { name: "Max Time CC Enemy Heroes", value: 'max_time_cc_enemy_heroes', selected: false, flash: false},
+        { name: "Max Time on Fire", value: 'max_time_on_fire', selected: false, flash: false},
+        { name: "Max Time Spent Dead", value: 'max_time_spent_dead', selected: false, flash: false},
+        { name: "Max Town Kills", value: 'max_town_kills', selected: false, flash: false},
+        { name: "Max Vengeance", value: 'max_vengeance', selected: false, flash: false},
+        { name: "Max Watch Tower Captures", value: 'max_watch_tower_captures', selected: false, flash: false},
+        { name: "Wins", value: 'wins', selected: false, flash: false},
+
+      ],
+    }
+  },
+  created(){
+  },
+  mounted() {
+    this.getData();
+  },
+  computed: {
+    filteredStats() {
+      return this.stats.filter(stat => stat.name.toLowerCase().includes(this.searchQuery.toLowerCase()));
+    },
+    selectedStatsCount() {
+      return this.stats.filter(stat => stat.selected).length;
+    },
+    sortedData() {
+      if (!this.sortKey) return this.data;
+      return this.data.slice().sort((a, b) => {
+        const valA = a[this.sortKey];
+        const valB = b[this.sortKey];
+        if (this.sortDir === 'asc') {
+          return valA < valB ? -1 : 1;
+        } else {
+          return valA > valB ? -1 : 1;
+        }
+      });
+    },
+  },
+  watch: {
+  },
+  methods: {
+    async getData(type){
+      try{
+        const response = await this.$axios.post("/api/v1/player/maps/all", {
+          blizz_id: this.blizzid,
+          region: this.region,
+          game_type: this.gametype,
+          hero: this.hero,
+          role: this.role,
+          type: "all",
+          page: "map",
+          map: this.map,
+        });
+
+        this.data = response.data;
+        console.log(this.data);
+      }catch(error){
+        console.log(error);
+      }
+    },
+    filterData(filteredData){
+      this.gametype = filteredData.multi["Game Type"] ? Array.from(filteredData.multi["Game Type"]) : this.gametype;
+      this.role = filteredData.single["Role"] ? filteredData.single["Role"] : null;
+      this.hero = filteredData.single.Heroes ? filteredData.single.Heroes : null;
+      this.data = [];
+      this.sortKey = '';
+      this.sortDir ='asc';
+      this.getData();
+    },
+    sortTable(key) {
+      if (key === this.sortKey) {
+        this.sortDir = this.sortDir === 'asc' ? 'desc' : 'asc';
+      } else {
+        this.sortDir = 'asc';
+      }
+      this.sortKey = key;
+    },
+    showGameTypeColumn(game_type){
+      return this.gametype.includes(game_type);
+    },
+    getPlayerMapPageUrl(map){
+      return "/Player/" + this.battletag + "/" + this.blizzid + "/" + this.region + "/Map/" + map;
+    },
+    isDisabled(stat) {
+      return this.selectedStatsCount >= 15 && !stat.selected;
+    },
+    onCheckboxChange(inputStat) {
+      inputStat.flash = true;
+      setTimeout(() => {
+            inputStat.flash = false;
+          }, 1000);
+    },
+  }
+}
+</script>
+
+<style>
+.flash-animation {
+  animation: flash 0.5s;
+}
+
+@keyframes flash {
+  0% { background-color: transparent; }
+  50% { background-color: blue; }
+  100% { background-color: transparent; }
+}
+
+.flash {
+  animation: flash 1s;
+}
+</style>
\ No newline at end of file
diff --git a/resources/js/components/Player/PlayerMatchup.vue b/resources/js/components/Player/PlayerMatchup.vue
new file mode 100644
index 00000000..1fb1f8be
--- /dev/null
+++ b/resources/js/components/Player/PlayerMatchup.vue
@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <page-heading :heading="'Matchups'" :infoText1="infotext"></page-heading>
+    
+    <filters 
+    :onFilter="filterData" 
+    :filters="filters" 
+    :gametypedefault="gametype"
+    :includehero="true"
+    :includegamemap="true"
+    :includegametypefull="true"
+    :includeseason="true"
+    >
+  </filters>
+      <group-box :text="'Top 5 Allies with more than 5 games'" :data="topfiveheroes"></group-box>
+      <group-box :text="'Top 5 Enemies with more than 5 games'" :data="topfiveenemies"></group-box>
+
+  <table class="min-w-full bg-white">
+    <thead>
+      <tr>
+        <th @click="sortTable('name')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+          Hero
+        </th>
+        <th @click="sortTable('ally_win_rate')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+          Win Rate as Ally %
+        </th>            
+        <th @click="sortTable('enemy_win_rate')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+          Win Rate Against Hero %
+        </th>
+        <th @click="sortTable('ally_games_played')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+          Games Played As Ally
+        </th>
+        <th @click="sortTable('enemy_games_played')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+          Games Played Against
+        </th>                 
+      </tr>
+    </thead>
+    <tbody>
+      <tr v-for="(row, index) in sortedData" :key="index">
+        <td class="py-2 px-3 border-b border-gray-200">
+          <a :href="'/Player/' + battletag + '/' + blizzid + '/' + region + '/Hero/Single/' + row.hero.name"><hero-box-small :hero="row.hero"></hero-box-small>{{ row.hero.name }}</a>
+        </td>
+         <td class="py-2 px-3 border-b border-gray-200">
+          {{ row.ally_win_rate }}
+        </td>
+        <td class="py-2 px-3 border-b border-gray-200">
+          {{ row.enemy_win_rate }}
+        </td>
+        <td class="py-2 px-3 border-b border-gray-200">
+          {{ row.ally_games_played }}
+        </td>
+        <td class="py-2 px-3 border-b border-gray-200">
+          {{ row.enemy_games_played }}
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+
+</div>
+</template>
+
+<script>
+  export default {
+    name: 'PlayerMatchup',
+    components: {
+    },
+    props: {
+      filters: Object,
+      battletag: String,
+      blizzid: String, 
+      region: String,
+    },
+    data(){
+      return {
+        infotext: "Hero Matchups provide information on which heroes you are good with and against",
+        gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+        data: [],
+        sortKey: '',
+        sortDir: 'asc',
+        topfiveheroes: [],
+        topfiveenemies: [],
+      }
+    },
+    created(){
+    },
+    mounted() {
+      this.getData();
+    },
+    computed: {
+      sortedData() {
+        if (!this.sortKey) return this.data;
+        return this.data.slice().sort((a, b) => {
+          const valA = a[this.sortKey];
+          const valB = b[this.sortKey];
+          if (this.sortDir === 'asc') {
+            return valA < valB ? -1 : 1;
+          } else {
+            return valA > valB ? -1 : 1;
+          }
+        });
+      },
+    },
+    watch: {
+    },
+    methods: {
+      async getData(){
+        try{
+          const response = await this.$axios.post("/api/v1/player/matchups", {
+            blizz_id: this.blizzid,
+            region: this.region,
+
+            game_type: this.gametype,
+            map: this.gamemap,
+            season: this.season,
+            hero: this.hero,
+          });
+          this.data = response.data.tabledata;
+          this.topfiveheroes = response.data.top_five_heroes;
+          this.topfiveenemies = response.data.top_five_enemies;
+
+          console.log(response.data);
+        }catch(error){
+          console.log(error);
+        }
+      },
+      sortTable(key) {
+        if (key === this.sortKey) {
+          this.sortDir = this.sortDir === 'asc' ? 'desc' : 'asc';
+        } else {
+          this.sortDir = 'asc';
+        }
+        this.sortKey = key;
+      },
+      filterData(){
+
+      },
+
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/resources/js/components/Player/PlayerStats.vue b/resources/js/components/Player/PlayerStats.vue
index 96c1eab2..e4257f35 100644
--- a/resources/js/components/Player/PlayerStats.vue
+++ b/resources/js/components/Player/PlayerStats.vue
@@ -5,46 +5,50 @@
       <single-select-filter :values="filters.seasons" :text="'Season'" @input-changed="handleInputChange"></single-select-filter>
      
 
-      <div v-if="data">
-
-        <div class="flex-1 flex">
-          <stat-box :title="'Wins'" :value="data.wins"></stat-box>
-          <stat-box :title="'Losses'" :value="data.losses"></stat-box>
-          <stat-box :title="'First to Ten Wins'" :value="data.first_to_ten_wins"></stat-box>
-          <stat-box :title="'First to Ten Losses'" :value="data.first_to_ten_losses"></stat-box>
-          <stat-box :title="'First to Ten Win Rate'" :value="data.first_to_ten_win_rate"></stat-box>
-
-          <stat-box :title="'Second to Ten Wins'" :value="data.second_to_ten_wins"></stat-box>
-          <stat-box :title="'Second to Ten Losses'" :value="data.second_to_ten_losses"></stat-box>
-          <stat-box :title="'Second to Ten Win Rate'" :value="data.second_to_ten_win_rate"></stat-box>         
-          
-          <stat-box :title="'KDR'" :value="data.kdr"></stat-box>          
-          <stat-box :title="'KDA'" :value="data.kda"></stat-box>          
-
-          <stat-box :title="'Account Level'" :value="data.account_level"></stat-box>          
-        </div>
+      <div v-if="data" class="">
+
+        <div class="flex md:p-20 gap-10">
+          <div class="flex-1 flex flex-wrap">
+            <stat-box :title="'Wins'" :value="data.wins"></stat-box>
+            <stat-box :title="'Losses'" :value="data.losses"></stat-box>
+            <stat-box :title="'First to Ten Wins'" :value="data.first_to_ten_wins"></stat-box>
+            <stat-box :title="'First to Ten Losses'" :value="data.first_to_ten_losses"></stat-box>
+            <stat-bar-box :title="'First to Ten Win Rate'" :value="data.first_to_ten_win_rate"></stat-bar-box>
+
+            <stat-box :title="'Second to Ten Wins'" :value="data.second_to_ten_wins"></stat-box>
+            <stat-box :title="'Second to Ten Losses'" :value="data.second_to_ten_losses"></stat-box>
+            <stat-bar-box :title="'Second to Ten Win Rate'" :value="data.second_to_ten_win_rate"></stat-bar-box>         
+            
+            <stat-box :title="'KDR'" :value="data.kdr"></stat-box>          
+            <stat-box :title="'KDA'" :value="data.kda"></stat-box>          
+
+            <stat-box :title="'Account Level'" :value="data.account_level"></stat-box>          
+          </div>
+          <div>player image goes here</div>
 
-        <div class="flex-1 flex">
-          <stat-box :title="'MVP'" :value="data.mvp_rate"></stat-box>       
-          <stat-box :title="'Total Time Played'" :value="data.total_time_played"></stat-box>       
-          <stat-box :title="'AVG. Time on Fire'" :value="data.average_time_on_fire"></stat-box>       
+          <div class="flex-1 flex flex-wrap ">
+            <stat-box :title="'MVP'" :value="data.mvp_rate"></stat-box>       
+            <stat-box :title="'Total Time Played'" :value="data.total_time_played"></stat-box>       
+            <stat-box :title="'AVG. Time on Fire'" :value="data.average_time_on_fire"></stat-box>       
 
-          <stat-box :title="'Win Rate'" :value="data.win_rate"></stat-box>       
-          <stat-box :title="'Bruiser Win Rate'" :value="data.bruiser_win_rate"></stat-box>       
-          <stat-box :title="'Support Win Rate'" :value="data.support_win_rate"></stat-box>       
-          <stat-box :title="'Ranged Assassin Win Rate'" :value="data.ranged_assassin_win_rate"></stat-box>       
-          <stat-box :title="'Melee Assassin Win Rate'" :value="data.melee_assassin_win_rate"></stat-box>       
-          <stat-box :title="'Healer Win Rate'" :value="data.healer_win_rate"></stat-box>       
-          <stat-box :title="'Tank Win Rate'" :value="data.tank_win_rate"></stat-box>       
+            <stat-bar-box :title="'Win Rate'" :value="data.win_rate"></stat-bar-box>       
+            <stat-bar-box :title="'Bruiser Win Rate'" :value="data.bruiser_win_rate"></stat-bar-box>       
+            <stat-bar-box :title="'Support Win Rate'" :value="data.support_win_rate"></stat-bar-box>       
+            <stat-bar-box :title="'Ranged Assassin Win Rate'" :value="data.ranged_assassin_win_rate"></stat-bar-box>       
+            <stat-bar-box :title="'Melee Assassin Win Rate'" :value="data.melee_assassin_win_rate"></stat-bar-box>       
+            <stat-bar-box :title="'Healer Win Rate'" :value="data.healer_win_rate"></stat-bar-box>       
+            <stat-bar-box :title="'Tank Win Rate'" :value="data.tank_win_rate"></stat-bar-box>       
 
+          </div>
         </div>
 
-        <div>
-          <h1> Heroes </h1>
-
-          <hero-group-box :text="'Most Played'" :data="data.heroes_three_most_played"></hero-group-box>
-          <hero-group-box :text="'Highest Win Rate'" :data="data.heroes_three_highest_win_rate"></hero-group-box>
-          <hero-group-box :text="'Latest Played'" :data="data.heroes_three_latest_played"></hero-group-box>
+        <div class="bg-lighten p-10 text-center">
+          <h2 class="flex-1 text-3xl font-bold"> Heroes </h2>
+          <div class="flex flex-wrap justify-center">
+            <group-box :text="'Most Played'" :data="data.heroes_three_most_played"></group-box>
+            <group-box :text="'Highest Win Rate'" :data="data.heroes_three_highest_win_rate"></group-box>
+            <group-box :text="'Latest Played'" :data="data.heroes_three_latest_played"></group-box>
+          </div>
         </div>
 
         <div>
@@ -69,17 +73,17 @@
         </div>
 
         <div>
-          <h1>Maps</h1>
+          <h2>Maps</h2>
           <div class="flex">
-            <map-group-box :data="data.maps_three_most_played"></map-group-box>
-            <map-group-box :data="data.maps_three_highest_win_rate"></map-group-box>
-            <map-group-box :data="data.maps_three_latest_played"></map-group-box>
+            <group-box :text="'Most Played'" :data="data.maps_three_most_played"></group-box>
+            <group-box :text="'Highest Win Rate'" :data="data.maps_three_highest_win_rate"></group-box>
+            <group-box :text="'Latest Played'" :data="data.maps_three_latest_played"></group-box>
           </div>
         </div>
 
 
         <div>
-          <h1>Party Size Win Rates</h1>
+          <h2>Party Size Win Rates</h2>
           solo: total games: {{ data.stack_one_total }} wins: {{ data.stack_one_wins }} losses: {{ data.stack_one_losses }} win rate: {{ data.stack_one_win_rate }}% <br>
 
           three-man: total games: {{ data.stack_three_total }} wins: {{ data.stack_three_wins }} losses: {{ data.stack_three_losses }} win rate: {{ data.stack_three_win_rate }}% <br>
@@ -91,7 +95,7 @@
         </div>
 
         <div v-if="data && data.matchData">
-          <h1>Most Recent matches</h1>
+          <h2>Most Recent matches</h2>
 
           <template v-for="(item, index) in data.matchData">
             <div>{{ item.game_map.name }} | {{ item.game_type.name }} | {{ item.game_date }}</div>
diff --git a/resources/js/components/Player/Roles/PlayerRoleSingleStats.vue b/resources/js/components/Player/Roles/PlayerRoleSingleStats.vue
new file mode 100644
index 00000000..7b9ffd6d
--- /dev/null
+++ b/resources/js/components/Player/Roles/PlayerRoleSingleStats.vue
@@ -0,0 +1,143 @@
+<template>
+  <div>
+    <single-select-filter :values="this.filters.role" :text="'Role'" @input-changed="handleInputChange"  :defaultValue="role"></single-select-filter>
+    as played by {{ battletag }}({{ getRegionName(region) }})
+
+
+
+    <multi-select-filter :values="filters.game_types_full" :text="'Game Type'" @input-changed="handleInputChange" :defaultValue="gametype"></multi-select-filter>
+    <single-select-filter :values="filters.seasons" :text="'Season'" @input-changed="handleInputChange"></single-select-filter>
+
+
+    <div v-if="data">
+      <span>Wins = </span><span>{{ data.wins }}</span><br>
+      <span>Losses = </span><span>{{ data.losses }}</span><br>
+      <span>Win Rate = </span><span>{{ data.win_rate }}</span><br>
+      <span>KDR = </span><span>{{ data.kdr }}</span><br>
+      <span>KDA = </span><span>{{ data.kda }}</span><br>
+      <span>Takedowns = </span><span>{{ data.sum_takedowns }}</span><br>
+      <span>Kills = </span><span>{{ data.sum_kills }}</span><br>
+      <span>Assists = </span><span>{{ data.sum_assists }}</span><br>
+      <span>Games Played = </span><span>{{ data.games_played }}</span><br>
+      <span>Deaths = </span><span>{{ data.sum_deaths }}</span><br>
+
+
+      <span>QM MMR = </span><span>{{ data.qm_mmr_data ? data.qm_mmr_data.mmr : 0 }}</span><br>
+      <span>QM MMR Tier = </span><span>{{ data.qm_mmr_data ? data.qm_mmr_data.rank_tier : "" }}</span><br>
+
+      <span>UD MMR = </span><span>{{ data.ud_mmr_data ? data.ud_mmr_data.mmr : 0 }}</span><br>
+      <span>UD MMR Tier = </span><span>{{ data.ud_mmr_data ? data.ud_mmr_data.rank_tier : "" }}</span><br>
+
+      <span>HL MMR = </span><span>{{ data.hl_mmr_data ? data.hl_mmr_data.mmr : 0 }}</span><br>
+      <span>HL MMR Tier = </span><span>{{ data.hl_mmr_data ? data.hl_mmr_data.rank_tier : "" }}</span><br>
+
+      <span>TL MMR = </span><span>{{ data.tl_mmr_data ? data.tl_mmr_data.mmr : 0 }}</span><br>
+      <span>TL MMR Tier = </span><span>{{ data.tl_mmr_data ? data.tl_mmr_data.rank_tier : "" }}</span><br>
+
+      <span>SL MMR = </span><span>{{ data.sl_mmr_data ? data.sl_mmr_data.mmr : 0 }}</span><br>
+      <span>SL MMR Tier = </span><span>{{ data.sl_mmr_data ? data.sl_mmr_data.rank_tier : "" }}</span><br>
+
+      <span>AR MMR = </span><span>{{ data.ar_mmr_data ? data.ar_mmr_data.mmr : 0 }}</span><br>
+      <span>AR MMR Tier = </span><span>{{ data.ar_mmr_data ? data.ar_mmr_data.rank_tier : "" }}</span><br>
+
+
+      <line-chart v-if="seasonWinRateDataArray" :data="seasonWinRateDataArray"></line-chart>
+
+
+      <div>
+        <h1>Heroes played on {{ role }}</h1>
+
+
+        <group-box :text="'Most Played'" :data="data.hero_data_top_played.slice(0, 3)"></group-box>
+        <group-box :text="'Highest Win Rate'" :data="data.hero_data_top_win_rate.slice(0, 3)"></group-box>
+
+        <div class="flex flex-wrap gap-1">
+          <template v-for="(item, index) in data.hero_data_all_heroes">
+            <round-box-small :hero="item.hero"></round-box-small>
+          </template>
+        </div>
+
+
+      </div>
+      <div>
+        <div v-if="data && data.latestGames">
+          <h1>Most Recent matches</h1>
+
+          <template v-for="(item, index) in data.latestGames">
+            <div>{{ item.game_map.name }} | {{ item.game_type.name }} | {{ item.game_date }}</div>
+            <game-summary-box :data="item"></game-summary-box>
+          </template>
+        </div>
+
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'PlayerRoleSingleStats',
+    components: {
+    },
+    props: {
+      filters: Object,
+      role: String,
+      battletag: String,
+      blizzid: {
+        type: [String, Number]
+      },
+      region: Number,
+      regions: Object,
+    },
+    data(){
+      return {
+        inputrole: null,
+        gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+        data: null,
+      }
+    },
+    created(){
+      this.inputrole = this.hero;
+    },
+    mounted() {
+      this.getData();
+    },
+    computed: {
+      seasonWinRateDataArray() {
+        return this.data && this.data.season_win_rate_data ? Object.values(this.data.season_win_rate_data) : null;
+      }
+    },
+    watch: {
+    },
+    methods: {
+      async getData(type){
+        try{
+          const response = await this.$axios.post("/api/v1/player/heroes/single", {
+            blizz_id: this.blizzid,
+            region: this.region,
+            game_type: this.gametype,
+            type: "single",
+            page: "role",
+            role: this.role,
+          });
+
+          this.data = response.data[0];
+        }catch(error){
+          console.log(error);
+        }
+      },
+      getRegionName(regionID){
+        return this.regions[regionID];
+      },
+      handleInputChange(eventPayload) {
+        if (eventPayload.field === "Heroes") {
+          this.inputhero = eventPayload.value;
+
+        //Might have to url encode this...who knows
+          history.pushState(null, null, this.heroname);
+        }
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/resources/js/components/Player/Roles/PlayerRolesAllStats.vue b/resources/js/components/Player/Roles/PlayerRolesAllStats.vue
new file mode 100644
index 00000000..fe566032
--- /dev/null
+++ b/resources/js/components/Player/Roles/PlayerRolesAllStats.vue
@@ -0,0 +1,294 @@
+<template>
+  <div>
+    All Heroes
+    as played by
+    <span><a :href="`/Player/${battletag}/${blizzid}/${region}`" target="_blank">{{ battletag }}</a></span>
+
+    <infobox :input="infoText"></infobox>
+
+    <filters 
+      :onFilter="filterData" 
+      :filters="filters" 
+      :gametypedefault="gametype"
+      :minimumgamesdefault="'0'"
+      :includehero="true"
+      :includerole="true"
+      :includegametypefull="true"
+      :includeseason="true"
+      :includeminimumgames="true"
+
+      >
+    </filters>
+
+    <div>
+      <input type="text" v-model="searchQuery" placeholder="Search..." />
+
+     <div v-for="(stat, index) in filteredStats" :key="index" class="flex items-center">
+        <input type="checkbox" v-model="stat.selected" :disabled="isDisabled(stat)" @change="onCheckboxChange(stat)" />
+        <label>{{ stat.name }}</label>
+      </div>
+    </div>
+
+    <div>
+      <table class="min-w-full bg-white">
+        <thead>
+          <tr>
+            <th @click="sortTable('name')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              Role
+            </th>    
+            <th @click="sortTable('win_rate')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              Games
+            </th>
+            <th @click="sortTable('kda')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              KDA
+            </th>  
+            <th @click="sortTable('kdr')" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+              KDR
+            </th>
+            <template   v-for="stat in stats">
+              <th  v-if="stat.selected" @click="sortTable(stat.value)" class="py-2 px-3 border-b border-gray-200 text-left text-sm leading-4 text-gray-500 tracking-wider cursor-pointer">
+                {{ stat.name }}
+              </th>
+            </template> 
+         
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="row in sortedData" :key="row.id">
+            <td class="py-2 px-3 border-b border-gray-200"><a :href="getPlayerRolePageUrl(row.name)"><role-box :role="row.name"></role-box>{{ row.name }}</a></td>
+            <td class="py-2 px-3 border-b border-gray-200">{{ row.wins }}|{{ row.losses }} {{ row.win_rate }} %</td>
+            <td class="py-2 px-3 border-b border-gray-200">{{ row.kda }} <br>{{ row.avg_kills }}/{{ row.avg_deaths }}/{{ row.avg_assists }}</td>
+            <td class="py-2 px-3 border-b border-gray-200">{{ row.kdr }} <br>{{ row.avg_kills }}/{{ row.avg_deaths }}</td>
+            
+            <template v-for="stat in stats" >
+              <td 
+                v-if="stat.selected" 
+                :class="{ flash: stat.flash }"
+                class="py-2 px-3 border-b border-gray-200">
+                {{ row[stat.value] }}
+              </td>
+            </template>
+
+    
+          </tr>
+        </tbody>
+      </table>
+
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PlayerRolesAllStats',
+  components: {
+  },
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    battletag: String,
+    blizzid: String, 
+    region: String,
+  },
+  data(){
+    return {
+      infoText: "Select a hero below to view detailed stats for that hero. Use the search box above to filter the list of heroes. Or scroll down to the advanced section for table view.",
+      gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+      data: null,
+      sortKey: '',
+      sortDir: 'asc',
+      role: null,
+      hero: null,
+      minimumgames: 0,
+      searchQuery: '',
+      stats: [
+        { name: "Avg Assists", value: 'avg_assists', selected: false, flash: false},
+        { name: "Avg Clutch Heals", value: 'avg_clutch_heals', selected: false, flash: false},
+        { name: "Avg Creep Damage", value: 'avg_creep_damage', selected: false, flash: false},
+        { name: "Avg Damage Taken", value: 'avg_damage_taken', selected: false, flash: false},
+        { name: "Avg Deaths", value: 'avg_deaths', selected: false, flash: false},
+        { name: "Avg Escapes", value: 'avg_escapes', selected: false, flash: false},
+        { name: "Avg Experience Contribution", value: 'avg_experience_contribution', selected: false, flash: false},
+        { name: "Avg First to Ten", value: 'avg_first_to_ten', selected: false, flash: false},
+        { name: "Avg Healing", value: 'avg_healing', selected: false, flash: false},
+        { name: "Avg Hero Damage", value: 'avg_hero_damage', selected: true, flash: false},
+        { name: "Avg Highest Kill Streak", value: 'avg_highest_kill_streak', selected: false, flash: false},
+        { name: "Avg Kills", value: 'avg_kills', selected: true, flash: false},
+        { name: "Avg Merc Camp Captures", value: 'avg_merc_camp_captures', selected: false, flash: false},
+        { name: "Avg Minion Damage", value: 'avg_minion_damage', selected: false, flash: false},
+        { name: "Avg Multikill", value: 'avg_multikill', selected: false, flash: false},
+        { name: "Avg Outnumbered Deaths", value: 'avg_outnumbered_deaths', selected: false, flash: false},
+        { name: "Avg Physical Damage", value: 'avg_physical_damage', selected: false, flash: false},
+        { name: "Avg Protection Allies", value: 'avg_protection_allies', selected: false, flash: false},
+        { name: "Avg Regen Globes", value: 'avg_regen_globes', selected: false, flash: false},
+        { name: "Avg Rooting Enemies", value: 'avg_rooting_enemies', selected: false, flash: false},
+        { name: "Avg Self Healing", value: 'avg_self_healing', selected: false, flash: false},
+        { name: "Avg Siege Damage", value: 'avg_siege_damage', selected: true, flash: false},
+        { name: "Avg Silencing Enemies", value: 'avg_silencing_enemies', selected: false, flash: false},
+        { name: "Avg Spell Damage", value: 'avg_spell_damage', selected: false, flash: false},
+        { name: "Avg Structure Damage", value: 'avg_structure_damage', selected: false, flash: false},
+        { name: "Avg Stunning Enemies", value: 'avg_stunning_enemies', selected: false, flash: false},
+        { name: "Avg Summon Damage", value: 'avg_summon_damage', selected: false, flash: false},
+        { name: "Avg Takedowns", value: 'avg_takedowns', selected: false, flash: false},
+        { name: "Avg Teamfight Damage Taken", value: 'avg_teamfight_damage_taken', selected: false, flash: false},
+        { name: "Avg Teamfight Escapes", value: 'avg_teamfight_escapes', selected: false, flash: false},
+        { name: "Avg Teamfight Escapes", value: 'avg_teamfight_escapes', selected: false, flash: false},
+        { name: "Avg Teamfight Healing", value: 'avg_teamfight_healing', selected: false, flash: false},
+        { name: "Avg Teamfight Hero Damage", value: 'avg_teamfight_hero_damage', selected: false, flash: false},
+        { name: "Avg Time CC Enemy Heroes", value: 'avg_time_cc_enemy_heroes', selected: false, flash: false},
+        { name: "Avg Time on Fire", value: 'avg_time_on_fire', selected: false, flash: false},
+        { name: "Avg Time Spent Dead", value: 'avg_time_spent_dead', selected: false, flash: false},
+        { name: "Avg Town Kills", value: 'avg_town_kills', selected: false, flash: false},
+        { name: "Avg Vengeance", value: 'avg_vengeance', selected: false, flash: false},
+        { name: "Avg Watch Tower Captures", value: 'avg_watch_tower_captures', selected: false, flash: false},
+        { name: "Avg Total Healing", value: 'combined_healing', selected: true, flash: false},
+        { name: "Hero", value: 'hero', selected: false, flash: false},
+        { name: "KDA", value: 'kda', selected: false, flash: false},
+        { name: "KDR", value: 'kdr', selected: false, flash: false},
+        { name: "Losses", value: 'losses', selected: false, flash: false},
+        { name: "Max Assists", value: 'max_assists', selected: false, flash: false},
+        { name: "Max Clutch Heals", value: 'max_clutch_heals', selected: false, flash: false},
+        { name: "Max Creep Damage", value: 'max_creep_damage', selected: false, flash: false},
+        { name: "Max Damage Taken", value: 'max_damage_taken', selected: false, flash: false},
+        { name: "Max Deaths", value: 'max_deaths', selected: false, flash: false},
+        { name: "Max Escapes", value: 'max_escapes', selected: false, flash: false},
+        { name: "Max Experience Contribution", value: 'max_experience_contribution', selected: false, flash: false},
+        { name: "Max First to Ten", value: 'max_first_to_ten', selected: false, flash: false},
+        { name: "Max Healing", value: 'max_healing', selected: false, flash: false},
+        { name: "Max Hero Damage", value: 'max_hero_damage', selected: false, flash: false},
+        { name: "Max Highest Kill Streak", value: 'max_highest_kill_streak', selected: false, flash: false},
+        { name: "Max Kills", value: 'max_kills', selected: false, flash: false},
+        { name: "Max Merc Camp Captures", value: 'max_merc_camp_captures', selected: false, flash: false},
+        { name: "Max Minion Damage", value: 'max_minion_damage', selected: false, flash: false},
+        { name: "Max Multikill", value: 'max_multikill', selected: false, flash: false},
+        { name: "Max Outnumbered Deaths", value: 'max_outnumbered_deaths', selected: false, flash: false},
+        { name: "Max Physical Damage", value: 'max_physical_damage', selected: false, flash: false},
+        { name: "Max Protection Allies", value: 'max_protection_allies', selected: false, flash: false},
+        { name: "Max Regen Globes", value: 'max_regen_globes', selected: false, flash: false},
+        { name: "Max Rooting Enemies", value: 'max_rooting_enemies', selected: false, flash: false},
+        { name: "Max Self Healing", value: 'max_self_healing', selected: false, flash: false},
+        { name: "Max Siege Damage", value: 'max_siege_damage', selected: false, flash: false},
+        { name: "Max Silencing Enemies", value: 'max_silencing_enemies', selected: false, flash: false},
+        { name: "Max Spell Damage", value: 'max_spell_damage', selected: false, flash: false},
+        { name: "Max Structure Damage", value: 'max_structure_damage', selected: false, flash: false},
+        { name: "Max Stunning Enemies", value: 'max_stunning_enemies', selected: false, flash: false},
+        { name: "Max Summon Damage", value: 'max_summon_damage', selected: false, flash: false},
+        { name: "Max Takedowns", value: 'max_takedowns', selected: false, flash: false},
+        { name: "Max Teamfight Damage Taken", value: 'max_teamfight_damage_taken', selected: false, flash: false},
+        { name: "Max Teamfight Escapes", value: 'max_teamfight_escapes', selected: false, flash: false},
+        { name: "Max Teamfight Healing", value: 'max_teamfight_healing', selected: false, flash: false},
+        { name: "Max Teamfight Hero Damage", value: 'max_teamfight_hero_damage', selected: false, flash: false},
+        { name: "Max Time CC Enemy Heroes", value: 'max_time_cc_enemy_heroes', selected: false, flash: false},
+        { name: "Max Time on Fire", value: 'max_time_on_fire', selected: false, flash: false},
+        { name: "Max Time Spent Dead", value: 'max_time_spent_dead', selected: false, flash: false},
+        { name: "Max Town Kills", value: 'max_town_kills', selected: false, flash: false},
+        { name: "Max Vengeance", value: 'max_vengeance', selected: false, flash: false},
+        { name: "Max Watch Tower Captures", value: 'max_watch_tower_captures', selected: false, flash: false},
+        { name: "Wins", value: 'wins', selected: false, flash: false},
+
+      ],
+    }
+  },
+  created(){
+  },
+  mounted() {
+    this.getData();
+  },
+  computed: {
+    filteredStats() {
+      return this.stats.filter(stat => stat.name.toLowerCase().includes(this.searchQuery.toLowerCase()));
+    },
+    selectedStatsCount() {
+      return this.stats.filter(stat => stat.selected).length;
+    },
+    sortedData() {
+      if (!this.sortKey) return this.data;
+      return this.data.slice().sort((a, b) => {
+        const valA = a[this.sortKey];
+        const valB = b[this.sortKey];
+        if (this.sortDir === 'asc') {
+          return valA < valB ? -1 : 1;
+        } else {
+          return valA > valB ? -1 : 1;
+        }
+      });
+    },
+  },
+  watch: {
+  },
+  methods: {
+    async getData(type){
+      try{
+        const response = await this.$axios.post("/api/v1/player/roles/all", {
+          blizz_id: this.blizzid,
+          region: this.region,
+          game_type: this.gametype,
+          hero: this.hero,
+          role: this.role,
+          minimumgames: this.minimumgames,
+          type: "all",
+          page: "role",
+        });
+
+        this.data = response.data;
+        console.log(this.data);
+      }catch(error){
+        console.log(error);
+      }
+    },
+    filterData(filteredData){
+      this.gametype = filteredData.multi["Game Type"] ? Array.from(filteredData.multi["Game Type"]) : this.gametype;
+      this.role = filteredData.single["Role"] ? filteredData.single["Role"] : null;
+      this.hero = filteredData.single.Heroes ? filteredData.single.Heroes : null;
+      this.minimumgames = filteredData.single["Minimum Games"] ? filteredData.single["Minimum Games"] : 0;
+      this.data = [];
+      this.sortKey = '';
+      this.sortDir ='asc';
+      this.getData();
+    },
+    sortTable(key) {
+      if (key === this.sortKey) {
+        this.sortDir = this.sortDir === 'asc' ? 'desc' : 'asc';
+      } else {
+        this.sortDir = 'asc';
+      }
+      this.sortKey = key;
+    },
+    showGameTypeColumn(game_type){
+      return this.gametype.includes(game_type);
+    },
+    getPlayerRolePageUrl(role){
+      return "/Player/" + this.battletag + "/" + this.blizzid + "/" + this.region + "/" + "Role/" + role;
+    },
+    isDisabled(stat) {
+      return this.selectedStatsCount >= 15 && !stat.selected;
+    },
+    onCheckboxChange(inputStat) {
+      inputStat.flash = true;
+      setTimeout(() => {
+            inputStat.flash = false;
+          }, 1000);
+    },
+  }
+}
+</script>
+
+<style>
+.flash-animation {
+  animation: flash 0.5s;
+}
+
+@keyframes flash {
+  0% { background-color: transparent; }
+  50% { background-color: blue; }
+  100% { background-color: transparent; }
+}
+
+.flash {
+  animation: flash 1s;
+}
+</style>
\ No newline at end of file
diff --git a/resources/js/components/RoundBoxSmall.vue b/resources/js/components/RoundBoxSmall.vue
new file mode 100644
index 00000000..6cf0e34b
--- /dev/null
+++ b/resources/js/components/RoundBoxSmall.vue
@@ -0,0 +1,87 @@
+<template>
+  <div v-if="this.thisObj" class="relative group flex items-center " @mouseover="showTooltip = true" @mouseleave="showTooltip = false">
+    <img :class="[
+      'card-img-top relative hover:opacity-75  rounded-full',  
+      { 
+        block: size === 'big', 
+        'w-20': size === 'big', 
+        'h-20': size === 'big',
+        'w-10': size != 'big', 
+        'h-10': size != 'big', 
+        
+      }
+      ]"   :src="getImage()" :alt="this.thisObj.name" >
+    <div v-if=" showTooltip" class="absolute hidden bottom-11 -left-24  bg-gray-dark  text-s p-1  group-hover:block  text-white z-50 drop-shadow-md w-60 rounded-md px-2 text-center">
+      {{ this.thisObj.name }}
+    </div>
+   
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RoundBoxSmall',
+  components: {
+  },
+  props: {
+    obj: Object,
+    hero: Object,
+    map: Object,
+    hovertext: String,
+    type: String,
+    includehover: Boolean,
+    popuptext: String,
+    size: String
+  },
+  data(){
+    return {
+      showTooltip: false,
+      staticClasses: ""
+      
+    }
+  },
+  created(){
+    
+    
+  },
+  mounted() {
+    
+      
+      
+
+    
+  },
+  computed: {
+    thisObj(){
+      
+      if(typeof this.hero != 'undefined'){
+
+        return this.hero;
+      }
+      if(typeof this.map != 'undefined'){
+       
+        return this.map;
+      }
+      else{
+        return this.obj;
+      }
+    }
+  },
+  watch: {
+  },
+  methods: {
+    getImage(){
+     console.log(this);
+      if(typeof this.thisObj.sanitized_map_name != 'undefined')
+      {
+        console.log('map image');
+        return `/images/maps/icon/bg_${this.thisObj.sanitized_map_name}.jpg`;
+      }
+      else{
+        return `/images/heroes/${this.thisObj.short_name}.png`;
+      }
+      
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/resources/js/components/SearchComponent.vue b/resources/js/components/SearchComponent.vue
index 4b2c3fa5..12c63d2c 100644
--- a/resources/js/components/SearchComponent.vue
+++ b/resources/js/components/SearchComponent.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="flex items-center mb-3">
       <input type="text" class="form-control search-input mr-3" :placeholder="labelText" :aria-label="labelText" aria-describedby="basic-addon2" v-model="userinput" @keyup.enter="clickedButton">
-      <button class="btn btn-outline-secondary" type="button" @click="clickedButton">{{ buttonText }}</button>
+      <button v-if="buttonText" class="btn btn-outline-secondary" type="button" @click="clickedButton">{{ buttonText }}</button>
     </div>
   </div>
 </template>
diff --git a/resources/js/components/StatBarBox.vue b/resources/js/components/StatBarBox.vue
new file mode 100644
index 00000000..d181a0f4
--- /dev/null
+++ b/resources/js/components/StatBarBox.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="w-auto inline-block m-1 text-center min-w-[5em]">
+       <h2 class="rounded  px-2 py-1 text-sm text-center uppercase"> {{ title }}</h2>
+    
+    <div class=" bg-gray-light  rounded rounded-l-lg w-[10em]">
+      <div class="stat-bar bg-blue rounded-l border-r-2 border-black" :style="{ width: this.value +'%' }">
+        {{ value }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'StatBarBox',
+  components: {
+  },
+  props: {
+    title: String,
+    value: {
+      type: [String, Number]
+    },
+  },
+  data(){
+    return {
+    }
+  },
+  created(){
+  },
+  mounted() {
+  },
+  computed: {
+    barWidth(){
+      return "w-[${this.value}%]"
+
+    }
+  },
+  watch: {
+  },
+  methods: {
+  }
+}
+</script>
\ No newline at end of file
diff --git a/resources/js/components/StatBox.vue b/resources/js/components/StatBox.vue
index ce365f15..f941ff9d 100644
--- a/resources/js/components/StatBox.vue
+++ b/resources/js/components/StatBox.vue
@@ -1,9 +1,8 @@
 <template>
-  <div class="bg-blue p-4">
-    <div class="text-center font-bold text-white mb-2">
-      {{ title }}
-    </div>
-    <div class="text-center text-white border border-gray-400 p-2 rounded">
+  <div class="w-auto inline-block m-1 text-center min-w-[5em]">
+       <h2 class="bg-gray-light rounded-t text-blue px-2 py-1 text-sm text-center uppercase"> {{ title }}</h2>
+    
+    <div class=" bg-blue p-1 rounded-b text-center">
       {{ value }}
     </div>
   </div>
diff --git a/resources/js/components/TalentBox.vue b/resources/js/components/TalentBox.vue
index 45d91b76..590780c4 100644
--- a/resources/js/components/TalentBox.vue
+++ b/resources/js/components/TalentBox.vue
@@ -1,9 +1,13 @@
 <template>
-  <div class="card" style="width: 18rem;">
-    <img class="card-img-top" :src="getTalentImage()" :alt="talent.name">
-    {{ talent.name }}
-    {{ this.removeNumbers(talent.hotkey) }}
-    {{ talent.description }}
+  <div  class="relative group flex items-center mt-auto mb-auto " @mouseover="showTooltip = true" @mouseleave="showTooltip = false">
+    <img class="card-img-top relative hover:opacity-75 w-10 h-10 rounded-full" :src="getTalentImage()" :alt="talent.name">
+
+     <div v-if="showTooltip" class="absolute hidden bottom-11 -left-24  bg-gray-dark  text-xs p-1  group-hover:block  text-white z-50 drop-shadow-md w-60 rounded-md px-2 text-center">
+      <h2>{{ talent.title }}</h2>
+      <p>{{ this.removeNumbers(talent.hotkey) }}</p>
+      <p>{{ talent.description }}</p>
+    </div>
+    
   </div>
 </template>
 
@@ -13,15 +17,19 @@ export default {
   components: {
   },
   props: {
-    talent: Object
+
+    talent: Object,
   },
   data(){
     return {
+       showTooltip: false,
     }
   },
-  created(){
+ created(){
+  
   },
   mounted() {
+   
   },
   computed: {
   },
diff --git a/resources/views/Player/Maps/allMapData.blade.php b/resources/views/Player/Maps/allMapData.blade.php
new file mode 100644
index 00000000..30a334ae
--- /dev/null
+++ b/resources/views/Player/Maps/allMapData.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.app')
+@section('title', 'Heroes Profile')
+@section('meta_keywords', '')
+@section('meta_description', '')
+
+@section('content')
+  <player-maps-all-stats :filters="{{ json_encode($filters) }}" :battletag="{{ json_encode($battletag) }}" :blizzid="{{ json_encode($blizz_id) }}" :region="{{ json_encode($region) }}"></player-maps-all-stats>
+@endsection
diff --git a/resources/views/Player/Maps/singleMapData.blade.php b/resources/views/Player/Maps/singleMapData.blade.php
new file mode 100644
index 00000000..3adb6aee
--- /dev/null
+++ b/resources/views/Player/Maps/singleMapData.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.app')
+@section('title', 'Heroes Profile')
+@section('meta_keywords', '')
+@section('meta_description', '')
+
+@section('content')
+  <player-map-single-stats :filters="{{ json_encode($filters) }}" :battletag="{{ json_encode($battletag) }}" :blizzid="{{ json_encode($blizz_id) }}" :region="{{ $region }}" :map="{{ json_encode($map) }}" :regions="{{ json_encode($regions) }}"></player-map-single-stats>
+@endsection
diff --git a/resources/views/Player/Roles/allRoleData.blade.php b/resources/views/Player/Roles/allRoleData.blade.php
new file mode 100644
index 00000000..9023ae6e
--- /dev/null
+++ b/resources/views/Player/Roles/allRoleData.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.app')
+@section('title', 'Heroes Profile')
+@section('meta_keywords', '')
+@section('meta_description', '')
+
+@section('content')
+  <player-roles-all-stats :filters="{{ json_encode($filters) }}" :battletag="{{ json_encode($battletag) }}" :blizzid="{{ json_encode($blizz_id) }}" :region="{{ json_encode($region) }}"></player-roles-all-stats>
+@endsection
diff --git a/resources/views/Player/Roles/singleRoleData.blade.php b/resources/views/Player/Roles/singleRoleData.blade.php
new file mode 100644
index 00000000..8cf90f18
--- /dev/null
+++ b/resources/views/Player/Roles/singleRoleData.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.app')
+@section('title', 'Heroes Profile')
+@section('meta_keywords', '')
+@section('meta_description', '')
+
+@section('content')
+  <player-role-single-stats :filters="{{ json_encode($filters) }}" :battletag="{{ json_encode($battletag) }}" :blizzid="{{ json_encode($blizz_id) }}" :region="{{ $region }}" :role="{{ json_encode($role) }}" :regions="{{ json_encode($regions) }}"></player-role-single-stats>
+@endsection
diff --git a/resources/views/Player/matchupData.blade.php b/resources/views/Player/matchupData.blade.php
new file mode 100644
index 00000000..370c48de
--- /dev/null
+++ b/resources/views/Player/matchupData.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.app')
+@section('title', 'Heroes Profile')
+@section('meta_keywords', '')
+@section('meta_description', '')
+
+@section('content')
+  <player-matchup :filters="{{ json_encode($filters) }}" :battletag="{{ json_encode($battletag) }}" :blizzid="{{ json_encode($blizz_id) }}" :region="{{ json_encode($region) }}"></player-matchup>
+@endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index b7c13e7a..4c5d8a0f 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -18,8 +18,12 @@
 </head>
 <body class="bg-black text-white">
   <div id="app">
-    <main-nav :is-authenticated="{{ json_encode(Auth::check()) }}" :main-search-account="{{ json_encode($main_search_account) }}" :alt-search-account1="{{ json_encode($alt_search_account1) }}" :alt-search-account2="{{ json_encode($alt_search_account2) }}" :alt-search-account3="{{ json_encode($alt_search_account3) }}" ></main-nav>
-    <main >
+
+      @include('nav', [
+          'isAuthenticated' => Auth::check(),
+          'mainSearchAccount' => $main_search_account,
+          'altSearchAccounts' => [$alt_search_account1, $alt_search_account2, $alt_search_account3],
+      ])
       @yield('content')
     </main>
 
diff --git a/resources/views/nav.blade.php b/resources/views/nav.blade.php
new file mode 100644
index 00000000..4c21d66b
--- /dev/null
+++ b/resources/views/nav.blade.php
@@ -0,0 +1,109 @@
+
+<nav class="bg-gray-dark text-white p-4 z-50 relative">
+    <div class="flex justify-between items-center space-x-5 flex-wrap md:flex-nowrap">
+        <a class="text-blue-600 hover:text-blue-800 flex items-center font-logo text-2xl" href="/">
+            Heroes
+            <img class="w-10 mx-2" src="/images/logo/heroesprofilelogo.png" alt="Heroes Profile Logo" />
+            Profile
+        </a>
+        <div class="flex items-center space-x-4 flex-wrap md:flex-row">
+          <div class="flex items-center space-x-4 flex-wrap md:flex-row">
+              <div class="relative group inline-block z-50 ">
+                <a class="text-blue-600 hover:text-blue-800 cursor-pointer">Global Hero Stats</a>
+                <div class="absolute left-0  hidden   group group-hover:block hover:block z-50 pt-5">
+                  <div class="bg-blue border border-gray-300 rounded-md">
+                    <a href="/Global/Hero" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Hero Stats</a>
+                    <a href="/Global/Talents" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Talent Stats</a>
+                    <a href="/Global/Hero/Maps" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Map Stats</a>
+                    <a href="/Global/Matchups" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Matchup Stats</a>
+                    <a href="/Global/Matchups/Talents" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Matchup Talent Stats</a>
+                    <a href="/Global/Compositions" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Compositional Stats</a>
+                    <a href="/Global/Draft/General" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Draft Stats</a>
+                    <a href="/Global/Party" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Party Stats</a>
+                    <a href="/Global/Extra" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Extra Stats</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <a class="text-blue-600 hover:text-blue-800" href="/Global/Leaderboard">Leaderboards</a>
+    <div class="relative group inline-block">
+        <a class="text-blue-600 hover:text-blue-800 cursor-pointer">Tools</a>
+        <div class="absolute left-0  hidden   group group-hover:block hover:block z-50 pt-5">
+          <div class="bg-blue border border-gray-300 rounded-md">
+            <a href="/" class="block px-4 py-2 text-gray-400 hover:bg-gray-200 cursor-not-allowed pointer-events-none">Talent Builder</a>
+            <a href="/Compare" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Compare</a>
+            <a href="https://drafter.heroesprofile.com/Drafter" target="_blank" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Drafter</a>
+            <a href="https://dev.heroesprofile.com/" target="_blank" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Game Data</a>
+            <a href="https://api.heroesprofile.com/upload" target="_blank" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Replay Uploader</a>
+            <a href="/" class="block px-4 py-2 text-gray-400 hover:bg-gray-200 cursor-not-allowed pointer-events-none">Activity Graphs</a>
+            <a href="/" class="block px-4 py-2 text-gray-400 hover:bg-gray-200 cursor-not-allowed pointer-events-none">Auto Battler</a>
+        </div>
+    </div>
+</div>
+<div class="relative group inline-block">
+    <a class="text-blue-600 hover:text-blue-800 cursor-pointer">
+        @if(isset($mainSearchAccount))
+        {{ $mainSearchAccount['battletag'] }}
+        @endif
+    </a>
+    @if(isset($mainSearchAccount))
+    <div class="absolute left-0 hidden group-hover:block hover:block z-50 pt-5 bg-blue border border-gray-300 rounded-md">
+        <a href="/Player/{{ $mainSearchAccount['battletag'] }}/{{ $mainSearchAccount['blizz_id'] }}/{{ $mainSearchAccount['region'] }}" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Profile</a>
+        <a href="/Player/{{ $mainSearchAccount['battletag'] }}/{{ $mainSearchAccount['blizz_id'] }}/{{ $mainSearchAccount['region'] }}/FriendFoe" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Friends and Foes</a>
+        <a href="/Player/{{ $mainSearchAccount['battletag'] }}/{{ $mainSearchAccount['blizz_id'] }}/{{ $mainSearchAccount['region'] }}/Hero/" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Heroes</a>
+        <a href="/Player/{{ $mainSearchAccount['battletag'] }}/{{ $mainSearchAccount['blizz_id'] }}/{{ $mainSearchAccount['region'] }}/Role/" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Roles</a>
+        <a href="/Player/{{ $mainSearchAccount['battletag'] }}/{{ $mainSearchAccount['blizz_id'] }}/{{ $mainSearchAccount['region'] }}/Map" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Maps</a>
+        <a href="/Player/{{ $mainSearchAccount['battletag'] }}/{{ $mainSearchAccount['blizz_id'] }}/{{ $mainSearchAccount['region'] }}/Matchups" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Matchups</a>
+    </div>
+    @endif
+</div>
+
+</div>
+
+<!-- I dont know why this isnt working, it used to -->
+    <search-component :type="'alt'"  :buttonText="'Find Player'"  :labelText="'Enter a battletag'"></search-component>
+
+
+
+<div class="flex space-x-4">
+    <custom-button :href="'https://api.heroesprofile.com/Api'" :targetblank="true" :text="'API'" :alt="'API'"  :size="'small'" :color="'teal'"></custom-button>
+    <custom-button :href="'https://api.heroesprofile.com/upload'" :targetblank="true" :text="'Replay Uploader'" :alt="'Replay Uploader'"  :size="'small'" :color="'blue'"></custom-button>
+    <custom-button :href="'https://www.patreon.com/heroesprofile'" :targetblank="true" :text="'Patreon'" :alt="'Patreon'"  :size="'small'" :color="'red'"></custom-button>
+</div>
+@if($isAuthenticated)
+<div class="relative group inline-block">
+    <div class="flex items-center cursor-pointer mr-5">
+        <img 
+        class="card-img-top relative hover:opacity-75 w-12 h-12 rounded-full" 
+        src="/images/heroes/auto_select.jpg" 
+        alt="Settings">
+    </div>
+    <div class="absolute right-0 mt-2 hidden group-hover:block z-50 bg-blue border border-gray-300 rounded-md">
+        <a href="/Profile/Settings" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Settings</a>
+        <a href="/Battlenet/Logout" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Logout</a>
+    </div>
+</div>
+@else
+<a href="/Authenticate/Battlenet" class="bg-teal-500 px-4 py-2 rounded text-white hover:bg-teal-700">Login</a>
+@endif
+</nav>
+
+
+<nav class="flex justify-start">
+    @foreach($altSearchAccounts as $index => $account)
+    @if($account)
+    <div class="relative group inline-block ml-4 pr-2">
+        <a class="text-blue-600 hover:text-blue-800 cursor-pointer">{{ $account['battletag'] }}</a>
+        <div class="absolute right-0 mt-2 hidden group-hover:block z-50 bg-blue border border-gray-300 rounded-md">
+            <a href="/Player/{{ $account['battletag'] }}/{{ $account['blizz_id'] }}/{{ $account['region'] }}" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Profile</a>
+            <a href="/Player/{{ $account['battletag'] }}/{{ $account['blizz_id'] }}/{{ $account['region'] }}/FriendFoe" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Friends and Foes</a>
+            <a href="/Player/{{ $account['battletag'] }}/{{ $account['blizz_id'] }}/{{ $account['region'] }}/Hero/" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Heroes</a>
+            <a href="/Player/{{ $account['battletag'] }}/{{ $account['blizz_id'] }}/{{ $account['region'] }}/Role/" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Roles</a>
+            <a href="/Player/{{ $account['battletag'] }}/{{ $account['blizz_id'] }}/{{ $account['region'] }}/Map" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Maps</a>
+            <a href="/Player/{{ $account['battletag'] }}/{{ $account['blizz_id'] }}/{{ $account['region'] }}/Matchups" class="block px-4 py-2 text-blue-600 hover:bg-gray-200">Matchups</a>
+        </div>
+    </div>
+    @endif
+    @endforeach
+</nav>
+
diff --git a/routes/api.php b/routes/api.php
index 82b194a0..1dddb710 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -17,6 +17,8 @@
 use App\Http\Controllers\Player\PlayerController;
 use App\Http\Controllers\Player\FriendFoeController;
 use App\Http\Controllers\Player\PlayerHeroesController;
+use App\Http\Controllers\Player\PlayerMatchupsController;
+use App\Http\Controllers\Player\PlayerHeroesMapsRolesController;
 
 
 
@@ -92,10 +94,27 @@
     Route::get('player/friendfoe', [FriendFoeController::class, 'getFriendFoeData']); //testing
     Route::post('player/friendfoe', [FriendFoeController::class, 'getFriendFoeData']);
 
-    Route::get('player/heroes/all', [PlayerHeroesController::class, 'getHeroData']); //testing
-    Route::post('player/heroes/all', [PlayerHeroesController::class, 'getHeroData']);
 
-    Route::get('player/heroes/single', [PlayerHeroesController::class, 'getHeroData']); //testing
-    Route::post('player/heroes/single', [PlayerHeroesController::class, 'getHeroData']);
+
+    Route::get('player/matchups', [PlayerMatchupsController::class, 'getMatchupData']); //testing
+    Route::post('player/matchups', [PlayerMatchupsController::class, 'getMatchupData']);
+
+
+
+    Route::get('player/heroes/all', [PlayerHeroesMapsRolesController::class, 'getData']); //testing
+    Route::post('player/heroes/all', [PlayerHeroesMapsRolesController::class, 'getData']);
+
+    Route::get('player/heroes/single', [PlayerHeroesMapsRolesController::class, 'getData']); //testing
+    Route::post('player/heroes/single', [PlayerHeroesMapsRolesController::class, 'getData']);
+
+    Route::get('player/roles/all/', [PlayerHeroesMapsRolesController::class, 'getData']); //testing
+    Route::post('player/roles/all/', [PlayerHeroesMapsRolesController::class, 'getData']);
+
+
+    Route::get('player/maps/all/', [PlayerHeroesMapsRolesController::class, 'getData']); //testing
+    Route::post('player/maps/all/', [PlayerHeroesMapsRolesController::class, 'getData']);
+
+    Route::get('player/maps/single', [PlayerHeroesMapsRolesController::class, 'getData']); //testing
+    Route::post('player/maps/single', [PlayerHeroesMapsRolesController::class, 'getData']);
 
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index b399a863..b466ac24 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -5,17 +5,12 @@
 use App\Http\Controllers\Auth\BattleNetController;
 use App\Http\Controllers\Auth\PatreonController;
 use App\Http\Controllers\ProfileController;
-use App\Http\Controllers\Player\PlayerController;
-use App\Http\Controllers\Player\FriendFoeController;
-use App\Http\Controllers\Player\PlayerHeroesController;
-use App\Http\Controllers\BattletagSearchController;
 
+use App\Http\Controllers\BattletagSearchController;
 use App\Http\Controllers\MainPageController;
 use App\Http\Controllers\GamedataController;
 use App\Http\Controllers\CompareController;
 
-
-
 use App\Http\Controllers\Global\GlobalHeroStatsController;
 use App\Http\Controllers\Global\GlobalTalentStatsController;
 use App\Http\Controllers\Global\GlobalLeaderboardController;
@@ -28,6 +23,15 @@
 use App\Http\Controllers\Global\GlobalExtraStats;
  
 
+use App\Http\Controllers\Player\PlayerController;
+use App\Http\Controllers\Player\FriendFoeController;
+use App\Http\Controllers\Player\PlayerHeroesController;
+use App\Http\Controllers\Player\PlayerMatchupsController;
+use App\Http\Controllers\Player\PlayerRolesController;
+use App\Http\Controllers\Player\PlayerMapsController;
+
+
+
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -102,20 +106,15 @@
 Route::get('Profile/Settings', [ProfileController::class, 'showSettings'])->middleware('ensureBattlenetAuth');
 
 //Player data
-Route::get('Player/FriendFoe/{battletag}/{blizz_id}/{region}', [FriendFoeController::class, 'show']);
-Route::get('Player/Hero/All/{battletag}/{blizz_id}/{region}', [PlayerHeroesController::class, 'showAll']);
-Route::get('Player/Hero/Single/{battletag}/{blizz_id}/{region}/{hero}', [PlayerHeroesController::class, 'showSingle']);
-
-
-
 Route::get('Player/{battletag}/{blizz_id}/{region}', [PlayerController::class, 'show']);
-
-
-
-
-
-
-
+Route::get('Player/{battletag}/{blizz_id}/{region}/FriendFoe', [FriendFoeController::class, 'show']);
+Route::get('Player/{battletag}/{blizz_id}/{region}/Hero', [PlayerHeroesController::class, 'showAll']);
+Route::get('Player/{battletag}/{blizz_id}/{region}/Hero/{hero}', [PlayerHeroesController::class, 'showSingle']);
+Route::get('Player/{battletag}/{blizz_id}/{region}/Matchups', [PlayerMatchupsController::class, 'show']);
+Route::get('Player/{battletag}/{blizz_id}/{region}/Role', [PlayerRolesController::class, 'showAll']);
+Route::get('Player/{battletag}/{blizz_id}/{region}/Role/{role}', [PlayerRolesController::class, 'showSingle']);
+Route::get('Player/{battletag}/{blizz_id}/{region}/Map', [PlayerMapsController::class, 'showAll']);
+Route::get('Player/{battletag}/{blizz_id}/{region}/Map/{map}', [PlayerMapsController::class, 'showSingle']);
 
 //Rewrite game data later
 Route::get('/Gamedata', [GamedataController::class, 'heroes']);