command handler syntax experiments
change variant type names to not have underscore at the end