diff --git a/README.md b/README.md
index bd3516b..8cbadb1 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,9 @@ Set these properties within `cloak: { shopify: { ... } }` in the nuxt.config.js:
 - `url` - Your public Shopify store URL, for example: https://brand.myshopify.com or https://shop.brand.com.  Defaults to `process.env.SHOPIFY_URL`.
 - `storefront:`
   - `token` - The Storefront API token of your custom app.  Defaults to `process.env.SHOPIFY_STOREFRONT_TOKEN`.
-  - `version` - The [Storefront API version](https://shopify.dev/api/usage/versioning) to use.  Defaults to `unstable` (aka, latest).
+  - `version` - The [Storefront API version](https://shopify.dev/api/usage/versioning) to use.  Defaults to `2022-04`.
+  - `language` - A Storefront API recognized [LanguageCode](https://shopify.dev/api/storefront/2022-04/enums/LanguageCode).  Defaults to the 1st part of `process.env.CMS_SITE` if it is ISO-like (ex: if `en_US` or `en-US` then `EN`).
+  - `country` - A Storefront API recognized [CountryCode](https://shopify.dev/api/storefront/2022-04/enums/CountryCode).  Defaults to the 2nd part of `process.env.CMS_SITE` if it is ISO-like (ex: if `en_US` or `en-US` then `US`).
   - `injectClient` - Boolean for whether to inject the `$storefront` client globally.  Defaults to `true`.  You would set this to `false` when this module is a depedency of another module (like [@cloak-app/algolia](https://github.com/BKWLD/cloak-algolia)) that is creating `$storefront` a different way.
 - `mocks` - An array of objects for use with [`mockAxiosGql`](https://github.com/BKWLD/cloak-utils/blob/main/src/axios.js).
 
@@ -47,10 +49,12 @@ You can make an instance of the Storefront Axios client when outside of Nuxt (li
 
 ```js
 import { makeStorefrontClient } from '@cloak-app/shopify/factories'
-const storefront = makeStorefrontClient({
+import mergeClientHelpers from '@cloak-app/shopify/factories/merge-helpers'
+const storefront = mergeClientHelpers(makeStorefrontClient({
   url: process.env.SHOPIFY_URL,
   token: process.env.SHOPIFY_STOREFRONT_TOKEN,
-})
+  version: '2022-04', // Optional
+}))
 
 // Optional, inject it globally into Vue components
 import Vue from 'vue'
diff --git a/demo/components/merge-demo.vue b/demo/components/merge-demo.vue
new file mode 100644
index 0000000..bfe394c
--- /dev/null
+++ b/demo/components/merge-demo.vue
@@ -0,0 +1,38 @@
+<!-- Demo using mocks -->
+
+<template lang='pug'>
+
+ul.merge-demo: li(v-for='product in products')
+	| {{ product.title }}
+
+</template>
+
+<!-- ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– -->
+
+<script lang='coffee'>
+export default
+
+	data: -> products: []
+
+	fetch: ->
+		@products = await @$mergeShopifyProductCards [
+			{ slug: 'clay-plant-pot' }
+			{ slug: 'copper-light' }
+		]
+
+</script>
+
+<!-- ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– -->
+
+<style lang='stylus' scoped>
+
+.merge-demo
+	border 1px dashed currentColor
+	padding 1em
+	list-style disc
+
+li
+	margin-left 1em
+	margin-v .25em
+
+</style>
diff --git a/demo/content/demo.md b/demo/content/demo.md
index fe15cef..1b873d6 100644
--- a/demo/content/demo.md
+++ b/demo/content/demo.md
@@ -24,16 +24,42 @@ export default
 
   data: -> products: []
 
-  fetch: ->
-    { @products } = await @$storefront.execute query: '''
-      query getSomeProducts {
-        products(first: 5) {
-          edges {
-            node { ...product }
-          }
+  fetch: -> { @products } = await @$storefront.execute query: '''
+    query getSomeProducts {
+      products(first: 5) {
+        edges {
+          node { ...product }
         }
       }
-    ''' + productFragment
+    }
+  ''' + productFragment
+
+</script>
+```
+
+## Merge Example
+
+This uses live Shopify data and the `$mergeShopifyProductCards` helper to simulate merging Shopify data into an array of product data from another source, like Craft.
+
+<merge-demo></merge-demo>
+
+```vue
+<template lang='pug'>
+
+ul: li(v-for='product in products')
+  | {{ product.title }}
+
+</template>
+
+<script lang='coffee'>
+export default
+
+  data: -> products: []
+
+  fetch: -> @products = await @$mergeShopifyProductCards [
+    { slug: 'clay-plant-pot' }
+    { slug: 'copper-light' }
+  ]
 
 </script>
 ```
diff --git a/demo/nuxt.config.js b/demo/nuxt.config.js
index 472636a..f6de858 100644
--- a/demo/nuxt.config.js
+++ b/demo/nuxt.config.js
@@ -1,5 +1,7 @@
 // Mock stubs
 import someProducts from './stubs/some-products.json'
+import productsForSsgVariants from './stubs/products-for-ssg-variants.json'
+import productVariantsForSsgVariants from './stubs/product-variants-for-ssg-variants.json'
 
 // Nuxt config
 export default {
@@ -8,6 +10,7 @@ export default {
 	buildModules: [
 		'@cloak-app/boilerplate',
 		'@cloak-app/demo-theme',
+		'@cloak-app/craft',
 		'../nuxt',
 	],
 
@@ -30,10 +33,24 @@ export default {
 				{
 					query: 'getSomeProducts',
 					response: someProducts,
-				}
+				},
+				{
+					query: 'getProductVariantsForSsgVariants',
+					response: productVariantsForSsgVariants
+				},
 			],
 		},
 
+		// Mock Craft queries
+		craft: {
+			mocks: [
+				{
+					query: 'getProductsForSsgVariants',
+					response: productsForSsgVariants
+				}
+			]
+		}
+
 	},
 
 	// @nuxt/content can't be loaded from module
diff --git a/demo/pages/index.vue b/demo/pages/index.vue
index b1714fa..a4f9e37 100644
--- a/demo/pages/index.vue
+++ b/demo/pages/index.vue
@@ -11,7 +11,7 @@ nuxt-content(:document='page')
 <script lang='coffee'>
 export default
 
-		# Get page content
+	# Get page content
 	asyncData: ({ $content }) ->
 		page = await $content('demo').fetch()
 		return { page }
diff --git a/demo/pages/products/_product.vue b/demo/pages/products/_product/_variant.vue
similarity index 100%
rename from demo/pages/products/_product.vue
rename to demo/pages/products/_product/_variant.vue
diff --git a/demo/stubs/product-variants-for-ssg-variants.json b/demo/stubs/product-variants-for-ssg-variants.json
new file mode 100644
index 0000000..f15cc9f
--- /dev/null
+++ b/demo/stubs/product-variants-for-ssg-variants.json
@@ -0,0 +1,15 @@
+{
+	"data": {
+		"product": {
+			"variants": {
+				"edges": [
+					{
+						"node": {
+							"id": "gid://shopify/ProductVariant/10079785100"
+						}
+					}
+				]
+			}
+		}
+	}
+}
diff --git a/demo/stubs/products-for-ssg-variants.json b/demo/stubs/products-for-ssg-variants.json
new file mode 100644
index 0000000..114c558
--- /dev/null
+++ b/demo/stubs/products-for-ssg-variants.json
@@ -0,0 +1,10 @@
+{
+	"data": {
+		"entries": [
+			{
+				"slug": "clay-plant-pot",
+				"uri": "products/clay-plant-pot"
+			}
+		]
+	}
+}
diff --git a/factories/merge-helpers.js b/factories/merge-helpers.js
new file mode 100644
index 0000000..d4c116c
--- /dev/null
+++ b/factories/merge-helpers.js
@@ -0,0 +1,18 @@
+import * as queryHelpers from '../helpers/query'
+
+/**
+ * Merge query query helpers into the storefront object. This is done from
+ * a different file from the other factory files because it results in loading
+ * gql files that will require transpiling. And we want to make the base
+ * Storefront client to be useable without transpiling.
+ */
+export default function ($storefront) {
+	Object.entries(queryHelpers).forEach(([methodName, method]) => {
+		$storefront[methodName] = (...args) => {
+			return method.apply(null, [$storefront, ...args])
+		}
+	})
+
+	// Return $storefront so this can wrap Storefront factory
+	return $storefront
+}
diff --git a/factories/storefront-client-factory.js b/factories/storefront-client-factory.js
index dc48105..54817d6 100644
--- a/factories/storefront-client-factory.js
+++ b/factories/storefront-client-factory.js
@@ -2,7 +2,13 @@ import mapValues from 'lodash/mapValues'
 import isPlainObject from 'lodash/isPlainObject'
 
 // Factory method for making Storefront Axios clients
-export default function (axios, { url, token, version } = {}) {
+export default function (axios, {
+	url,
+	token,
+	version = '2022-04',
+	language,
+	country,
+} = {}) {
 
 	// Make Storefront instance
 	const storefront = axios.create({
@@ -14,9 +20,17 @@ export default function (axios, { url, token, version } = {}) {
 		},
 	})
 
+	// Store configuration on the object, for reading out externally (or mutating)
+	storefront.language = language
+	storefront.country = country
+
 	// Add execute helper for running gql queries
 	storefront.execute = async payload => {
 
+		// Massage the payload
+		const { language, country } = storefront
+		payload = setInContext(payload, { language, country })
+
 		// Execute the query
 		const response = await storefront({
 			method: 'POST',
@@ -36,7 +50,7 @@ export default function (axios, { url, token, version } = {}) {
 	return storefront
 }
 
-// Make a custom erorr object
+// Make a custom error object
 export class StorefrontError extends Error {
 	constructor(errors, payload) {
 
@@ -55,6 +69,19 @@ export class StorefrontError extends Error {
 	}
 }
 
+// Send language and country on all requests if specified, for use with
+// @inContext directive
+export function setInContext(payload, { language, country }) {
+	return {
+		...payload,
+		variables: {
+			language,
+			country,
+			...(payload.variables || {})
+		}
+	}
+}
+
 // Recurse through an object and flatten eddge/node levels
 function flattenEdges(obj) {
 
diff --git a/helpers/cards.coffee b/helpers/cards.coffee
new file mode 100644
index 0000000..b5f5b83
--- /dev/null
+++ b/helpers/cards.coffee
@@ -0,0 +1,58 @@
+###
+Helpers related to mering Shopify product data into other product objects by
+slug. Intended use case is when we get product listing info from Craft, designed
+for rendering in cards.
+###
+import memoize from 'lodash/memoize'
+import { getShopifyId } from './formatting'
+import getProduct from '../queries/product.gql'
+
+# Take an array of Craft product entries and merge Shopify data with them. This
+# preserves the original order of the products.
+export mergeShopifyProductCards = ({ execute }, products) ->
+	return [] unless products.length
+
+	# Get Shopify and bundle data for products. If Shopify data isn't found,
+	# an exception is thrown, which we catch and use to remove that product
+	# from the listing.
+	products = await Promise.all products.map (product) ->
+		try await mergeShopifyProductCard { execute }, product
+		catch error then console.warn error
+
+	# Remove all empty products (those that errored while getting data)
+	return products.filter (val) -> !!val
+
+# Merge Shopify data into a single card
+export mergeShopifyProductCard = memoize ({ execute }, product) ->
+	return unless product
+
+	# Merge Shopify data into the product object
+	shopifyProduct = await getShopifyProductByHandle { execute }, product.slug
+	product = { ...product, ...shopifyProduct }
+
+	# Remove keys not needed for cards
+	delete product.description
+
+	# Return the final product
+	return product
+
+# Use the slug as the memoize resolver
+, (deps, product) -> product?.slug
+
+# Get the Shopify product data given a Shopify product handle
+getShopifyProductByHandle = ({ execute }, productHandle) ->
+
+	# Query Storefront API
+	{ product } = await execute
+		query: getProduct
+		variables: handle: productHandle
+	unless product then throw "No Shopify product found for #{productHandle}"
+
+	# Add URLs to each variant for easier iteration later
+	product.variants = product.variants.map (variant) =>
+		variantIdNum = getShopifyId variant.id
+		url = "/products/#{productHandle}/#{variantIdNum}"
+		return { ...variant, url }
+
+	# Return the product
+	return product
diff --git a/helpers/formatting.js b/helpers/formatting.js
new file mode 100644
index 0000000..1262286
--- /dev/null
+++ b/helpers/formatting.js
@@ -0,0 +1,30 @@
+import atob from 'atob-lite'
+
+// Get the id from a Shopify gid:// style id.  This strips everything but the
+// last part of the string.  So gid://shopify/ProductVariant/34641879105581
+// becomes 34641879105581
+// https://regex101.com/r/3FIplL/3
+export function getShopifyId(id) {
+
+	// Already a simple ID
+	if (String(id).match(/^\d+$/)) return id
+
+	// De-base64.  This should only be required when migrating cart ids that were
+	// stored in a cookie, AKA client-side pre Storefront API version 2022-04.
+	if (!id.match(/^gid:\/\//)) id = atob(id)
+
+	// Return the ID
+	const matches = id.match(/\/([^\/?]+)(?:\?.+)?$/)
+	if (matches) return matches[1]
+}
+
+// Format a string or number like money, using vue-i18n if it's installed
+// or falling back to USD
+export function formatMoney(val) {
+	if (this && this.$n) return this.$n(val, 'currency')
+	return parseFloat(val)
+		.toLocaleString(process.env.LOCALE_CODE || 'en-US', {
+			style: 'currency',
+			currency: process.env.CURRENCY_CODE || 'USD'
+		})
+}
diff --git a/helpers/index.js b/helpers/index.js
new file mode 100644
index 0000000..41bab39
--- /dev/null
+++ b/helpers/index.js
@@ -0,0 +1,2 @@
+// Bundle simple helpers
+export * from './formatting'
diff --git a/helpers/query.coffee b/helpers/query.coffee
index b5506f6..7c3f0ca 100644
--- a/helpers/query.coffee
+++ b/helpers/query.coffee
@@ -10,6 +10,7 @@ import updateQuery from '../queries/update.gql'
 import deleteQuery from '../queries/delete.gql'
 import discountsQuery from '../queries/discounts.gql'
 import linkCustomerQuery from '../queries/link-customer.gql'
+import productQuery from '../queries/product.gql'
 import productFragment from '../queries/fragments/product.gql'
 
 # Throw errors if found in the response, else map the checkout object
@@ -33,30 +34,41 @@ export create = ({ execute }) ->
 
 # Add an item to the checkout
 export addVariant = ({ execute }, {
-	cartId, variantId, quantity, sellingPlanId
+	cartId, variantId, quantity, sellingPlanId, attributes
 }) ->
-	handleCheckoutMutation await execute
-		query: addQuery
-		variables:
-			cartId: cartId
-			lines: [
-				merchandiseId: variantId
-				quantity: quantity
-				sellingPlanId: sellingPlanId
-			]
+	addVariants { execute }, {
+		cartId
+		variantIds: [ variantId ]
+		quantity
+		sellingPlanId
+		attributes
+	}
 
 # Add multiple items to the checkout with the same attributes
 export addVariants = ({ execute }, {
-	cartId, variantIds, quantity, attributes = {}
+	cartId, variantIds, quantity, sellingPlanId, attributes = {}
 }) ->
 	handleCheckoutMutation await execute
 		query: addQuery
 		variables:
 			cartId: cartId
-			lines: variantIds.map (variantId) ->
+			lines: variantIds.map (variantId) -> {
 				merchandiseId: variantId
-				quantity: quantity
+				quantity
+				sellingPlanId
 				attributes: { key, value } for key, value of attributes
+			}
+
+# Update a line item
+export updateLine = ({ execute }, {
+	cartId, lineId, quantity, sellingPlanId
+}) ->
+	updateLines { execute }, {
+		cartId
+		lineIds: [ lineId ]
+		quantity
+		sellingPlanId
+	}
 
 # Update multiple line items
 export updateLines = ({ execute }, {
@@ -71,6 +83,13 @@ export updateLines = ({ execute }, {
 				quantity: quantity
 				sellingPlanId: sellingPlanId
 
+# Delete multiple line items
+export deleteLine = ({ execute }, { cartId, lineId }) ->
+	deleteLines { execute }, {
+		cartId
+		lineIds: [ lineId ]
+	}
+
 # Delete multiple line items
 export deleteLines = ({ execute }, { cartId, lineIds }) ->
 	handleCheckoutMutation await execute
@@ -95,20 +114,11 @@ export linkCustomer = ({ execute }, { cartId, accessToken }) ->
 			cartId: cartId
 			buyerIdentity: customerAccessToken: accessToken
 
-# Get product data for a PDP by adding a couple additional feilds onto the main
-# product fragment
+# Get product data for a PDP
 export getProductDetail = ({ execute }, handle) ->
 	{ product } = await execute
-		variables: { handle }
-		query:  """
-			query getProductDetail($handle: String!) {
-				product: productByHandle(handle:$handle) {
-					...product
-					description: descriptionHtml
-				}
-			}
-			#{productFragment}
-		"""
+		variables: { handle, pdp: true }
+		query: productQuery
 	return product
 
 # Helper to look up product card data from their handles by querying the
diff --git a/modules/ssg-variants.js b/modules/ssg-variants.js
new file mode 100644
index 0000000..6649193
--- /dev/null
+++ b/modules/ssg-variants.js
@@ -0,0 +1,82 @@
+import { makeModuleCraftClient } from '@cloak-app/craft/factories'
+import { makeModuleStorefrontClient } from '../factories'
+import { getShopifyId } from '../helpers/formatting'
+import consola from 'consola'
+
+// Add URLs to variant pages to the SSGed list
+export default function() {
+
+	// Hook to extend routes
+	this.nuxt.hook('generate:extendRoutes', async(routes) => {
+		consola.info('Adding variant routes')
+
+		// Make clients
+		const $craft = makeModuleCraftClient(this),
+			$storefront = makeModuleStorefrontClient(this)
+
+		// Get all the variant routes
+		const variantRoutes = await buildVariantRoutes({
+			$craft, $storefront
+		}, routes)
+
+		// Append the variant routes to the routes, has to be done in place
+		for (const route of variantRoutes) {
+			routes.push(route)
+			this.nuxt.options.sitemap?.routes.push(route)
+		}
+		consola.success('Added variant routes');
+	})
+}
+
+// Add variants to the routes
+async function buildVariantRoutes({ $craft, $storefront }, routes) {
+	const variantRoutes = []
+
+	// Get all products
+	const products = await $craft.getEntries({ query: `
+		query getProductsForSsgVariants ($site:[String]) {
+			entries(
+				site:    $site
+				section: "products"
+			) {
+				slug
+				uri
+			}
+		}`
+	})
+
+	// Build list of variant routes
+	for (const product of products) {
+
+		// Get all of the variant ids of this product from Shopify
+		const { product: shopifyProduct } = await $storefront.execute({ query:
+			`query getProductVariantsForSsgVariants {
+				product: productByHandle(handle: "${product.slug}") {
+					variants(first:100) {
+						edges {
+							node { id }
+						}
+					}
+				}
+			}`
+		})
+
+		// If no Shopify product, remove route for the product
+		if (!shopifyProduct) {
+			const index = routes.findIndex(route => route.route == `/${product.uri}`)
+			if (index >= 0) routes.splice(index, 1)
+			console.warn(`Shopify product not found for ${product.slug}`)
+			continue
+		}
+
+		// Push new route objects onto the stack
+		for (const variant of shopifyProduct.variants) {
+			variantRoutes.push({
+				route: `/${product.uri}/${getShopifyId(variant.id)}`
+			})
+		}
+	}
+
+	// Return the updated list of routes
+	return variantRoutes
+};
diff --git a/nuxt.js b/nuxt.js
index bf3e83a..adc5404 100644
--- a/nuxt.js
+++ b/nuxt.js
@@ -5,12 +5,20 @@ export default function() {
 	// Have Nuxt transpile resources
 	this.options.build.transpile.push('@cloak-app/shopify')
 
+	// Detect the lanaguge and country code from the CMS_SITE ENV
+	// https://regex101.com/r/ozRGpF/1
+	const matches = process.env.CMS_SITE?.match(/(\w{2})(?:-|_)(\w{2})/),
+		language = matches?.[1].toUpperCase(),
+		country = matches?.[2].toUpperCase()
+
 	// Set default options
 	setPublicDefaultOptions(this, 'shopify', {
 		url: process.env.SHOPIFY_URL,
 		storefront: {
 			token: process.env.SHOPIFY_STOREFRONT_TOKEN,
-			version: 'unstable',
+			version: '2022-04',
+			language,
+			country,
 			injectClient: true,
 		},
 		mocks: [],
@@ -31,6 +39,18 @@ export default function() {
 
 	// Support mocking
 	requireOnce(this, join(__dirname, './modules/mock-storefront.js'))
+
+	// Add ssg-variants module if @cloak-app/craft is used
+	if ([
+		...this.options.modules,
+		...this.options.buildModules,
+	].includes('@cloak-app/craft')) {
+		requireOnce(this, join(__dirname, './modules/ssg-variants.js'))
+	}
+
+	// Add helpers
+	this.options.plugins.unshift(join(__dirname, 'plugins/helpers.js'))
+
 }
 
 // Required for published modules
diff --git a/package.json b/package.json
index ec92d74..9413eae 100644
--- a/package.json
+++ b/package.json
@@ -14,10 +14,12 @@
 	},
 	"dependencies": {
 		"@cloak-app/utils": "^1.7.2",
+		"atob-lite": "^2.0.0",
 		"lodash": "^4.0.0"
 	},
 	"devDependencies": {
-		"@cloak-app/boilerplate": "^1.0.8",
+		"@cloak-app/boilerplate": "^1.2.0",
+		"@cloak-app/craft": "^1.2.0",
 		"@cloak-app/demo-theme": "^1.0.6",
 		"@nuxt/content": "^1.14.0",
 		"nuxt": "^2.15.7"
diff --git a/plugins/helpers.js b/plugins/helpers.js
new file mode 100644
index 0000000..9ee602c
--- /dev/null
+++ b/plugins/helpers.js
@@ -0,0 +1,11 @@
+/**
+ * Inject helpers
+ */
+import * as helpers from '../helpers'
+export default function ({ }, inject) {
+
+	// Not binding to context because it makes Vuei18n methods inaccessible
+	for (const [name, helper] of Object.entries(helpers)) {
+		inject(name, helper)
+	}
+}
diff --git a/plugins/storefront-client.js b/plugins/storefront-client.js
index 5798c64..0de73db 100644
--- a/plugins/storefront-client.js
+++ b/plugins/storefront-client.js
@@ -2,25 +2,24 @@
  * Create the Storefront axios client instance
  */
 import { makeStorefrontClient } from '../factories'
-import * as queryHelpers from '../helpers/query'
+import mergeClientHelpers from '../factories/merge-helpers'
+import * as cardsHelpers from '../helpers/cards'
 export default function({ $axios, $config }, inject) {
 
 	// Make the instance
-	const $storefront = makeStorefrontClient({
+	const $storefront = mergeClientHelpers(makeStorefrontClient({
 		axios: $axios,
 		url: $config.cloak.shopify.url,
 		...$config.cloak.shopify.storefront,
-	})
+	}))
+
+	// Inject the final Storefront object
+	inject('storefront', $storefront)
 
-	// Loop through query helpers and register them on the client, passing the
-	// axios client in as the first argument.  This happens in this plugin
-	// rather than in the factory so we can transpile the gql used by the
-	// query helpers.
-	Object.entries(queryHelpers).forEach(([methodName, method]) => {
-		$storefront[methodName] = (...args) => {
+	// Inject merge helpers, which rely on the storefront object
+	Object.entries(cardsHelpers).forEach(([methodName, method]) => {
+		inject(methodName, (...args) => {
 			return method.apply(null, [$storefront, ...args])
-		}
+		})
 	})
-
-	inject('storefront', $storefront)
 }
diff --git a/queries/add.gql b/queries/add.gql
index 323279c..abadd88 100644
--- a/queries/add.gql
+++ b/queries/add.gql
@@ -2,7 +2,14 @@
 #import "./fragments/errors.gql"
 
 # Add a line item to a checkout
-mutation cartLinesAdd($cartId: ID!, $lines: [CartLineInput!]!) {
+mutation cartLinesAdd(
+	$cartId: ID!
+	$lines: [CartLineInput!]!
+	$includeCustomer: Boolean = false
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
+
 	mutation: cartLinesAdd(cartId: $cartId, lines: $lines) {
 		cart { ...cart }
 		userErrors { ...cartUserError }
diff --git a/queries/create.gql b/queries/create.gql
index 338a24d..bad77c6 100644
--- a/queries/create.gql
+++ b/queries/create.gql
@@ -2,7 +2,13 @@
 #import "./fragments/errors.gql"
 
 # Create a new checkout
-mutation cartCreate($input: CartInput) {
+mutation cartCreate(
+	$input: CartInput
+	$includeCustomer: Boolean = false
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
+
 	mutation: cartCreate(input: $input) {
 		cart { ...cart }
 		userErrors { ...cartUserError }
diff --git a/queries/delete.gql b/queries/delete.gql
index 30fd075..78d0f8a 100644
--- a/queries/delete.gql
+++ b/queries/delete.gql
@@ -2,7 +2,14 @@
 #import "./fragments/errors.gql"
 
 # Update a line item
-mutation cartLinesRemove($cartId: ID!, $lines: [ID!]!) {
+mutation cartLinesRemove(
+	$cartId: ID!
+	$lines: [ID!]!
+	$includeCustomer: Boolean = false
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
+
   mutation: cartLinesRemove(cartId: $cartId, lineIds: $lines) {
 		cart { ...cart }
 		userErrors { ...cartUserError }
diff --git a/queries/discounts.gql b/queries/discounts.gql
index c8636b1..b224553 100644
--- a/queries/discounts.gql
+++ b/queries/discounts.gql
@@ -2,7 +2,14 @@
 #import "./fragments/errors.gql"
 
 # Update the discount codes on the cart
-mutation cartDiscountCodesUpdate($cartId: ID!, $discountCodes: [String!]) {
+mutation cartDiscountCodesUpdate(
+	$cartId: ID!
+	$discountCodes: [String!]
+	$includeCustomer: Boolean = false
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
+
 	mutation: cartDiscountCodesUpdate(
 		cartId: $cartId
 		discountCodes: $discountCodes
diff --git a/queries/fetch.gql b/queries/fetch.gql
index f5371cd..e24512b 100644
--- a/queries/fetch.gql
+++ b/queries/fetch.gql
@@ -1,6 +1,12 @@
 #import "./fragments/cart.gql"
 
 # Lookup a cart by id
-query fetchCart($id: ID!) {
+query fetchCart(
+	$id: ID!
+	$includeCustomer: Boolean = false
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
+
   cart(id: $id) { ...cart }
 }
diff --git a/queries/fragments/cart.gql b/queries/fragments/cart.gql
index 070219f..09d4ce2 100644
--- a/queries/fragments/cart.gql
+++ b/queries/fragments/cart.gql
@@ -8,7 +8,7 @@ fragment cart on Cart {
 	checkoutUrl
 
 	# Customer info
-	buyerIdentity {
+	buyerIdentity @include(if: $includeCustomer) {
 		customer { id }
 	}
 
@@ -40,7 +40,9 @@ fragment cartLine on CartLine {
 	quantity
 	variant: merchandise {
 		...variant
-		product { ...product }
+		... on ProductVariant {
+			product { ...product }
+		}
 	}
 	estimatedCost {
 		subtotalAmount { ...price }
diff --git a/queries/link-customer.gql b/queries/link-customer.gql
index dc6d27d..793b35b 100644
--- a/queries/link-customer.gql
+++ b/queries/link-customer.gql
@@ -4,7 +4,11 @@
 # Update a line item
 mutation cartBuyerIdentityUpdate (
 	$cartId: ID!
-	$buyerIdentity: CartBuyerIdentityInput!) {
+	$buyerIdentity: CartBuyerIdentityInput!
+	$includeCustomer: Boolean = true
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
 
   mutation: cartBuyerIdentityUpdate(
 		cartId: $cartId
diff --git a/queries/product.gql b/queries/product.gql
new file mode 100644
index 0000000..85db024
--- /dev/null
+++ b/queries/product.gql
@@ -0,0 +1,18 @@
+#import "./fragments/product.gql"
+
+# Fetch a single product. $pdp can be used to add fields needed for rendering
+# on the PDP, like the description
+query getProduct(
+	$handle: String!
+	$pdp: Boolean = false
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
+
+	product: productByHandle(handle:$handle) {
+		...product
+
+		# PDP specific fields
+		description: descriptionHtml @include(if: $pdp)
+	}
+}
diff --git a/queries/update.gql b/queries/update.gql
index f085132..f6f552e 100644
--- a/queries/update.gql
+++ b/queries/update.gql
@@ -2,7 +2,14 @@
 #import "./fragments/errors.gql"
 
 # Update a line item
-mutation cartLinesUpdate($cartId: ID!, $lines: [CartLineUpdateInput!]!) {
+mutation cartLinesUpdate(
+	$cartId: ID!
+	$lines: [CartLineUpdateInput!]!
+	$includeCustomer: Boolean = false
+	$country: CountryCode
+	$language: LanguageCode)
+	@inContext(country: $country, language: $language) {
+
   mutation: cartLinesUpdate(cartId: $cartId, lines: $lines) {
 		cart { ...cart }
 		userErrors { ...cartUserError }
diff --git a/yarn.lock b/yarn.lock
index 793adad..b19757b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -932,13 +932,13 @@
   dependencies:
     coffeescript "^2.5.1"
 
-"@cloak-app/boilerplate@^1.0.8":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@cloak-app/boilerplate/-/boilerplate-1.0.9.tgz#bda031cc152f5d7bccf0e928349164129b65de52"
-  integrity sha512-XMKxJ3KzZyrWPORdC7/HcsPus3fSSwLUVN+vB6WyZzL8Ft9hu1UDxkI0waDTP/VzJBRIu3ZQdaP60s5tTKNH/Q==
+"@cloak-app/boilerplate@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@cloak-app/boilerplate/-/boilerplate-1.2.0.tgz#045783df058106a4b93151f1526e088a81a1b071"
+  integrity sha512-4oHDf08sz/6UU8OmX9VyipK+4/NoWcD1KoWhzFG5E4sLQFpAjk6YEbVFN4vgKHiQ1cBYvHxZ91B4FwZ3hY8eNw==
   dependencies:
     "@bkwld/credits" "^0.3.0"
-    "@cloak-app/utils" "^1.0.1"
+    "@cloak-app/utils" "^1.5.0"
     "@nuxt/utils" "^2.15.0"
     "@nuxtjs/axios" "^5.0.0"
     "@nuxtjs/gtm" "^2.0.0"
@@ -964,6 +964,16 @@
     vue-routing-anchor-parser "^1.13.1"
     webpack-graphql-loader gpoitch/graphql-loader#gp/refresh
 
+"@cloak-app/craft@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@cloak-app/craft/-/craft-1.2.0.tgz#a24a40534ae41f84b1350e4680e6b9bef63f46be"
+  integrity sha512-p0o3buOQzI3jck0SEJl0H3mSILveGKTfUQWEp09nBaOyEIf6JmjIk5ZIFlw7UbGnjzxYrQrbb+iKdjKFc1T/xg==
+  dependencies:
+    "@cloak-app/utils" "^1.7.1"
+    "@nuxtjs/axios" "^5.0.0"
+    consola "^2.15.3"
+    lodash "^4.0.0"
+
 "@cloak-app/demo-theme@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@cloak-app/demo-theme/-/demo-theme-1.0.6.tgz#99de986efa6180bf17fd86723e9dab5b52eec5a1"
@@ -971,12 +981,7 @@
   dependencies:
     prism-themes "^1.9.0"
 
-"@cloak-app/utils@^1.0.1":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@cloak-app/utils/-/utils-1.2.0.tgz#0871f94181403f1b8227479524b9b5122fb44dd9"
-  integrity sha512-odRgoHlHE+2iUnbNuZ4OVWmvWlghxy/gfTtum7yzucFo8fipNG3vJ60WS57aJfQUYXNDXeFL4lJoVNj8o+kerg==
-
-"@cloak-app/utils@^1.7.2":
+"@cloak-app/utils@^1.5.0", "@cloak-app/utils@^1.7.1", "@cloak-app/utils@^1.7.2":
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/@cloak-app/utils/-/utils-1.7.2.tgz#c8a8b1aa48dcd81884d5ee7661caa7a47dfa20b5"
   integrity sha512-zH9/3IRMRVgPCLqwq+DIP0fyfvwCUojdKSXO2gWFFgpa7AMYp8icccqKyD9Hze5ksFVxdTgCPFA/vdtGfxqOZQ==
@@ -2698,6 +2703,11 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
+atob-lite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
+  integrity sha512-LEeSAWeh2Gfa2FtlQE1shxQ8zi5F9GHarrGKz08TMdODD5T4eH6BMsvtnhbWZ+XQn+Gb6om/917ucvRu7l7ukw==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -10662,7 +10672,7 @@ webpack-dev-middleware@^4.2.0:
     range-parser "^1.2.1"
     schema-utils "^3.0.0"
 
-"webpack-graphql-loader@github:gpoitch/graphql-loader#gp/refresh", webpack-graphql-loader@gpoitch/graphql-loader#gp/refresh:
+webpack-graphql-loader@gpoitch/graphql-loader#gp/refresh:
   version "1.0.2"
   resolved "https://codeload.github.com/gpoitch/graphql-loader/tar.gz/42f0f990a6132ccd5e284d0e6cfeade12728dba2"
   dependencies: