The Panda Caretaker and the Friendly Witch

The upcoming Trading Rebalance experiment has one small issue with its plan: There are no swamp or jungle villages. The only way to get these villagers' trades is to find a village that crosses over into that biome, hope a house was there, and proceed to trade. This is annoying and unintuitive. To counteract this issue, what if you could find a new exclusive villager profession in these biomes? Introducing the Panda Caretaker, exclusive to the jungle! This villager would spawn with a hut inside the bamboo forest in groups of 1-3. The hut would have a panda or multiple in a fenced area, and enough space for all the caretakers. The caretaker would trade bamboo, emeralds, cocoa beans, melon seeds, etc. The workstation could be a bamboo sprout or block. Of course, the jungle isn't the only biome with neglected villagers. The swamp deserves some similar treatment. Introducing the Friendly Witch, exclusive to the swamp! (I'm bad at names) This villager would have its workstation as a brewing stand and would trade potions, emeralds, blaze powder, potion ingredients, etc. It would live in a modified witch hut. These villagers and structures would be a great feature to fill the issue I discussed earlier and appease those begging for a jungle/swamp village. It also makes more sense for their environment, because a big jungle village on the ground would be overwhelmed easily by monsters in the canopy. This is my idea. Any thoughts?