Complete command/query cupcakes