more complete conversion, but still needs adjustments (like, use common classes/props across the various vocabs)