Villager Trade Rework

The rework I have in mind is currently there is no reward for trading with villagers to their max level except for the armorer for diamond armor. My idea is the more a villager is surrounded by like items of its profession (ex. Fletching villager surrounded by arrows, target blocks, etc.) it will unlock ALL possible trades. This incentive is only achieved at max level but levels increase vastly the more surrounded by like blocks/items it works with. This eliminates the need for villager trading halls whilst also making villager 'shops' a design choice to your builds. This can even have certain items like mending only being achievable by maxing a villager out so there is reward to the madness.