VariantBuilder (for initial review)

Comment out if not implemented (and similar below)