Linking Heroes to Population

Currently hero distribution seems to favour class over race. It would be nice if the academy only issued heros that 'belonged' within your empire; especially considering the great importance that has been given to populations in ES2. This could be determined three ways:

1. The hero's race populates one or more of the planets within one of your systems.

2. You are in at peace with or in an alliance with the hero's race

3. You are friendly or assisting the hero's race (in the case of minor factions)

Its jarring to be offered two lumaris heros and one vodyani in your first hero selection, especially when you havn't even encountered either of these races yet.

The way this would usually work is - say your playing as the sophons - you'd usually be offered two sophon heros and a harosham hero, atleast in the early game. If youve formed a peace agreement with the horatio, and your assisting the mavros, theres a chance that they may be offered to you are one of the three choices. If the Cravers have migrated to your planet, or you have taken over a craver planet, you may perhaps be offered a craver hero.. etc etc