Refactored Lineup to have heroes