New villager (or neutral mob) that transfers xp to bottles

I'm imagining a new villager maybe one that could use the enchantment table as a workstation... this could also be a villager as a result of curing a Witch, that can bottle your xp for emeralds? It's a fairly loose concept but I imagine if it was a cured witch you might use something like a chorus fruit and a potion, or a basic food item and dragon's breath. That way the villager is only obtainable post dragon.