Merge pull request #61 from Shopify/develop

Version 1.2.2

Merge pull request #61 from Shopify/develop
Version 1.2.2
5c18d974 · Rune Madsen · 52178ebb · 2ef81528 · 5c18d974 · 5c18d974
Commit 5c18d974 authored Nov 16, 2015 by Rune Madsen
63 changed files
--- a/Assets/Mobile_Buy_SDK_Github_banner.png
+++ b/Assets/Mobile_Buy_SDK_Github_banner.png
--- a/Assets/Product_View_Screenshot_1.png
+++ b/Assets/Product_View_Screenshot_1.png
--- a/Assets/Product_View_Screenshot_2.png
+++ b/Assets/Product_View_Screenshot_2.png
--- a/Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample.xcodeproj/project.pbxproj
+++ b/Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample.xcodeproj/project.pbxproj
@@ -7,14 +7,14 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		902C9B8C1BB06BF300FC456E /* GetShopOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 902C9B8B1BB06BF300FC456E /* GetShopOperation.m */; settings = {ASSET_TAGS = (); }; };
+		902C9B8C1BB06BF300FC456E /* GetShopOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 902C9B8B1BB06BF300FC456E /* GetShopOperation.m */; };
-		902C9B8F1BB0729F00FC456E /* ShippingRateTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 902C9B8E1BB0729F00FC456E /* ShippingRateTableViewCell.m */; settings = {ASSET_TAGS = (); }; };
+		902C9B8F1BB0729F00FC456E /* ShippingRateTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 902C9B8E1BB0729F00FC456E /* ShippingRateTableViewCell.m */; };
-		902C9B921BB08FF500FC456E /* SummaryItemsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 902C9B911BB08FF500FC456E /* SummaryItemsTableViewCell.m */; settings = {ASSET_TAGS = (); }; };
+		902C9B921BB08FF500FC456E /* SummaryItemsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 902C9B911BB08FF500FC456E /* SummaryItemsTableViewCell.m */; };
-		9079F5F41BB1AAA100CB1B35 /* CollectionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9079F5F31BB1AAA100CB1B35 /* CollectionListViewController.m */; settings = {ASSET_TAGS = (); }; };
+		9079F5F41BB1AAA100CB1B35 /* CollectionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9079F5F31BB1AAA100CB1B35 /* CollectionListViewController.m */; };
 		90A6F42D1BA8BCAC003E7C4F /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90A6F42C1BA8BCAC003E7C4F /* PassKit.framework */; };
-		90B2623E1BB0A47B006D888F /* ProductViewControllerThemeStyleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B2623D1BB0A47B006D888F /* ProductViewControllerThemeStyleTableViewCell.m */; settings = {ASSET_TAGS = (); }; };
+		90B2623E1BB0A47B006D888F /* ProductViewControllerThemeStyleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B2623D1BB0A47B006D888F /* ProductViewControllerThemeStyleTableViewCell.m */; };
-		90B262411BB0A726006D888F /* ProductViewControllerToggleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B262401BB0A726006D888F /* ProductViewControllerToggleTableViewCell.m */; settings = {ASSET_TAGS = (); }; };
+		90B262411BB0A726006D888F /* ProductViewControllerToggleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B262401BB0A726006D888F /* ProductViewControllerToggleTableViewCell.m */; };
-		90B262441BB18B10006D888F /* ProductViewControllerThemeTintColorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B262431BB18B10006D888F /* ProductViewControllerThemeTintColorTableViewCell.m */; settings = {ASSET_TAGS = (); }; };
+		90B262441BB18B10006D888F /* ProductViewControllerThemeTintColorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B262431BB18B10006D888F /* ProductViewControllerThemeTintColorTableViewCell.m */; };
 		BE3437A21BC5C19D00C71330 /* Buy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE34379F1BC5C18400C71330 /* Buy.framework */; };
 		BE3437A31BC5C19D00C71330 /* Buy.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BE34379F1BC5C18400C71330 /* Buy.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BE8B82511B8CF49D00E3F871 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BE8B82501B8CF49D00E3F871 /* main.m */; };
@@ -31,13 +31,6 @@
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
-		BE3437981BC5C18400C71330 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BE34378F1BC5C18400C71330 /* Mobile Buy SDK.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 90F7BA681B0D1DAF0067864D;
-			remoteInfo = Playground;
-		};
 		BE34379A1BC5C18400C71330 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BE34378F1BC5C18400C71330 /* Mobile Buy SDK.xcodeproj */;
@@ -162,7 +155,6 @@
 		BE3437901BC5C18400C71330 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				BE3437991BC5C18400C71330 /* Playground.app */,
 				BE34379B1BC5C18400C71330 /* Mobile Buy SDK Tests.xctest */,
 				BE34379D1BC5C18400C71330 /* Buy.framework */,
 				BE34379F1BC5C18400C71330 /* Buy.framework */,
@@ -311,13 +303,6 @@
 /* End PBXProject section */
 /* Begin PBXReferenceProxy section */
-		BE3437991BC5C18400C71330 /* Playground.app */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.application;
-			path = Playground.app;
-			remoteRef = BE3437981BC5C18400C71330 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		BE34379B1BC5C18400C71330 /* Mobile Buy SDK Tests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;

--- a/Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample/CheckoutViewController.m
+++ b/Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample/CheckoutViewController.m
@@ -175,17 +175,29 @@ NSString * const MerchantId = @"";
 {
    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Checkout complete" message:nil preferredStyle:UIAlertControllerStyleAlert];;
-    [alertController addAction:[UIAlertAction actionWithTitle:@"OK"
+    [alertController addAction:[UIAlertAction actionWithTitle:@"Start over"
                                                        style:UIAlertActionStyleDefault
                                                      handler:^(UIAlertAction *action) {
                                                          [self.navigationController popToRootViewControllerAnimated:YES];
+                                                      }]];
+    [alertController addAction:[UIAlertAction actionWithTitle:@"Show order status page"
+                                                        style:UIAlertActionStyleDefault
+                                                      handler:^(UIAlertAction *action) {
+                                                          SFSafariViewController *safariViewController = [[SFSafariViewController alloc] initWithURL:self.checkout.order.statusURL];
+                                                          safariViewController.delegate = self;
+                                                          [self presentViewController:safariViewController animated:YES completion:NULL];
                                                      }]];
    [self presentViewController:alertController animated:YES completion:nil];
 }
+#pragma mark - SafariViewControllerDelegate
+- (void)safariViewControllerDidFinish:(SFSafariViewController *)controller
+{
+    [self.navigationController popToRootViewControllerAnimated:YES];
+}
 #pragma mark Native Checkout
 - (void)checkoutWithCreditCard
@@ -228,7 +240,7 @@ NSString * const MerchantId = @"";
    NSLog(@"Successfully got completion status: %lu", (unsigned long)completionStatus);
-    [self showCheckoutConfirmation];
+    [self getCompletedCheckout];
 }
 - (void)operation:(GetCompletionStatusOperation *)operation failedToReceiveCompletionStatus:(NSError *)error
@@ -295,16 +307,8 @@ NSString * const MerchantId = @"";
    // Add additional methods if needed and forward the callback to BUYApplePayHelpers
    [self.applePayHelper paymentAuthorizationViewController:controller didAuthorizePayment:payment completion:completion];
-    // Get the completed checkout
+    self.checkout = self.applePayHelper.checkout;
-    [self.client getCheckout:self.applePayHelper.checkout completion:^(BUYCheckout *checkout, NSError *error) {
+    [self getCompletedCheckout];
-        if (error) {
-            NSLog(@"Unable to get completed checkout");
-            NSLog(@"%@", error);
-        }
-        if (checkout) {
-            NSLog(@"%@", checkout);
-        }
-    }];
 }
 - (void)paymentAuthorizationViewControllerDidFinish:(PKPaymentAuthorizationViewController *)controller
@@ -363,9 +367,8 @@ NSString * const MerchantId = @"";
        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
        if (error == nil && status == BUYStatusComplete) {
            NSLog(@"Successfully completed checkout");
-            [welf showCheckoutConfirmation];
+            [welf getCompletedCheckout];
        }
        else {
            NSLog(@"Error completing checkout: %@", error);
@@ -374,4 +377,27 @@ NSString * const MerchantId = @"";
    [[NSNotificationCenter defaultCenter] removeObserver:self name:CheckoutCallbackNotification object:nil];
 }
+- (void)getCompletedCheckout
+{
+    __weak CheckoutViewController *welf = self;
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
+    [self.client getCheckout:self.checkout completion:^(BUYCheckout *checkout, NSError *error) {
+        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+        if (error) {
+            NSLog(@"Unable to get completed checkout");
+            NSLog(@"%@", error);
+        }
+        if (checkout) {
+            welf.checkout = checkout;
+            [welf showCheckoutConfirmation];
+            NSLog(@"%@", checkout);
+        }
+    }];
+}
 @end
--- a/Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample/Info.plist
+++ b/Mobile Buy SDK Sample Apps/Sample App Advanced/Mobile Buy SDK Advanced Sample/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

--- a/Mobile Buy SDK Sample Apps/Sample App Advanced/PRODUCT_VIEW_README.md
+++ b/Mobile Buy SDK Sample Apps/Sample App Advanced/PRODUCT_VIEW_README.md
+# Mobile Buy SDK - Product View
+The SDK includes an easy-to-use product view to make selling simple in any app.
+![Product View Screenshot](https://raw.github.com/Shopify/mobile-buy-sdk-ios/master/Assets/Product_View_Screenshot_1.png)
+![Product View Screenshot](https://raw.github.com/Shopify/mobile-buy-sdk-ios/master/Assets/Product_View_Screenshot_2.png)
+Simply initialize the `BUYProductViewController` and present it from any view controller in your app to sell a product from you shop.
+### Getting started
+The `BUYProductViewController` needs a `BUYClient` setup with your shop's credentials to work, so first create a `BUYClient` object:
+```objc
+BUYClient *client = [[BUYClient alloc] initWithShopDomain:@"yourshop.myshopify.com"
+                                                   apiKey:@"aaaaaaaaaaaaaaaaaa"
+                                                channelId:@"99999"];
+```
+Now, create a `BUYProductViewController` with the `BUYClient`, and optionally add Apple Pay and a custom theme.
+```objc
+// Optionally customize the UI:
+BUYTheme *theme = [[BUYTheme alloc] init];
+theme.style = BUYThemeStyleLight;
+theme.tintColor = [UIColor redColor];
+BUYProductViewController *productViewController = [[BUYProductViewController alloc] initWithClient:self.client theme:theme];
+// Optionally enable Apple Pay:
+productViewController.merchantId = @"MERCHANT_ID";
+```
+Now the `BUYProductViewController` is ready to load a product and be presented in your app:
+```objc
+[productViewController loadProduct:@"PRODUCT_ID" completion:^(BOOL success, NSError *error) {
+    if (success) {
+        [self presentViewController:self.productViewController animated:YES completion:nil];
+    } else {
+        NSLog(@"Error: %@", error.userInfo);
+    }
+}];
+```
+If you have already loaded a product, you can call `loadWithProduct:completion:` instead. 
+For a complete demo, check out the [Advanced Sample App](https://github.com/Shopify/mobile-buy-sdk-ios/tree/master/Mobile Buy SDK Sample Apps/Sample App Advanced/README.md), which demoes more UI customization with `BUYTheme` and both modal and navigation controller push presentations.
--- a/Mobile Buy SDK Sample Apps/Sample App Swift/Mobile Buy SDK Swift Sample.xcodeproj/project.pbxproj
+++ b/Mobile Buy SDK Sample Apps/Sample App Swift/Mobile Buy SDK Swift Sample.xcodeproj/project.pbxproj
@@ -17,13 +17,6 @@
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
-		BE3437B11BC5C20700C71330 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BE3437A81BC5C20700C71330 /* Mobile Buy SDK.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 90F7BA681B0D1DAF0067864D;
-			remoteInfo = Playground;
-		};
 		BE3437B31BC5C20700C71330 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BE3437A81BC5C20700C71330 /* Mobile Buy SDK.xcodeproj */;
@@ -101,7 +94,6 @@
 		BE3437A91BC5C20700C71330 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				BE3437B21BC5C20700C71330 /* Playground.app */,
 				BE3437B41BC5C20700C71330 /* Mobile Buy SDK Tests.xctest */,
 				BE3437B61BC5C20700C71330 /* Buy.framework */,
 				BE3437B81BC5C20700C71330 /* Buy.framework */,
@@ -210,13 +202,6 @@
 /* End PBXProject section */
 /* Begin PBXReferenceProxy section */
-		BE3437B21BC5C20700C71330 /* Playground.app */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.application;
-			path = Playground.app;
-			remoteRef = BE3437B11BC5C20700C71330 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		BE3437B41BC5C20700C71330 /* Mobile Buy SDK Tests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;

--- a/Mobile Buy SDK Sample Apps/Sample App Swift/Mobile Buy SDK Swift Sample/Info.plist
+++ b/Mobile Buy SDK Sample Apps/Sample App Swift/Mobile Buy SDK Swift Sample/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

--- a/Mobile Buy SDK Sample Apps/Sample App Web/Mobile Buy SDK Web Sample.xcodeproj/project.pbxproj
+++ b/Mobile Buy SDK Sample Apps/Sample App Web/Mobile Buy SDK Web Sample.xcodeproj/project.pbxproj
@@ -23,13 +23,6 @@
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
-		9019318E1BC5C62800D1134E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 901931851BC5C62700D1134E /* Mobile Buy SDK.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 90F7BA681B0D1DAF0067864D;
-			remoteInfo = Playground;
-		};
 		901931901BC5C62800D1134E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 901931851BC5C62700D1134E /* Mobile Buy SDK.xcodeproj */;
@@ -131,7 +124,6 @@
 		901931861BC5C62700D1134E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				9019318F1BC5C62800D1134E /* Playground.app */,
 				901931911BC5C62800D1134E /* Mobile Buy SDK Tests.xctest */,
 				901931931BC5C62800D1134E /* Buy.framework */,
 				901931951BC5C62800D1134E /* Buy.framework */,
@@ -267,13 +259,6 @@
 /* End PBXProject section */
 /* Begin PBXReferenceProxy section */
-		9019318F1BC5C62800D1134E /* Playground.app */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.application;
-			path = Playground.app;
-			remoteRef = 9019318E1BC5C62800D1134E /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		901931911BC5C62800D1134E /* Mobile Buy SDK Tests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;

--- a/Mobile Buy SDK Sample Apps/Sample App Web/Mobile Buy SDK Web Sample/Info.plist
+++ b/Mobile Buy SDK Sample Apps/Sample App Web/Mobile Buy SDK Web Sample/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

--- a/Mobile Buy SDK/Mobile Buy SDK Tests/BUYApplePayAdditionsTest.m
+++ b/Mobile Buy SDK/Mobile Buy SDK Tests/BUYApplePayAdditionsTest.m
@@ -364,13 +364,13 @@
 {
 	BUYAddress *newAddress = [self buyAddressWithTestRecordFullDetails:NO];
 	XCTAssertNotNil(newAddress);
-	XCTAssertEqualObjects(BUYPartialAddressPlaceholder, newAddress.address1);
+	XCTAssertEqualObjects(nil, newAddress.address1);
 	XCTAssertEqualObjects(@"Ottawa", newAddress.city);
 	XCTAssertEqualObjects(@"Ontario", newAddress.province);
 	XCTAssertEqualObjects(@"K1N5T5", newAddress.zip);
 	XCTAssertNil(newAddress.country);
 	XCTAssertEqualObjects(@"CA", newAddress.countryCode);
-	XCTAssertEqualObjects(BUYPartialAddressPlaceholder, newAddress.phone);
+	XCTAssertEqualObjects(nil, newAddress.phone);
 }
 - (void)testAddressFromContact

--- a/Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest.m
+++ b/Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest.m
@@ -109,7 +109,11 @@
 	checkout = [[BUYCheckout alloc] initWithCart:cart];
 	BUYAddress *partialAddress = [[BUYAddress alloc] init];
-	partialAddress.address1 = BUYPartialAddressPlaceholder;
+	partialAddress.address1 = nil;
+	if ([partialAddress isPartialAddress]) {
+		checkout.partialAddresses = YES;
+	}
 	checkout.shippingAddress = partialAddress;
 	task = [self.client createCheckout:checkout completion:nil];

--- a/Mobile Buy SDK/Mobile Buy SDK Tests/BUYIntegrationTest.m
+++ b/Mobile Buy SDK/Mobile Buy SDK Tests/BUYIntegrationTest.m
@@ -967,6 +967,10 @@
 	_checkout = [[BUYCheckout alloc] initWithCart:_cart];
 	_checkout.shippingAddress = [self partialShippingAddress];
+	if ([_checkout.shippingAddress isPartialAddress]) {
+		_checkout.partialAddresses = YES;
+	}
 	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
 		return [self shouldUseMocks];
 	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
@@ -994,6 +998,7 @@
 	//Update with full addresses
 	_checkout.shippingAddress = [self shippingAddress];
 	_checkout.billingAddress = [self billingAddress];
 	[self updateCheckout];
 	//We use a credit card here because we're not generating apple pay tokens in the tests
@@ -1211,14 +1216,14 @@
 - (BUYAddress *)partialShippingAddress
 {
 	BUYAddress *address = [[BUYAddress alloc] init];
-	address.address1 = BUYPartialAddressPlaceholder;
+	address.address1 = nil;
 	address.city = @"Ottawa";
-	address.firstName = BUYPartialAddressPlaceholder;
+	address.firstName = nil;
-	address.lastName = BUYPartialAddressPlaceholder;
+	address.lastName = nil;
 	address.countryCode = @"CA";
 	address.provinceCode = @"ON";
 	address.zip = @"K1N5T5";
-	address.phone = BUYPartialAddressPlaceholder;
+	address.phone = nil;
 	return address;
 }

--- a/Mobile Buy SDK/Mobile Buy SDK.xcodeproj/project.pbxproj
+++ b/Mobile Buy SDK/Mobile Buy SDK.xcodeproj/project.pbxproj
@@ -25,6 +25,7 @@
 				90E80E441AFAB0C3003A9909 /* ShellScript */,
 			);
 			dependencies = (
+				90E78A4D1BD58F0C005D16C3 /* PBXTargetDependency */,
 			);
 			name = Documentation;
 			productName = Documentation;
@@ -55,7 +56,6 @@
 		901930ED1BC5B9BC00D1134E /* BUYProductViewHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 90516C861B4C6F7000E35E45 /* BUYProductViewHeader.m */; };
 		901930EE1BC5B9BC00D1134E /* BUYNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90516CC21B4F1ED700E35E45 /* BUYNavigationController.m */; };
 		901930EF1BC5B9BC00D1134E /* BUYVariantSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9496B11B4D96D800B38949 /* BUYVariantSelectionViewController.m */; };
-		901930F01BC5B9BC00D1134E /* BUYCheckout+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6C5E711B1CF776003AD9D0 /* BUYCheckout+Additions.m */; };
 		901930F11BC5B9BC00D1134E /* NSString+Trim.m in Sources */ = {isa = PBXBuildFile; fileRef = F76CFF1C19CB7BE30079C703 /* NSString+Trim.m */; };
 		901930F21BC5B9BC00D1134E /* BUYOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 90E83BC31B9F550E00C95A1B /* BUYOrder.m */; };
 		901930F31BC5B9BC00D1134E /* BUYAddress+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4FA1B177EC80067982B /* BUYAddress+Additions.m */; };
@@ -67,7 +67,7 @@
 		901930F91BC5B9BC00D1134E /* BUYProductViewErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 903BCC7B1B7D1C2D00C21FEB /* BUYProductViewErrorView.m */; };
 		901930FA1BC5B9BC00D1134E /* BUYLineItem.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FDA16D19C939FF00AF4E93 /* BUYLineItem.m */; };
 		901930FB1BC5B9BC00D1134E /* BUYCheckoutButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 900396AF1B67BD0A00226B73 /* BUYCheckoutButton.m */; };
-		901930FC1BC5B9BC00D1134E /* BUYCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9089CC5D1BB48D06009726D6 /* BUYCollection.m */; settings = {ASSET_TAGS = (); }; };
+		901930FC1BC5B9BC00D1134E /* BUYCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9089CC5D1BB48D06009726D6 /* BUYCollection.m */; };
 		901930FD1BC5B9BC00D1134E /* BUYTaxLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 90AFAA5D1B011EA600F21C23 /* BUYTaxLine.m */; };
 		901930FE1BC5B9BC00D1134E /* BUYCollection+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 900396F51B69563400226B73 /* BUYCollection+Additions.m */; };
 		901930FF1BC5B9BC00D1134E /* BUYVariantOptionBreadCrumbsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 90DE926F1B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.m */; };
@@ -117,7 +117,6 @@
 		9019312D1BC5B9BC00D1134E /* BUYTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516CB61B4F0DD500E35E45 /* BUYTheme.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019312E1BC5B9BC00D1134E /* BUYProductDescriptionCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516C951B4D76D900E35E45 /* BUYProductDescriptionCell.h */; };
 		9019312F1BC5B9BC00D1134E /* BUYLineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = F7FDA16C19C939FF00AF4E93 /* BUYLineItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		901931301BC5B9BC00D1134E /* BUYCheckout+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6C5E701B1CF776003AD9D0 /* BUYCheckout+Additions.h */; };
 		901931311BC5B9BC00D1134E /* BUYProductViewHeaderOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 907874971B7276BA0023775B /* BUYProductViewHeaderOverlay.h */; };
 		901931321BC5B9BC00D1134E /* NSString+Trim.h in Headers */ = {isa = PBXBuildFile; fileRef = F76CFF1B19CB7BE30079C703 /* NSString+Trim.h */; };
 		901931331BC5B9BC00D1134E /* BUYAddress+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4F91B177EC80067982B /* BUYAddress+Additions.h */; };
@@ -150,7 +149,6 @@
 		9019314E1BC5B9BC00D1134E /* BUYProductViewFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516C791B4C589A00E35E45 /* BUYProductViewFooter.h */; };
 		9019314F1BC5B9BC00D1134E /* BUYOptionSelectionViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = BE9496AE1B4D96D800B38949 /* BUYOptionSelectionViewController.h */; };
 		901931501BC5B9BC00D1134E /* BUYOrder.h in Headers */ = {isa = PBXBuildFile; fileRef = 90E83BC21B9F550E00C95A1B /* BUYOrder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		901931511BC5B9BC00D1134E /* Buy.h in Headers */ = {isa = PBXBuildFile; fileRef = 904FB6011AE03D4500EA1758 /* Buy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		901931521BC5B9BC00D1134E /* NSDate+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 90A4461F1B5E8614009602AA /* NSDate+BUYAdditions.h */; };
 		901931531BC5B9BC00D1134E /* BUYOptionSelectionNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB74A251B554BFB0005A300 /* BUYOptionSelectionNavigationController.h */; };
 		901931541BC5B9BC00D1134E /* BUYPresentationControllerWithNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 90516CBD1B4F110A00E35E45 /* BUYPresentationControllerWithNavigationController.h */; };
@@ -176,8 +174,6 @@
 		901931691BC5B9BC00D1134E /* BUYProduct.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AF52A7C1A700B0A0087DB2C /* BUYProduct.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019316A1BC5B9BC00D1134E /* BUYSerializable.h in Headers */ = {isa = PBXBuildFile; fileRef = F76CFF1E19CB7C500079C703 /* BUYSerializable.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9019316B1BC5B9BC00D1134E /* BUYProductVariant.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AF52A811A700B0A0087DB2C /* BUYProductVariant.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9035F5FA1BC81D050009DD3B /* Buy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 901931701BC5B9BC00D1134E /* Buy.framework */; };
-		9035F5FB1BC81D050009DD3B /* Buy.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 901931701BC5B9BC00D1134E /* Buy.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		903BCC7C1B7D1C2D00C21FEB /* BUYProductViewErrorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 903BCC7A1B7D1C2D00C21FEB /* BUYProductViewErrorView.h */; };
 		903BCC7D1B7D1C2D00C21FEB /* BUYProductViewErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 903BCC7B1B7D1C2D00C21FEB /* BUYProductViewErrorView.m */; };
 		904606AF1B6BC8D700754173 /* BUYProductImageCollectionViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 904606AD1B6BC8D700754173 /* BUYProductImageCollectionViewCell.h */; };
@@ -188,7 +184,7 @@
 		906EAE441B836DE000976165 /* BUYTheme+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 906EAE421B836DE000976165 /* BUYTheme+Additions.m */; };
 		907874991B7276BA0023775B /* BUYProductViewHeaderOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 907874971B7276BA0023775B /* BUYProductViewHeaderOverlay.h */; };
 		9078749A1B7276BA0023775B /* BUYProductViewHeaderOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 907874981B7276BA0023775B /* BUYProductViewHeaderOverlay.m */; };
-		9089CC5E1BB48D06009726D6 /* BUYCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9089CC5D1BB48D06009726D6 /* BUYCollection.m */; settings = {ASSET_TAGS = (); }; };
+		9089CC5E1BB48D06009726D6 /* BUYCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 9089CC5D1BB48D06009726D6 /* BUYCollection.m */; };
 		909944491B71B76800C40A33 /* UIFont+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 909944471B71B76800C40A33 /* UIFont+BUYAdditions.h */; };
 		9099444A1B71B76800C40A33 /* UIFont+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 909944481B71B76800C40A33 /* UIFont+BUYAdditions.m */; };
 		90A446211B5E8614009602AA /* NSDate+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 90A4461F1B5E8614009602AA /* NSDate+BUYAdditions.h */; };
@@ -197,6 +193,8 @@
 		90A446261B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A446241B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m */; };
 		90BBCD731B87B6BA00FCCE51 /* BUYPKContact.m in Sources */ = {isa = PBXBuildFile; fileRef = 90BBCD701B87B6AB00FCCE51 /* BUYPKContact.m */; };
 		90C27AAF1BB2E8F3008AF7A4 /* libOHHTTPStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE98DB501BB1ED5500C29564 /* libOHHTTPStubs.a */; };
+		90C856B51BD6B0F300936926 /* Buy.h in Headers */ = {isa = PBXBuildFile; fileRef = 90DA8DF11BC6A82D0027BCB7 /* Buy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		90C856B61BD6B0F400936926 /* Buy.h in Headers */ = {isa = PBXBuildFile; fileRef = 90DA8DF11BC6A82D0027BCB7 /* Buy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		90DAEC361BC6E511007555A5 /* Buy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE9A64281B503C2F0033E558 /* Buy.framework */; };
 		90DAEC381BC6E736007555A5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 901931761BC5BC9100D1134E /* libc++.tbd */; };
 		90DE92701B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.h in Headers */ = {isa = PBXBuildFile; fileRef = 90DE926E1B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.h */; };
@@ -211,12 +209,6 @@
 		90F593091B0D5F4C0026B382 /* BUYClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F592FD1B0D5F4C0026B382 /* BUYClientTest.m */; };
 		90F5930A1B0D5F4C0026B382 /* BUYLineItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F592FE1B0D5F4C0026B382 /* BUYLineItemTest.m */; };
 		90F5930B1B0D5F4C0026B382 /* BUYObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F592FF1B0D5F4C0026B382 /* BUYObjectTests.m */; };
-		90F7BA6D1B0D1DAF0067864D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F7BA6C1B0D1DAF0067864D /* main.m */; };
-		90F7BA701B0D1DAF0067864D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F7BA6F1B0D1DAF0067864D /* AppDelegate.m */; };
-		90F7BA731B0D1DAF0067864D /* FirstViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90F7BA721B0D1DAF0067864D /* FirstViewController.m */; };
-		90F7BA791B0D1DAF0067864D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 90F7BA771B0D1DAF0067864D /* Main.storyboard */; };
-		90F7BA7B1B0D1DAF0067864D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 90F7BA7A1B0D1DAF0067864D /* Images.xcassets */; };
-		90F7BA7E1B0D1DAF0067864D /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 90F7BA7C1B0D1DAF0067864D /* LaunchScreen.xib */; };
 		BE1007951B6038150031CEE7 /* BUYProductVariant+Options.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1007931B6038150031CEE7 /* BUYProductVariant+Options.h */; };
 		BE1007961B6038150031CEE7 /* BUYProductVariant+Options.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1007941B6038150031CEE7 /* BUYProductVariant+Options.m */; };
 		BE10079B1B6165EC0031CEE7 /* BUYOptionValueCell.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1007991B6165EC0031CEE7 /* BUYOptionValueCell.h */; };
@@ -230,8 +222,12 @@
 		BE5DC3A01B71B13700B2BC1E /* NSURL+BUYAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5DC39E1B71B13700B2BC1E /* NSURL+BUYAdditions.h */; };
 		BE5DC3A11B71B13700B2BC1E /* NSURL+BUYAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5DC39F1B71B13700B2BC1E /* NSURL+BUYAdditions.m */; };
 		BE6C07061BB1E46900BD9F7B /* mocked_responses.json in Resources */ = {isa = PBXBuildFile; fileRef = BE6C07051BB1E46900BD9F7B /* mocked_responses.json */; };
-		BE98DB4F1BB1ED3E00C29564 /* OHHTTPStubs in Resources */ = {isa = PBXBuildFile; fileRef = BE98DB4E1BB1ED3E00C29564 /* OHHTTPStubs */; settings = {ASSET_TAGS = (); }; };
+		BE6D05991BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */; };
-		BE98DB5C1BB1F4D000C29564 /* OHHTTPStubsResponse+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE98DB5B1BB1F4D000C29564 /* OHHTTPStubsResponse+Helpers.m */; settings = {ASSET_TAGS = (); }; };
+		BE6D059A1BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */; };
+		BE6D059B1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */; };
+		BE6D059C1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */; };
+		BE98DB4F1BB1ED3E00C29564 /* OHHTTPStubs in Resources */ = {isa = PBXBuildFile; fileRef = BE98DB4E1BB1ED3E00C29564 /* OHHTTPStubs */; };
+		BE98DB5C1BB1F4D000C29564 /* OHHTTPStubsResponse+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE98DB5B1BB1F4D000C29564 /* OHHTTPStubsResponse+Helpers.m */; };
 		BE9A64471B503C8B0033E558 /* BUYClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F7FDA17019C93F6F00AF4E93 /* BUYClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BE9A64481B503C900033E558 /* BUYClient.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FDA17119C93F6F00AF4E93 /* BUYClient.m */; };
 		BE9A64491B503C940033E558 /* BUYCart.h in Headers */ = {isa = PBXBuildFile; fileRef = F773744719C77A210039681C /* BUYCart.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -281,9 +277,6 @@
 		BE9A64751B503D370033E558 /* BUYApplePayHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */; };
 		BE9A64781B503D3F0033E558 /* BUYAddress+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE33B4FA1B177EC80067982B /* BUYAddress+Additions.m */; };
 		BE9A64791B503D420033E558 /* BUYAddress+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE33B4F91B177EC80067982B /* BUYAddress+Additions.h */; };
-		BE9A647A1B503D450033E558 /* BUYCheckout+Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6C5E701B1CF776003AD9D0 /* BUYCheckout+Additions.h */; };
-		BE9A647B1B503D470033E558 /* BUYCheckout+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6C5E711B1CF776003AD9D0 /* BUYCheckout+Additions.m */; };
-		BE9A647D1B503D840033E558 /* Buy.h in Headers */ = {isa = PBXBuildFile; fileRef = 904FB6011AE03D4500EA1758 /* Buy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BE9A647E1B503D930033E558 /* BUYStoreViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1C4DF31AE98FBB00E21624 /* BUYStoreViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BE9A647F1B503D960033E558 /* BUYStoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1C4DF41AE98FBB00E21624 /* BUYStoreViewController.m */; };
 		BE9A64801B503D990033E558 /* BUYViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1C4DF51AE98FBB00E21624 /* BUYViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -331,36 +324,22 @@
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
-		9035F5FE1BC81D280009DD3B /* PBXContainerItemProxy */ = {
+		90DAEC341BC6E50B007555A5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = F773741519C770CB0039681C /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = BE9A64271B503C2F0033E558;
-			remoteInfo = "Buy Static";
+			remoteInfo = Buy;
 		};
-		90DAEC341BC6E50B007555A5 /* PBXContainerItemProxy */ = {
+		90E78A4C1BD58F0C005D16C3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = F773741519C770CB0039681C /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = BE9A64271B503C2F0033E558;
+			remoteGlobalIDString = 901930E11BC5B9BC00D1134E;
 			remoteInfo = Buy;
 		};
 /* End PBXContainerItemProxy section */
-/* Begin PBXCopyFilesBuildPhase section */
-		90F592531B0D569F0026B382 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				9035F5FB1BC81D050009DD3B /* Buy.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
 /* Begin PBXFileReference section */
 		2A54742D1A0AA61600822409 /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; };
 		2AF52A731A700AC80087DB2C /* BUYRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYRuntime.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -398,7 +377,6 @@
 		904606AD1B6BC8D700754173 /* BUYProductImageCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BUYProductImageCollectionViewCell.h; path = "Product View/BUYProductImageCollectionViewCell.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		904606AE1B6BC8D700754173 /* BUYProductImageCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BUYProductImageCollectionViewCell.m; path = "Product View/BUYProductImageCollectionViewCell.m"; sourceTree = "<group>"; };
 		904FB6001AE03D4500EA1758 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Mobile Buy SDK/Info.plist"; sourceTree = "<group>"; };
-		904FB6011AE03D4500EA1758 /* Buy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = Buy.h; path = "Mobile Buy SDK/Static Framework/Buy.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		90516C791B4C589A00E35E45 /* BUYProductViewFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BUYProductViewFooter.h; path = "Product View/BUYProductViewFooter.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		90516C7A1B4C589A00E35E45 /* BUYProductViewFooter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BUYProductViewFooter.m; path = "Product View/BUYProductViewFooter.m"; sourceTree = "<group>"; };
 		90516C851B4C6F7000E35E45 /* BUYProductViewHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BUYProductViewHeader.h; path = "Product View/BUYProductViewHeader.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -453,13 +431,14 @@
 		90BBCD701B87B6AB00FCCE51 /* BUYPKContact.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYPKContact.m; sourceTree = "<group>"; };
 		90BC07F51AE043FD005D1195 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		90BC07F71AE0440F005D1195 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
-		90DA8DF11BC6A82D0027BCB7 /* Buy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Buy.h; sourceTree = "<group>"; };
+		90C856B71BD6B19D00936926 /* Buy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Buy.h; path = "Mobile Buy SDK/Static Framework/Buy.h"; sourceTree = "<group>"; };
+		90C856B81BD6B19D00936926 /* Buy.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = Buy.modulemap; path = "Mobile Buy SDK/Static Framework/Buy.modulemap"; sourceTree = "<group>"; };
+		90DA8DF11BC6A82D0027BCB7 /* Buy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Buy.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		90DE926E1B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYVariantOptionBreadCrumbsView.h; sourceTree = "<group>"; };
 		90DE926F1B9897B6002EF4DA /* BUYVariantOptionBreadCrumbsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYVariantOptionBreadCrumbsView.m; sourceTree = "<group>"; };
 		90E80E461AFBBB68003A9909 /* AppledocSettings.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppledocSettings.plist; path = docs/AppledocSettings.plist; sourceTree = "<group>"; };
 		90E83BC21B9F550E00C95A1B /* BUYOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYOrder.h; sourceTree = "<group>"; };
 		90E83BC31B9F550E00C95A1B /* BUYOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOrder.m; sourceTree = "<group>"; };
-		90EC38551B598DE1005C6B21 /* Playground.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Playground.entitlements; sourceTree = "<group>"; };
 		90F592EC1B0D5EFE0026B382 /* Mobile Buy SDK Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Mobile Buy SDK Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		90F592EF1B0D5EFE0026B382 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		90F592F81B0D5F4C0026B382 /* BUYIntegrationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYIntegrationTest.m; sourceTree = "<group>"; };
@@ -471,16 +450,6 @@
 		90F592FE1B0D5F4C0026B382 /* BUYLineItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYLineItemTest.m; sourceTree = "<group>"; };
 		90F592FF1B0D5F4C0026B382 /* BUYObjectTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYObjectTests.m; sourceTree = "<group>"; };
 		90F593001B0D5F4C0026B382 /* BUYTestConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYTestConstants.h; sourceTree = "<group>"; };
-		90F7BA681B0D1DAF0067864D /* Playground.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Playground.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		90F7BA6B1B0D1DAF0067864D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		90F7BA6C1B0D1DAF0067864D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = main.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
-		90F7BA6E1B0D1DAF0067864D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AppDelegate.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		90F7BA6F1B0D1DAF0067864D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		90F7BA711B0D1DAF0067864D /* FirstViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = FirstViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		90F7BA721B0D1DAF0067864D /* FirstViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FirstViewController.m; sourceTree = "<group>"; };
-		90F7BA781B0D1DAF0067864D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		90F7BA7A1B0D1DAF0067864D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
-		90F7BA7D1B0D1DAF0067864D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		90FC31A61B50371600AFAB51 /* BUYProductViewHeaderBackgroundImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BUYProductViewHeaderBackgroundImageView.h; path = "Product View/BUYProductViewHeaderBackgroundImageView.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		90FC31A71B50371600AFAB51 /* BUYProductViewHeaderBackgroundImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BUYProductViewHeaderBackgroundImageView.m; path = "Product View/BUYProductViewHeaderBackgroundImageView.m"; sourceTree = "<group>"; };
 		BE1007931B6038150031CEE7 /* BUYProductVariant+Options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BUYProductVariant+Options.h"; sourceTree = "<group>"; };
@@ -505,8 +474,8 @@
 		BE5DC39F1B71B13700B2BC1E /* NSURL+BUYAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+BUYAdditions.m"; sourceTree = "<group>"; };
 		BE6C07031BB1DE1D00BD9F7B /* OHHTTPStubs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OHHTTPStubs.framework; path = "Mobile Buy SDK Tests/OHHTTPStubs.framework"; sourceTree = "<group>"; };
 		BE6C07051BB1E46900BD9F7B /* mocked_responses.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = mocked_responses.json; sourceTree = "<group>"; };
-		BE6C5E701B1CF776003AD9D0 /* BUYCheckout+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BUYCheckout+Additions.h"; sourceTree = "<group>"; };
+		BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Additions.h"; sourceTree = "<group>"; };
-		BE6C5E711B1CF776003AD9D0 /* BUYCheckout+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BUYCheckout+Additions.m"; sourceTree = "<group>"; };
+		BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Additions.m"; sourceTree = "<group>"; };
 		BE9496681B45CCF400B38949 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
 		BE9496AE1B4D96D800B38949 /* BUYOptionSelectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BUYOptionSelectionViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		BE9496AF1B4D96D800B38949 /* BUYOptionSelectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYOptionSelectionViewController.m; sourceTree = "<group>"; };
@@ -524,7 +493,6 @@
 		BEB74A201B554BF20005A300 /* BUYPresentationControllerForVariantSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BUYPresentationControllerForVariantSelection.m; path = "Mobile Buy SDK/Product View/Variant Selection/BUYPresentationControllerForVariantSelection.m"; sourceTree = SOURCE_ROOT; };
 		BEB74A251B554BFB0005A300 /* BUYOptionSelectionNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BUYOptionSelectionNavigationController.h; path = "Mobile Buy SDK/Product View/Variant Selection/BUYOptionSelectionNavigationController.h"; sourceTree = SOURCE_ROOT; };
 		BEB74A261B554BFB0005A300 /* BUYOptionSelectionNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BUYOptionSelectionNavigationController.m; path = "Mobile Buy SDK/Product View/Variant Selection/BUYOptionSelectionNavigationController.m"; sourceTree = SOURCE_ROOT; };
-		BEB74A7F1B557A1C0005A300 /* Buy.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; lineEnding = 0; name = Buy.modulemap; path = "Mobile Buy SDK/Static Framework/Buy.modulemap"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = "xcode.lang.module-map"; };
 		BEB74A861B5589C80005A300 /* BUYCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYCollection.h; sourceTree = "<group>"; };
 		BEB74A871B5589C80005A300 /* BUYCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BUYCollection.m; sourceTree = "<group>"; };
 		BEB74A8E1B55A3D00005A300 /* BUYCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BUYCollection.h; sourceTree = "<group>"; };
@@ -570,14 +538,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		90F7BA651B0D1DAF0067864D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9035F5FA1BC81D050009DD3B /* Buy.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		BE9A64241B503C2F0033E558 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -657,31 +617,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		90F7BA691B0D1DAF0067864D /* Playground */ = {
-			isa = PBXGroup;
-			children = (
-				90EC38551B598DE1005C6B21 /* Playground.entitlements */,
-				90F7BA6E1B0D1DAF0067864D /* AppDelegate.h */,
-				90F7BA6F1B0D1DAF0067864D /* AppDelegate.m */,
-				90F7BA711B0D1DAF0067864D /* FirstViewController.h */,
-				90F7BA721B0D1DAF0067864D /* FirstViewController.m */,
-				90F7BA771B0D1DAF0067864D /* Main.storyboard */,
-				90F7BA7A1B0D1DAF0067864D /* Images.xcassets */,
-				90F7BA7C1B0D1DAF0067864D /* LaunchScreen.xib */,
-				90F7BA6A1B0D1DAF0067864D /* Supporting Files */,
-			);
-			path = Playground;
-			sourceTree = "<group>";
-		};
-		90F7BA6A1B0D1DAF0067864D /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				90F7BA6B1B0D1DAF0067864D /* Info.plist */,
-				90F7BA6C1B0D1DAF0067864D /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		90FC31AA1B50576400AFAB51 /* Variant Selection */ = {
 			isa = PBXGroup;
 			children = (
@@ -784,7 +719,6 @@
 				F773743A19C777200039681C /* Mobile Buy SDK */,
 				90F592ED1B0D5EFE0026B382 /* Mobile Buy SDK Tests */,
 				F773741E19C770CB0039681C /* Products */,
-				90F7BA691B0D1DAF0067864D /* Playground */,
 				547B8D0CCDB9458C800F1E3C /* Frameworks */,
 			);
 			sourceTree = "<group>";
@@ -793,7 +727,6 @@
 		F773741E19C770CB0039681C /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				90F7BA681B0D1DAF0067864D /* Playground.app */,
 				90F592EC1B0D5EFE0026B382 /* Mobile Buy SDK Tests.xctest */,
 				BE9A64281B503C2F0033E558 /* Buy.framework */,
 				901931701BC5B9BC00D1134E /* Buy.framework */,
@@ -874,8 +807,6 @@
 				F70CE40E1A8BF1D90055BEB8 /* BUYApplePayAdditions.m */,
 				BE33B4ED1B15FF4D0067982B /* BUYApplePayHelpers.h */,
 				BE33B4EE1B15FF4D0067982B /* BUYApplePayHelpers.m */,
-				BE6C5E701B1CF776003AD9D0 /* BUYCheckout+Additions.h */,
-				BE6C5E711B1CF776003AD9D0 /* BUYCheckout+Additions.m */,
 				909944471B71B76800C40A33 /* UIFont+BUYAdditions.h */,
 				909944481B71B76800C40A33 /* UIFont+BUYAdditions.m */,
 				900E7C811B5DA32F006F3C81 /* BUYImageKit.h */,
@@ -896,6 +827,8 @@
 				F76CFF1C19CB7BE30079C703 /* NSString+Trim.m */,
 				BE5DC39E1B71B13700B2BC1E /* NSURL+BUYAdditions.h */,
 				BE5DC39F1B71B13700B2BC1E /* NSURL+BUYAdditions.m */,
+				BE6D05971BD6BA6700772EBB /* NSDictionary+Additions.h */,
+				BE6D05981BD6BA6700772EBB /* NSDictionary+Additions.m */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -903,8 +836,8 @@
 		F773749E19C77E460039681C /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				BEB74A7F1B557A1C0005A300 /* Buy.modulemap */,
+				90C856B71BD6B19D00936926 /* Buy.h */,
-				904FB6011AE03D4500EA1758 /* Buy.h */,
+				90C856B81BD6B19D00936926 /* Buy.modulemap */,
 				F773743619C771D10039681C /* LICENSE */,
 				90B043AF1B0D380D006CA6FC /* README.md */,
 				904FB6001AE03D4500EA1758 /* Info.plist */,
@@ -953,7 +886,7 @@
 				9019312D1BC5B9BC00D1134E /* BUYTheme.h in Headers */,
 				9019312E1BC5B9BC00D1134E /* BUYProductDescriptionCell.h in Headers */,
 				9019312F1BC5B9BC00D1134E /* BUYLineItem.h in Headers */,
-				901931301BC5B9BC00D1134E /* BUYCheckout+Additions.h in Headers */,
+				90C856B51BD6B0F300936926 /* Buy.h in Headers */,
 				901931311BC5B9BC00D1134E /* BUYProductViewHeaderOverlay.h in Headers */,
 				901931321BC5B9BC00D1134E /* NSString+Trim.h in Headers */,
 				901931331BC5B9BC00D1134E /* BUYAddress+Additions.h in Headers */,
@@ -979,6 +912,7 @@
 				901931471BC5B9BC00D1134E /* BUYPaymentButton.h in Headers */,
 				901931481BC5B9BC00D1134E /* BUYImageView.h in Headers */,
 				901931491BC5B9BC00D1134E /* BUYGiftCard.h in Headers */,
+				BE6D059A1BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */,
 				9019314A1BC5B9BC00D1134E /* BUYClient+Test.h in Headers */,
 				9019314B1BC5B9BC00D1134E /* BUYNavigationController.h in Headers */,
 				9019314C1BC5B9BC00D1134E /* NSURL+BUYAdditions.h in Headers */,
@@ -986,7 +920,6 @@
 				9019314E1BC5B9BC00D1134E /* BUYProductViewFooter.h in Headers */,
 				9019314F1BC5B9BC00D1134E /* BUYOptionSelectionViewController.h in Headers */,
 				901931501BC5B9BC00D1134E /* BUYOrder.h in Headers */,
-				901931511BC5B9BC00D1134E /* Buy.h in Headers */,
 				901931521BC5B9BC00D1134E /* NSDate+BUYAdditions.h in Headers */,
 				901931531BC5B9BC00D1134E /* BUYOptionSelectionNavigationController.h in Headers */,
 				901931541BC5B9BC00D1134E /* BUYPresentationControllerWithNavigationController.h in Headers */,
@@ -1028,7 +961,6 @@
 				BEB74A2B1B554C150005A300 /* BUYTheme.h in Headers */,
 				BEB74A6B1B55641B0005A300 /* BUYProductDescriptionCell.h in Headers */,
 				BE9A645B1B503CDC0033E558 /* BUYLineItem.h in Headers */,
-				BE9A647A1B503D450033E558 /* BUYCheckout+Additions.h in Headers */,
 				907874991B7276BA0023775B /* BUYProductViewHeaderOverlay.h in Headers */,
 				BE9A64721B503D290033E558 /* NSString+Trim.h in Headers */,
 				BE9A64791B503D420033E558 /* BUYAddress+Additions.h in Headers */,
@@ -1050,10 +982,12 @@
 				BEB74A731B5564350005A300 /* BUYProductViewHeader.h in Headers */,
 				BEB74A751B55643B0005A300 /* BUYProductViewHeaderBackgroundImageView.h in Headers */,
 				909944491B71B76800C40A33 /* UIFont+BUYAdditions.h in Headers */,
+				90C856B61BD6B0F400936926 /* Buy.h in Headers */,
 				900396B01B67BD0A00226B73 /* BUYCheckoutButton.h in Headers */,
 				BE9A64821B503DAD0033E558 /* BUYPaymentButton.h in Headers */,
 				BEB74A771B55646D0005A300 /* BUYImageView.h in Headers */,
 				BE9A64571B503CCC0033E558 /* BUYGiftCard.h in Headers */,
+				BE6D05991BD6BA6700772EBB /* NSDictionary+Additions.h in Headers */,
 				BE2E1D3A1B5E8663009610DA /* BUYClient+Test.h in Headers */,
 				BEB74A671B55640C0005A300 /* BUYNavigationController.h in Headers */,
 				BE5DC3A01B71B13700B2BC1E /* NSURL+BUYAdditions.h in Headers */,
@@ -1061,7 +995,6 @@
 				BEB74A711B5564300005A300 /* BUYProductViewFooter.h in Headers */,
 				BEB74A791B5564790005A300 /* BUYOptionSelectionViewController.h in Headers */,
 				90E83BC41B9F550E00C95A1B /* BUYOrder.h in Headers */,
-				BE9A647D1B503D840033E558 /* Buy.h in Headers */,
 				90A446211B5E8614009602AA /* NSDate+BUYAdditions.h in Headers */,
 				BEB74A281B554BFB0005A300 /* BUYOptionSelectionNavigationController.h in Headers */,
 				BEB74A691B5564160005A300 /* BUYPresentationControllerWithNavigationController.h in Headers */,
@@ -1129,25 +1062,6 @@
 			productReference = 90F592EC1B0D5EFE0026B382 /* Mobile Buy SDK Tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		90F7BA671B0D1DAF0067864D /* Playground */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 90F7BA8B1B0D1DAF0067864D /* Build configuration list for PBXNativeTarget "Playground" */;
-			buildPhases = (
-				90F7BA641B0D1DAF0067864D /* Sources */,
-				90F7BA651B0D1DAF0067864D /* Frameworks */,
-				90F7BA661B0D1DAF0067864D /* Resources */,
-				90F592531B0D569F0026B382 /* Embed Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				9035F5FF1BC81D280009DD3B /* PBXTargetDependency */,
-			);
-			name = Playground;
-			productName = Playground;
-			productReference = 90F7BA681B0D1DAF0067864D /* Playground.app */;
-			productType = "com.apple.product-type.application";
-		};
 		BE9A64271B503C2F0033E558 /* Buy Static */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = BE9A64411B503C2F0033E558 /* Build configuration list for PBXNativeTarget "Buy Static" */;
@@ -1185,14 +1099,6 @@
 					90F592EB1B0D5EFE0026B382 = {
 						CreatedOnToolsVersion = 6.3.2;
 					};
-					90F7BA671B0D1DAF0067864D = {
-						CreatedOnToolsVersion = 6.3.2;
-						SystemCapabilities = {
-							com.apple.OMC = {
-								enabled = 1;
-							};
-						};
-					};
 					BE9A64271B503C2F0033E558 = {
 						CreatedOnToolsVersion = 6.4;
 					};
@@ -1213,7 +1119,6 @@
 			targets = (
 				904FB61A1AE03DC500EA1758 /* Static Universal Framework */,
 				90E80E401AFAB0B9003A9909 /* Documentation */,
-				90F7BA671B0D1DAF0067864D /* Playground */,
 				90F592EB1B0D5EFE0026B382 /* Mobile Buy SDK Tests */,
 				BE9A64271B503C2F0033E558 /* Buy Static */,
 				901930E11BC5B9BC00D1134E /* Buy */,
@@ -1229,16 +1134,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		90F7BA661B0D1DAF0067864D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				90F7BA791B0D1DAF0067864D /* Main.storyboard in Resources */,
-				90F7BA7E1B0D1DAF0067864D /* LaunchScreen.xib in Resources */,
-				90F7BA7B1B0D1DAF0067864D /* Images.xcassets in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		BE9A64261B503C2F0033E558 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1302,10 +1197,10 @@
 				901930EA1BC5B9BC00D1134E /* BUYProductViewController.m in Sources */,
 				901930EB1BC5B9BC00D1134E /* NSDateFormatter+BUYAdditions.m in Sources */,
 				901930EC1BC5B9BC00D1134E /* BUYError.m in Sources */,
+				BE6D059C1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */,
 				901930ED1BC5B9BC00D1134E /* BUYProductViewHeader.m in Sources */,
 				901930EE1BC5B9BC00D1134E /* BUYNavigationController.m in Sources */,
 				901930EF1BC5B9BC00D1134E /* BUYVariantSelectionViewController.m in Sources */,
-				901930F01BC5B9BC00D1134E /* BUYCheckout+Additions.m in Sources */,
 				901930F11BC5B9BC00D1134E /* NSString+Trim.m in Sources */,
 				901930F21BC5B9BC00D1134E /* BUYOrder.m in Sources */,
 				901930F31BC5B9BC00D1134E /* BUYAddress+Additions.m in Sources */,
@@ -1382,16 +1277,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		90F7BA641B0D1DAF0067864D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				90F7BA701B0D1DAF0067864D /* AppDelegate.m in Sources */,
-				90F7BA731B0D1DAF0067864D /* FirstViewController.m in Sources */,
-				90F7BA6D1B0D1DAF0067864D /* main.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		BE9A64231B503C2F0033E558 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1406,10 +1291,10 @@
 				BEB74A2E1B554E8B0005A300 /* BUYProductViewController.m in Sources */,
 				90A446261B5EC03F009602AA /* NSDateFormatter+BUYAdditions.m in Sources */,
 				BE4734101B66C4EF00AA721A /* BUYError.m in Sources */,
+				BE6D059B1BD6BA6700772EBB /* NSDictionary+Additions.m in Sources */,
 				BEB74A741B5564380005A300 /* BUYProductViewHeader.m in Sources */,
 				BEB74A681B55640F0005A300 /* BUYNavigationController.m in Sources */,
 				BEB74A7E1B5564890005A300 /* BUYVariantSelectionViewController.m in Sources */,
-				BE9A647B1B503D470033E558 /* BUYCheckout+Additions.m in Sources */,
 				BE9A64731B503D2C0033E558 /* NSString+Trim.m in Sources */,
 				90E83BC51B9F550E00C95A1B /* BUYOrder.m in Sources */,
 				BE9A64781B503D3F0033E558 /* BUYAddress+Additions.m in Sources */,
@@ -1468,36 +1353,17 @@
 /* End PBXSourcesBuildPhase section */
 /* Begin PBXTargetDependency section */
-		9035F5FF1BC81D280009DD3B /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = BE9A64271B503C2F0033E558 /* Buy Static */;
-			targetProxy = 9035F5FE1BC81D280009DD3B /* PBXContainerItemProxy */;
-		};
 		90DAEC351BC6E50B007555A5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = BE9A64271B503C2F0033E558 /* Buy Static */;
 			targetProxy = 90DAEC341BC6E50B007555A5 /* PBXContainerItemProxy */;
 		};
-/* End PBXTargetDependency section */
+		90E78A4D1BD58F0C005D16C3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
-/* Begin PBXVariantGroup section */
+			target = 901930E11BC5B9BC00D1134E /* Buy */;
-		90F7BA771B0D1DAF0067864D /* Main.storyboard */ = {
+			targetProxy = 90E78A4C1BD58F0C005D16C3 /* PBXContainerItemProxy */;
-			isa = PBXVariantGroup;
-			children = (
-				90F7BA781B0D1DAF0067864D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		90F7BA7C1B0D1DAF0067864D /* LaunchScreen.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				90F7BA7D1B0D1DAF0067864D /* Base */,
-			);
-			name = LaunchScreen.xib;
-			sourceTree = "<group>";
 		};
-/* End PBXVariantGroup section */
+/* End PBXTargetDependency section */
 /* Begin XCBuildConfiguration section */
 		9019316E1BC5B9BC00D1134E /* Debug */ = {
@@ -1506,7 +1372,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.2.2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1538,7 +1404,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.2.2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1652,58 +1518,13 @@
 			};
 			name = Release;
 		};
-		90F7BA8C1B0D1DAF0067864D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = Playground/Playground.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = Playground/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = "-all_load";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		90F7BA8D1B0D1DAF0067864D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = Playground/Playground.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = Playground/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = "-all_load";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
 		BE9A64421B503C2F0033E558 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.2.2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1735,7 +1556,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.2.2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1877,15 +1698,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		90F7BA8B1B0D1DAF0067864D /* Build configuration list for PBXNativeTarget "Playground" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				90F7BA8C1B0D1DAF0067864D /* Debug */,
-				90F7BA8D1B0D1DAF0067864D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		BE9A64411B503C2F0033E558 /* Build configuration list for PBXNativeTarget "Buy Static" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

--- a/Mobile Buy SDK/Mobile Buy SDK.xcodeproj/xcshareddata/xcschemes/Playground.xcscheme
+++ b/Mobile Buy SDK/Mobile Buy SDK.xcodeproj/xcshareddata/xcschemes/Playground.xcscheme
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0700"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "90F7BA671B0D1DAF0067864D"
-               BuildableName = "Playground.app"
-               BlueprintName = "Playground"
-               ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "90F592401B0D569F0026B382"
-               BuildableName = "BuyTests.xctest"
-               BlueprintName = "BuyTests"
-               ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "90F592A61B0D585D0026B382"
-               BuildableName = "TESTTests.xctest"
-               BlueprintName = "TESTTests"
-               ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "90F592401B0D569F0026B382"
-               BuildableName = "BuyTests.xctest"
-               BlueprintName = "BuyTests"
-               ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "90F592A61B0D585D0026B382"
-               BuildableName = "TESTTests.xctest"
-               BlueprintName = "TESTTests"
-               ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "90F7BA671B0D1DAF0067864D"
-            BuildableName = "Playground.app"
-            BlueprintName = "Playground"
-            ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "90F7BA671B0D1DAF0067864D"
-            BuildableName = "Playground.app"
-            BlueprintName = "Playground"
-            ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "90F7BA671B0D1DAF0067864D"
-            BuildableName = "Playground.app"
-            BlueprintName = "Playground"
-            ReferencedContainer = "container:Mobile Buy SDK.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
--- a/Mobile Buy SDK/Mobile Buy SDK/Buy.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Buy.h
@@ -24,36 +24,40 @@
 //  THE SOFTWARE.
 //
-/**
+#import <UIKit/UIKit.h>
- *  Umbrella header used for Cocoapods
- */
-#import "BUYApplePayAdditions.h"
+//! Project version number for Buy.
-#import "BUYApplePayHelpers.h"
+FOUNDATION_EXPORT double BuyVersionNumber;
-#import "BUYAddress.h"
-#import "BUYCart.h"
+//! Project version string for Buy.
-#import "BUYCartLineItem.h"
+FOUNDATION_EXPORT const unsigned char BuyVersionString[];
-#import "BUYCheckout.h"
-#import "BUYClient+Test.h"
+#import <Buy/BUYAddress.h>
-#import "BUYClient.h"
+#import <Buy/BUYCart.h>
-#import "BUYCollection.h"
+#import <Buy/BUYCheckout.h>
-#import "BUYCreditCard.h"
+#import <Buy/BUYCreditCard.h>
-#import "BUYDiscount.h"
+#import <Buy/BUYDiscount.h>
-#import "BUYError.h"
+#import <Buy/BUYGiftCard.h>
-#import "BUYGiftCard.h"
+#import <Buy/BUYLineItem.h>
-#import "BUYImage.h"
+#import <Buy/BUYClient.h>
-#import "BUYLineItem.h"
+#import <Buy/BUYClient+Test.h>
-#import "BUYMaskedCreditCard.h"
+#import <Buy/BUYImage.h>
-#import "BUYOption.h"
+#import <Buy/BUYOption.h>
-#import "BUYOptionValue.h"
+#import <Buy/BUYOptionValue.h>
-#import "BUYOrder.h"
+#import <Buy/BUYOrder.h>
-#import "BUYPaymentButton.h"
+#import <Buy/BUYProduct.h>
-#import "BUYProduct.h"
+#import <Buy/BUYProductVariant.h>
-#import "BUYProductVariant.h"
+#import <Buy/BUYShippingRate.h>
-#import "BUYProductViewController.h"
+#import <Buy/BUYShop.h>
-#import "BUYShippingRate.h"
+#import <Buy/BUYStoreViewController.h>
-#import "BUYShop.h"
+#import <Buy/BUYTaxLine.h>
-#import "BUYStoreViewController.h"
+#import <Buy/BUYViewController.h>
-#import "BUYTaxLine.h"
+#import <Buy/BUYApplePayAdditions.h>
-#import "BUYTheme.h"
+#import <Buy/BUYApplePayHelpers.h>
-#import "BUYViewController.h"
+#import <Buy/BUYPaymentButton.h>
+#import <Buy/BUYProductViewController.h>
+#import <Buy/BUYTheme.h>
+#import <Buy/BUYCartLineItem.h>
+#import <Buy/BUYCollection.h>
+#import <Buy/BUYMaskedCreditCard.h>
+#import <Buy/BUYError.h>
--- a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient.m
@@ -33,7 +33,6 @@
 #import "BUYProduct.h"
 #import "BUYShippingRate.h"
 #import "BUYShop.h"
-#import "BUYCheckout+Additions.h"
 #import "BUYCheckout_Private.h"
 #import "NSDecimalNumber+BUYAdditions.h"
 #import "BUYError.h"
@@ -54,7 +53,7 @@
 #define kMinSuccessfulStatusCode 200
 #define kMaxSuccessfulStatusCode 299
-NSString * const BUYVersionString = @"1.2.1";
+NSString * const BUYVersionString = @"1.2.2";
 @interface BUYClient () <NSURLSessionDelegate>
@@ -252,7 +251,7 @@ NSString * const BUYVersionString = @"1.2.1";
 	// Inject channel and marketing attributions
 	[self configureCheckout:checkout];
-	NSDictionary *json = [checkout jsonDictionaryForUpdatingCheckout];
+	NSDictionary *json = [checkout jsonDictionaryForCheckout];
 	return [self postCheckout:json completion:block];
 }
@@ -261,7 +260,7 @@ NSString * const BUYVersionString = @"1.2.1";
 	BUYCheckout *checkout = [[BUYCheckout alloc] initWithCartToken:cartToken];
 	[self configureCheckout:checkout];
-	NSDictionary *json = [checkout jsonDictionaryForUpdatingCheckout];
+	NSDictionary *json = [checkout jsonDictionaryForCheckout];
 	return [self postCheckout:json completion:block];
 }
@@ -343,7 +342,7 @@ NSString * const BUYVersionString = @"1.2.1";
 - (NSURLSessionDataTask *)updateCheckout:(BUYCheckout *)checkout completion:(BUYDataCheckoutBlock)block
 {
-	NSDictionary *json = [checkout jsonDictionaryForUpdatingCheckout];
+	NSDictionary *json = [checkout jsonDictionaryForCheckout];
 	NSData *data = [NSJSONSerialization dataWithJSONObject:json options:0 error:nil];
 	NSURLSessionDataTask *task = nil;

--- a/Mobile Buy SDK/Mobile Buy SDK/Info.plist
+++ b/Mobile Buy SDK/Mobile Buy SDK/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYAddress.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYAddress.m
@@ -26,6 +26,7 @@
 #import "BUYAddress.h"
 #import "NSString+Trim.h"
+#import "NSDictionary+Additions.h"
 @implementation BUYAddress
@@ -41,8 +42,8 @@
 	self.country = dictionary[@"country"];
 	self.countryCode = dictionary[@"country_code"];
-	self.province = dictionary[@"province"];
+	self.province = [dictionary buy_objectForKey:@"province"];
-	self.provinceCode = dictionary[@"province_code"];
+	self.provinceCode = [dictionary buy_objectForKey:@"province_code"];
 	self.zip = dictionary[@"zip"];
 }

--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h
@@ -249,6 +249,11 @@
 @property (nonatomic, strong, readonly) BUYOrder *order;
 /**
+ *  Flag used to inform server that the shipping address is partially filled, suitable to retrieve shipping rates
+ */
+@property (nonatomic, assign) BOOL partialAddresses;
+/**
 *  It is recommended to instantiate a checkout with a cart, or cart token
 *
 *  @return Checkout

--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m
@@ -41,6 +41,7 @@
 #import "BUYCheckout_Private.h"
 #import "NSDateFormatter+BUYAdditions.h"
 #import "NSURL+BUYAdditions.h"
+#import "NSDictionary+Additions.h"
 @implementation BUYCheckout
@@ -159,7 +160,7 @@
 	self.createdAtDate = [dateFormatter dateFromString:dictionary[@"created_at"]];
 	self.updatedAtDate = [dateFormatter dateFromString:dictionary[@"updated_at"]];
 	self.creditCard = [BUYMaskedCreditCard convertObject:dictionary[@"credit_card"]];
-	self.customerId = [dictionary[@"customer_id"] copy];
+	self.customerId = [dictionary buy_objectForKey:@"customer_id"];
 	self.note = dictionary[@"note"];
 	self.privacyPolicyURL = [NSURL buy_urlWithString:dictionary[@"privacy_policy_url"]];

--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCollection.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCollection.m
@@ -27,6 +27,7 @@
 #import "BUYCollection.h"
 #import "NSDateFormatter+BUYAdditions.h"
 #import "NSURL+BUYAdditions.h"	
+#import "NSDictionary+Additions.h"
 @interface BUYCollection ()
 @property (nonatomic, strong) NSString *title;
@@ -44,7 +45,7 @@
 	_title = dictionary[@"title"];
 	_htmlDescription = dictionary[@"body_html"];
-	_imageURL = [dictionary[@"image"] isKindOfClass:[NSNull class]] ? nil : [NSURL buy_urlWithString:dictionary[@"image"][@"src"]];
+	_imageURL = [NSURL buy_urlWithString:[dictionary buy_objectForKey:@"image"][@"src"]];
 	_handle = dictionary[@"handle"];
 	_published = [dictionary[@"published"] boolValue];
 	_collectionId = dictionary[@"collection_id"];

--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYOrder.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYOrder.m
@@ -26,6 +26,7 @@
 #import "BUYOrder.h"
 #import "NSURL+BUYAdditions.h"
+#import "NSDictionary+Additions.h"
 @interface BUYOrder ()
@@ -42,7 +43,7 @@
 	[super updateWithDictionary:dictionary];
 	NSString *statusURLString = dictionary[@"status_url"];
 	self.statusURL = [NSURL buy_urlWithString:statusURLString];
-	self.name = [dictionary[@"name"] isKindOfClass:[NSNull class]] ? nil : dictionary[@"name"];
+	self.name = [dictionary buy_objectForKey:@"name"];
 }
 @end
--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYProduct.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYProduct.m
@@ -29,6 +29,7 @@
 #import "BUYProduct.h"
 #import "BUYProductVariant.h"
 #import "NSDateFormatter+BUYAdditions.h"
+#import "NSDictionary+Additions.h"
 @implementation BUYProduct
@@ -46,7 +47,7 @@
 	}];
 	_images = [BUYImage convertJSONArray:dictionary[@"images"]];
 	_options = [BUYOption convertJSONArray:dictionary[@"options"]];
-	_htmlDescription = [dictionary[@"body_html"] isKindOfClass:[NSNull class]] ? nil : dictionary[@"body_html"];
+	_htmlDescription = [dictionary buy_objectForKey:@"body_html"];
 	_available = [dictionary[@"available"] boolValue];
 	_published = [dictionary[@"published"] boolValue];
 	NSDateFormatter *dateFormatter = [NSDateFormatter dateFormatterForPublications];

--- a/Mobile Buy SDK/Mobile Buy SDK/Static Framework/Buy.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Static Framework/Buy.h
@@ -24,40 +24,36 @@
 //  THE SOFTWARE.
 //
-#import <UIKit/UIKit.h>
+/**
+ *  Umbrella header used for Cocoapods
+ */
-//! Project version number for BuyDynamic.
+#import "BUYApplePayAdditions.h"
-FOUNDATION_EXPORT double BuyDynamicVersionNumber;
+#import "BUYApplePayHelpers.h"
+#import "BUYAddress.h"
-//! Project version string for BuyDynamic.
+#import "BUYCart.h"
-FOUNDATION_EXPORT const unsigned char BuyDynamicVersionString[];
+#import "BUYCartLineItem.h"
+#import "BUYCheckout.h"
-#import <Buy/BUYAddress.h>
+#import "BUYClient+Test.h"
-#import <Buy/BUYCart.h>
+#import "BUYClient.h"
-#import <Buy/BUYCheckout.h>
+#import "BUYCollection.h"
-#import <Buy/BUYCreditCard.h>
+#import "BUYCreditCard.h"
-#import <Buy/BUYDiscount.h>
+#import "BUYDiscount.h"
-#import <Buy/BUYGiftCard.h>
+#import "BUYError.h"
-#import <Buy/BUYLineItem.h>
+#import "BUYGiftCard.h"
-#import <Buy/BUYClient.h>
+#import "BUYImage.h"
-#import <Buy/BUYClient+Test.h>
+#import "BUYLineItem.h"
-#import <Buy/BUYImage.h>
+#import "BUYMaskedCreditCard.h"
-#import <Buy/BUYOption.h>
+#import "BUYOption.h"
-#import <Buy/BUYOptionValue.h>
+#import "BUYOptionValue.h"
-#import <Buy/BUYOrder.h>
+#import "BUYOrder.h"
-#import <Buy/BUYProduct.h>
+#import "BUYPaymentButton.h"
-#import <Buy/BUYProductVariant.h>
+#import "BUYProduct.h"
-#import <Buy/BUYShippingRate.h>
+#import "BUYProductVariant.h"
-#import <Buy/BUYShop.h>
+#import "BUYProductViewController.h"
-#import <Buy/BUYStoreViewController.h>
+#import "BUYShippingRate.h"
-#import <Buy/BUYTaxLine.h>
+#import "BUYShop.h"
-#import <Buy/BUYViewController.h>
+#import "BUYStoreViewController.h"
-#import <Buy/BUYApplePayAdditions.h>
+#import "BUYTaxLine.h"
-#import <Buy/BUYApplePayHelpers.h>
+#import "BUYTheme.h"
-#import <Buy/BUYPaymentButton.h>
+#import "BUYViewController.h"
-#import <Buy/BUYProductViewController.h>
-#import <Buy/BUYTheme.h>
-#import <Buy/BUYCartLineItem.h>
-#import <Buy/BUYCollection.h>
-#import <Buy/BUYMaskedCreditCard.h>
-#import <Buy/BUYError.h>
--- a/Mobile Buy SDK/Mobile Buy SDK/Static Framework/Buy.modulemap
+++ b/Mobile Buy SDK/Mobile Buy SDK/Static Framework/Buy.modulemap
-//  Buy.modedulemap
 //
+//  Buy.modulemap
 //  Mobile Buy SDK
 //
 //  Created by Shopify.

--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYAddress+Additions.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYAddress+Additions.h
@@ -27,8 +27,6 @@
 @import Foundation;
 #import "BUYAddress.h"
-extern NSString * const BUYPartialAddressPlaceholder;
 @interface BUYAddress (Additions)
 /**

--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYAddress+Additions.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYAddress+Additions.m
@@ -26,16 +26,14 @@
 #import "BUYAddress+Additions.h"
-NSString * const BUYPartialAddressPlaceholder = @"---";
 @implementation BUYAddress (Additions)
 - (BOOL)isPartialAddress
 {
-	if ([self.address1 isEqualToString:BUYPartialAddressPlaceholder] ||
+	if (self.address1.length == 0 ||
-		[self.firstName isEqualToString:BUYPartialAddressPlaceholder] ||
+		self.firstName.length == 0 ||
-		[self.lastName isEqualToString:BUYPartialAddressPlaceholder]) {
+		self.lastName.length == 0) {
 		return YES;
 	}

--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayAdditions.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayAdditions.m
@@ -47,7 +47,7 @@
 	if (hasDiscount || [self.lineItems count] > 1) {
 		NSDecimalNumber *lineItemSubtotal = [NSDecimalNumber zero];
 		for (BUYLineItem *lineItem in self.lineItems) {
-			lineItemSubtotal = [lineItemSubtotal decimalNumberByAdding:lineItem.price];
+			lineItemSubtotal = [lineItemSubtotal decimalNumberByAdding:lineItem.linePrice];
 		}
 		[summaryItems addObject:[PKPaymentSummaryItem summaryItemWithLabel:@"CART TOTAL" amount:lineItemSubtotal]];
 	}
@@ -143,14 +143,7 @@
 	//Grab the simple information
 	address.firstName = (__bridge_transfer NSString *)ABRecordCopyValue(record, kABPersonFirstNameProperty);
-	if ([address.firstName length] == 0) {
-		address.firstName = BUYPartialAddressPlaceholder;
-	}
 	address.lastName = (__bridge_transfer NSString *)ABRecordCopyValue(record, kABPersonLastNameProperty);
-	if ([[address lastName] length] == 0) {
-		address.lastName = BUYPartialAddressPlaceholder;
-	}
 	//Grab the address information
 	ABMultiValueRef addressMultiValue = ABRecordCopyValue(record, kABPersonAddressProperty);
@@ -160,10 +153,6 @@
 		//NOTE: We do not receive an address1 line right now via this partial address, as Apple deemds it unimportant to calculate the shipping rates. We get the actual address later on in a later step.
 		address.address1 = (__bridge NSString *)CFDictionaryGetValue(firstAddress, kABPersonAddressStreetKey);
-		if (address.address1 == nil) {
-			address.address1 = BUYPartialAddressPlaceholder;
-		}
 		address.city = (__bridge NSString *)CFDictionaryGetValue(firstAddress, kABPersonAddressCityKey);
 		address.province = (__bridge NSString *)CFDictionaryGetValue(firstAddress, kABPersonAddressStateKey);
 		address.zip = (__bridge NSString *)CFDictionaryGetValue(firstAddress, kABPersonAddressZIPKey);
@@ -185,9 +174,7 @@
 	if (allPhoneNumbers && CFArrayGetCount(allPhoneNumbers) > 0) {
 		address.phone = (__bridge NSString *)CFArrayGetValueAtIndex(allPhoneNumbers, 0);
 	}
-	if ([address.phone length] == 0) {
-		address.phone = BUYPartialAddressPlaceholder;
-	}
 	CFSafeRelease(phoneMultiValue);
 	CFSafeRelease(allPhoneNumbers);
@@ -198,15 +185,15 @@
 {
 	BUYAddress *address = [[BUYAddress alloc] init];
-	address.firstName = [contact.name.givenName length] ? contact.name.givenName : BUYPartialAddressPlaceholder;
+	address.firstName = contact.name.givenName;
-	address.lastName = [contact.name.familyName length] ? contact.name.familyName : BUYPartialAddressPlaceholder;
+	address.lastName = contact.name.familyName;
 	if (contact.postalAddress) {
 		// break up the address:
 		NSArray *addressComponents = [contact.postalAddress.street componentsSeparatedByString:@"\n"];
-		address.address1 = [addressComponents[0] length] ? addressComponents[0] : BUYPartialAddressPlaceholder;
+		address.address1 = addressComponents[0];
-		address.address2 = ([addressComponents count] > 1 && addressComponents[1]) ? addressComponents[1] : nil;
+		address.address2 = (addressComponents.count > 1) ? addressComponents[1] : nil;
-		address.city = [contact.postalAddress.city length] ? contact.postalAddress.city : BUYPartialAddressPlaceholder;
+		address.city = contact.postalAddress.city;
 		address.province = contact.postalAddress.state;
 		address.zip = contact.postalAddress.postalCode;
 		// The Checkout API accepts country OR ISO country code.
@@ -219,7 +206,7 @@
 		}
 	}
-	address.phone = contact.phoneNumber.stringValue ?: BUYPartialAddressPlaceholder;
+	address.phone = contact.phoneNumber.stringValue;
 	return address;
 }

--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayHelpers.m
@@ -90,11 +90,18 @@ const NSTimeInterval PollDelay = 0.5;
 	// Update the checkout with the rest of the information. Apple has now provided us with a FULL billing address and a FULL shipping address.
 	// We now update the checkout with our new found data so that you can ship the products to the right address, and we collect whatever else we need.
-	self.checkout.shippingAddress = self.checkout.requiresShipping ? [BUYAddress buy_addressFromRecord:[payment shippingAddress]] : nil;
+	self.checkout.partialAddresses = NO;
-	self.checkout.billingAddress = [BUYAddress buy_addressFromRecord:[payment billingAddress]];
+	if ([payment respondsToSelector:@selector(shippingContact)]) {
-	self.checkout.email = [BUYAddress buy_emailFromRecord:[payment billingAddress]];
+		self.checkout.email = payment.shippingContact.emailAddress;
-	if (self.checkout.email == nil) {
+		self.checkout.shippingAddress = self.checkout.requiresShipping ? [BUYAddress buy_addressFromContact:payment.shippingContact] : nil;
-		self.checkout.email = [BUYAddress buy_emailFromRecord:[payment shippingAddress]];
+	} else {
+		self.checkout.email = [BUYAddress buy_emailFromRecord:payment.shippingAddress];
+		self.checkout.shippingAddress = self.checkout.requiresShipping ? [BUYAddress buy_addressFromRecord:payment.shippingAddress] : nil;
+	}
+	if ([payment respondsToSelector:@selector(billingContact)]) {
+		self.checkout.billingAddress = [BUYAddress buy_addressFromContact:payment.billingContact];
+	} else {
+		self.checkout.billingAddress = [BUYAddress buy_addressFromRecord:payment.billingAddress];
 	}
 	[self.client updateCheckout:self.checkout completion:^(BUYCheckout *checkout, NSError *error) {
@@ -159,6 +166,8 @@ const NSTimeInterval PollDelay = 0.5;
 - (void)updateCheckoutWithAddressCompletion:(void (^)(PKPaymentAuthorizationStatus, NSArray *shippingMethods, NSArray *summaryItems))completion
 {	
+	self.checkout.partialAddresses = [self.checkout.shippingAddress isPartialAddress];
 	if ([self.checkout.shippingAddress isValidAddressForShippingRates]) {
 		[self.client updateCheckout:self.checkout completion:^(BUYCheckout *checkout, NSError *error) {

--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYCheckout+Additions.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYCheckout+Additions.m
-//
-//  BUYCheckout+Additions.m
-//  Mobile Buy SDK
-//
-//  Created by Shopify.
-//  Copyright (c) 2015 Shopify Inc. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-#import "BUYCheckout+Additions.h"
-#import "BUYAddress+Additions.h"
-@implementation BUYCheckout (Additions)
- (NSDictionary *)jsonDictionaryForUpdatingCheckout
-{
-	NSMutableDictionary *json = [[self jsonDictionaryForCheckout] mutableCopy];
-	if ([self.shippingAddress isPartialAddress]) {
-		json[@"checkout"][@"partial_addresses"] = @YES;
-	}
-	return [json copy];
-}
-@end
--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYProduct+Options.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYProduct+Options.m
@@ -71,7 +71,11 @@
 {
 	if ([self.variants count] == 1) {
 		BUYProductVariant *productVariant = [self.variants firstObject];
-		if ([productVariant.title isEqualToString:@"Default Title"]) {
+		BUYOptionValue *optionValue = [productVariant.options firstObject];
+		NSString *defaultTitleString = @"Default Title";
+		NSString *defaultString = @"Default";
+		if ([productVariant.title isEqualToString:defaultTitleString] &&
+			([optionValue.value isEqualToString:defaultTitleString] || [optionValue.value isEqualToString:defaultString])) {
 			return YES;
 		}
 	}

--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYCheckout+Additions.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYCheckout+Additions.h
 //
-//  BUYCheckout+Additions.h
+//  NSDictionary+Additions.h
+//
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -24,16 +25,17 @@
 //  THE SOFTWARE.
 //
-#import "BUYCheckout.h"
+#import <Foundation/Foundation.h>
-@interface BUYCheckout (Additions)
+@interface NSDictionary (Additions)
 /**
- *  Used for Apple Pay, specifically, to append true for
+ *  Alernative to objectForKey, where NSNull is replaced with nil
- *  the payload to set whether the address(es) are partial.
+ *
+ *  @param key The key for which to return the corresponding value.
 *
- *  @return A jsonDictionaryForCheckout JSON with optional "checkout.partial_addresses" key.
+ *  @return The value associated with key
 */
- (NSDictionary *)jsonDictionaryForUpdatingCheckout;
+- (id)buy_objectForKey:(NSString *)key;
 @end
--- a/Mobile Buy SDK/Playground/FirstViewController.h
+++ b/Mobile Buy SDK/Playground/FirstViewController.h
 //
-//  FirstViewController.h
+//  NSDictionary+Additions.m
+//
 //  Mobile Buy SDK
 //
 //  Created by Shopify.
@@ -24,9 +25,13 @@
 //  THE SOFTWARE.
 //
-@import UIKit;
+#import "NSDictionary+Additions.h"
-@interface FirstViewController : UIViewController
+@implementation NSDictionary (Additions)
-@end
+- (id)buy_objectForKey:(NSString *)key
+{
+	return ([self[key] isKindOfClass:[NSNull class]]) ? nil : self[key];
+}
+@end
--- a/Mobile Buy SDK/Mobile Buy SDK/View Controllers/BUYViewController.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/View Controllers/BUYViewController.m
@@ -117,6 +117,8 @@ NSString * BUYURLKey = @"url";
 - (void)startApplePayCheckout:(BUYCheckout *)checkout
 {
+	// Default to the failure state, since cancelling a payment would not update the state and thus appear as a success
+	self.paymentAuthorizationStatus = PKPaymentAuthorizationStatusFailure;
 	if (self.shop == nil && self.isLoadingShop == NO) {
 		// since requests are sent serially, this will return before the checkout is created

--- a/Mobile Buy SDK/Playground/AppDelegate.h
+++ b/Mobile Buy SDK/Playground/AppDelegate.h
-//
-//  AppDelegate.h
-//  Mobile Buy SDK
-//
-//  Created by Shopify.
-//  Copyright (c) 2015 Shopify Inc. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-@import UIKit;
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-@property (strong, nonatomic) UIWindow *window;
-@end
--- a/Mobile Buy SDK/Playground/AppDelegate.m
+++ b/Mobile Buy SDK/Playground/AppDelegate.m
-//
-//  AppDelegate.m
-//  Mobile Buy SDK
-//
-//  Created by Shopify.
-//  Copyright (c) 2015 Shopify Inc. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-#import "AppDelegate.h"
-@interface AppDelegate ()
-@end
-@implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    // Override point for customization after application launch.
-    return YES;
-}
- (void)applicationWillResignActive:(UIApplication *)application {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
- (void)applicationDidEnterBackground:(UIApplication *)application {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
- (void)applicationWillEnterForeground:(UIApplication *)application {
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
- (void)applicationDidBecomeActive:(UIApplication *)application {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
- (void)applicationWillTerminate:(UIApplication *)application {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-@end
--- a/Mobile Buy SDK/Playground/Base.lproj/LaunchScreen.xib
+++ b/Mobile Buy SDK/Playground/Base.lproj/LaunchScreen.xib
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Shopify Inc. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Playground" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>
--- a/Mobile Buy SDK/Playground/Base.lproj/Main.storyboard
+++ b/Mobile Buy SDK/Playground/Base.lproj/Main.storyboard
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="9pv-A4-QxB">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
-    </dependencies>
-    <scenes>
-        <!--First-->
-        <scene sceneID="hNz-n2-bh7">
-            <objects>
-                <viewController id="9pv-A4-QxB" customClass="FirstViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Ia1-K6-d13"/>
-                        <viewControllerLayoutGuide type="bottom" id="4ug-Mw-9AY"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="tsR-hK-woN">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2El-PP-Jfr">
-                                <rect key="frame" x="277" y="285" width="46" height="30"/>
-                                <state key="normal" title="Button">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="buttonAction:" destination="9pv-A4-QxB" eventType="touchUpInside" id="EOa-8G-Lqn"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="centerX" secondItem="2El-PP-Jfr" secondAttribute="centerX" id="OeO-pC-gHW"/>
-                            <constraint firstAttribute="centerY" secondItem="2El-PP-Jfr" secondAttribute="centerY" id="xQc-2f-hrm"/>
-                        </constraints>
-                    </view>
-                    <tabBarItem key="tabBarItem" title="First" image="first" id="acW-dT-cKf"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="W5J-7L-Pyd" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="750" y="-320"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="first" width="30" height="30"/>
-    </resources>
-</document>
--- a/Mobile Buy SDK/Playground/FirstViewController.m
+++ b/Mobile Buy SDK/Playground/FirstViewController.m
-//
-//  FirstViewController.m
-//  Mobile Buy SDK
-//
-//  Created by Shopify.
-//  Copyright (c) 2015 Shopify Inc. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-#import "FirstViewController.h"
-@import Buy;
-@interface FirstViewController ()
-@property (nonatomic, strong) BUYClient *client;
-@end
-@implementation FirstViewController
- (IBAction)buttonAction:(id)sender {
-}
-@end
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Contents.json
-{
-  "images" : [
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small-40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small-40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-76.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-76.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
+++ b/Mobile Buy SDK/Playground/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
--- a/Mobile Buy SDK/Playground/Images.xcassets/first.imageset/Contents.json
+++ b/Mobile Buy SDK/Playground/Images.xcassets/first.imageset/Contents.json
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "first.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
--- a/Mobile Buy SDK/Playground/Images.xcassets/first.imageset/first.pdf
+++ b/Mobile Buy SDK/Playground/Images.xcassets/first.imageset/first.pdf
--- a/Mobile Buy SDK/Playground/Images.xcassets/second.imageset/Contents.json
+++ b/Mobile Buy SDK/Playground/Images.xcassets/second.imageset/Contents.json
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "second.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
--- a/Mobile Buy SDK/Playground/Images.xcassets/second.imageset/second.pdf
+++ b/Mobile Buy SDK/Playground/Images.xcassets/second.imageset/second.pdf
--- a/Mobile Buy SDK/Playground/Info.plist
+++ b/Mobile Buy SDK/Playground/Info.plist
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.shopify.$(PRODUCT_NAME:rfc1034identifier)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>playground</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UIStatusBarTintParameters</key>
-	<dict>
-		<key>UINavigationBar</key>
-		<dict>
-			<key>Style</key>
-			<string>UIBarStyleDefault</string>
-			<key>Translucent</key>
-			<false/>
-		</dict>
-	</dict>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-	</array>
-</dict>
-</plist>
--- a/Mobile Buy SDK/Playground/Playground.entitlements
+++ b/Mobile Buy SDK/Playground/Playground.entitlements
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.developer.in-app-payments</key>
-	<array/>
-</dict>
-</plist>
--- a/Mobile Buy SDK/Playground/main.m
+++ b/Mobile Buy SDK/Playground/main.m
-//
-//  main.m
-//  Mobile Buy SDK
-//
-//  Created by Shopify.
-//  Copyright (c) 2015 Shopify Inc. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-@import UIKit;
-#import "AppDelegate.h"
-int main(int argc, char * argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}
--- a/Mobile Buy SDK/docs/templates/html/document-template.html
+++ b/Mobile Buy SDK/docs/templates/html/document-template.html
@@ -6,7 +6,6 @@
 	<title>{{page.title}}</title>
 	<link rel="stylesheet" href="{{page.cssPath}}">
-	<link rel="stylesheet" href="/api/mobile-buy-sdk/ios/api/css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
 	{{#strings.appledocData}}<meta name="generator" content="{{tool}} {{version}} (build {{build}})">{{/strings.appledocData}}
 </head>
@@ -58,7 +57,6 @@
 		</div>
 	</article>
-	<script src="/api/mobile-buy-sdk/ios/api/script.js"></script>
 	<script src="{{page.jsPath}}"></script>
 </body>
 </html>

--- a/Mobile Buy SDK/docs/templates/html/hierarchy-template.html
+++ b/Mobile Buy SDK/docs/templates/html/hierarchy-template.html
@@ -6,7 +6,6 @@
 	<title>{{page.title}}</title>
 	<link rel="stylesheet" href="css/style.css">
-	<link rel="stylesheet" href="/api/mobile-buy-sdk/ios/api/css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
 	{{#strings.appledocData}}<meta name="generator" content="{{tool}} {{version}} (build {{build}})">{{/strings.appledocData}}
 </head>
@@ -92,7 +91,6 @@
 		</div>
 	</article>
-	<script src="/api/mobile-buy-sdk/ios/api/script.js"></script>
 	<script src="js/script.js"></script>
 </body>
 </html>
@@ -108,5 +106,5 @@ Section Classes
 EndSection
 Section Navigation
-<li><a href="/api/mobile-buy-sdk/ios/api/index.html">Home</a></li>
+<li><a href="index.html">Home</a></li>
 EndSection
--- a/Mobile Buy SDK/docs/templates/html/index-template.html
+++ b/Mobile Buy SDK/docs/templates/html/index-template.html
@@ -6,7 +6,6 @@
 	<title>{{page.title}}</title>
 	<link rel="stylesheet" href="css/style.css">
-	<link rel="stylesheet" href="/api/mobile-buy-sdk/ios/api/css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
 	{{#strings.appledocData}}<meta name="generator" content="{{tool}} {{version}} (build {{build}})">{{/strings.appledocData}}
 </head>
@@ -57,7 +56,7 @@
 							<h2 class="index-title">{{page.docsTitle}}</h2>
 							<ul>
 								{{#docs}}
-								<li><a href="/api/mobile-buy-sdk/ios/api/{{href}}">{{title}}</a></li>
+								<li><a href="{{href}}">{{title}}</a></li>
 								{{/docs}}
 							</ul>
 						</div>
@@ -68,7 +67,7 @@
 							<h2 class="index-title">{{strings.indexPage.classesTitle}}</h2>
 							<ul>
 								{{#classes}}
-								<li><a href="/api/mobile-buy-sdk/ios/api/{{href}}">{{title}}</a></li>
+								<li><a href="{{href}}">{{title}}</a></li>
 								{{/classes}}
 							</ul>
 						</div>
@@ -80,7 +79,7 @@
 							<h2 class="index-title">{{strings.indexPage.protocolsTitle}}</h2>
 							<ul>
 								{{#protocols}}
-								<li><a href="/api/mobile-buy-sdk/ios/api/{{href}}">{{title}}</a></li>
+								<li><a href="{{href}}">{{title}}</a></li>
 								{{/protocols}}
 							</ul>
 							{{/hasProtocols}}
@@ -89,7 +88,7 @@
 							<h2 class="index-title">{{strings.indexPage.constantsTitle}}</h2>
 							<ul>
 								{{#constants}}
-									<li><a href="/api/mobile-buy-sdk/ios/api/{{href}}">{{title}}</a></li>
+									<li><a href="{{href}}">{{title}}</a></li>
 								{{/constants}}
 							</ul>
 							{{/hasConstants}}
@@ -98,7 +97,7 @@
 							<h2 class="index-title">{{strings.indexPage.categoriesTitle}}</h2>
 							<ul>
 								{{#categories}}
-								<li><a href="/api/mobile-buy-sdk/ios/api/{{href}}">{{title}}</a></li>
+								<li><a href="{{href}}">{{title}}</a></li>
 								{{/categories}}
 							</ul>
 							{{/hasCategories}}
@@ -121,11 +120,10 @@
 		</div>
 	</article>
-	<script src="/api/mobile-buy-sdk/ios/api/script.js"></script>
 	<script src="js/script.js"></script>
 </body>
 </html>
 Section Navigation
-<li><a href="/api/mobile-buy-sdk/ios/api/hierarchy.html">Hierarchy</a></li>
+<li><a href="hierarchy.html">Hierarchy</a></li>
 EndSection
--- a/Mobile Buy SDK/docs/templates/html/object-template.html
+++ b/Mobile Buy SDK/docs/templates/html/object-template.html
@@ -6,7 +6,6 @@
 	<title>{{page.title}}</title>
 	<link rel="stylesheet" href="../css/style.css">
-	<link rel="stylesheet" href="/api/mobile-buy-sdk/ios/api/css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
 	{{#strings.appledocData}}<meta name="generator" content="{{tool}} {{version}} (build {{build}})">{{/strings.appledocData}}
 </head>
@@ -370,8 +369,8 @@ EndSection
 Section Navigation
-<li><a href="/api/mobile-buy-sdk/ios/api/index.html">Index</a></li>
+<li><a href="../index.html">Index</a></li>
-<li><a href="/api/mobile-buy-sdk/ios/api/hierarchy.html">Hierarchy</a></li>
+<li><a href="../hierarchy.html">Hierarchy</a></li>
 EndSection
 Section JumpTo

--- a/Mobile-Buy-SDK.podspec
+++ b/Mobile-Buy-SDK.podspec
 Pod::Spec.new do |s|
  s.name         = 'Mobile-Buy-SDK'
-  s.version      = '1.2.1'
+  s.version      = '1.2.2'
  s.summary      = 'Sell with Shopify in iOS apps'
  s.description  = 'Shopify’s Mobile Buy SDK makes it simple to sell physical products inside your mobile app. With a few lines of code, you can connect your app with the Shopify platform and let your users buy your products using Apple Pay or their credit card.'
  s.homepage     = 'https://developers.shopify.com/mobile-buy-sdk'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
  s.source       = { :git => 'https://github.com/Shopify/mobile-buy-sdk-ios.git', :tag => s.version }
  s.source_files = 'Mobile Buy SDK/Mobile Buy SDK/**/*.{h,m,mm}'
  s.public_header_files = 'Mobile Buy SDK/Mobile Buy SDK/**/*.h'
-  s.exclude_files = 'Mobile Buy SDK/Mobile Buy SDK/Static Framework/*'
+  s.exclude_files = 'Mobile Buy SDK/Mobile Buy SDK/Buy.h'
  s.module_name   = 'Buy'
  s.frameworks   = 'PassKit'
  s.libraries    = 'c++'

--- a/README.md
+++ b/README.md
-![Mobile Buy SDK](http://s3.amazonaws.com/shopify-marketing_assets/static/mbsdk-github.png)
+![Mobile Buy SDK](https://raw.github.com/Shopify/mobile-buy-sdk-ios/master/Assets/Mobile_Buy_SDK_Github_banner.png)
 [![Build status](https://badge.buildkite.com/3951692121947fbf7bb06c4b741601fc091efea3fa119a4f88.svg)](https://buildkite.com/shopify/mobile-buy-sdk-ios)
 [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/Shopify/mobile-buy-sdk-ios/blob/master/LICENSE)
@@ -12,11 +12,15 @@ Shopify’s Mobile Buy SDK makes it simple to sell physical products inside your
 ### Documentation
-Please find all documentation on the [Mobile Buy SDK for iOS page](https://docs.shopify.com/mobile-buy-sdk/ios).
+Official documentation can be found on the [Mobile Buy SDK for iOS page](https://docs.shopify.com/mobile-buy-sdk/ios).
+#### API Documentation
+API docs can be generated with the `Documentation` scheme or viewed on Cocoadocs: [http://cocoadocs.org/docsets/Mobile-Buy-SDK/](http://cocoadocs.org/docsets/Mobile-Buy-SDK/).
 ### Installation
-<a href="../../releases/latest">Download the latest version</a>
+<a href="https://github.com/Shopify/mobile-buy-sdk-ios/releases/latest">Download the latest version</a>
 #### Dynamic Framework Installation
@@ -24,7 +28,7 @@ Please find all documentation on the [Mobile Buy SDK for iOS page](https://docs.
 2. Add the `Buy` target as a `Target Dependancy` in the `Build Phases` of your project's target
 3. Add the `Buy` (second target on the list is the Dynamic framework) target in the `Embedded Binaries` section in `Build Phases`
-See the [Sample Apps](/Mobile Buy SDK Sample Apps/) for an example of Dynamic Framework usage.
+See the [Sample Apps](https://github.com/Shopify/mobile-buy-sdk-ios/tree/master/Mobile Buy SDK Sample Apps/) for an example of Dynamic Framework usage.
 #### Static Framework Installation
@@ -108,18 +112,25 @@ The Mobile Buy SDK includes a number of targets and schemes:
 * **Documentation**: This generates appledoc documentation for the framework
-* **Playground**: This is a basic app that depends directly on the `Buy` dynamic framework. You may use this app and target to play around with the SDK. Be sure not to check in any changes you may have made in files related to this app
 ### Sample Apps
 The repo includes 3 sample apps. Each sample apps embeds the dynamic framework and includes readme files with more information:
-* [Advanced Sample App](/Mobile Buy SDK Sample Apps/Sample App Advanced/README.md)
+* [Advanced Sample App](https://github.com/Shopify/mobile-buy-sdk-ios/tree/master/Mobile Buy SDK Sample Apps/Sample App Advanced/README.md)
-* [Swift Sample App](/Mobile Buy SDK Sample Apps/Sample App Swift/README.md)
+* [Swift Sample App](https://github.com/Shopify/mobile-buy-sdk-ios/tree/master/Mobile Buy SDK Sample Apps/Sample App Swift/README.md)
-* [Web Sample App](/Mobile Buy SDK Sample Apps/Sample App Web/README.md)
+* [Web Sample App](https://github.com/Shopify/mobile-buy-sdk-ios/tree/master/Mobile Buy SDK Sample Apps/Sample App Web/README.md)
 We suggest you take a look at the **Advanced Sample App** and test your shop with the sample app before you begin. If you run into any issues, the **Advanced Sample App** is also a great resource for debugging integration issues and checkout.
+### Product View
+The SDK includes an easy-to-use product view to make selling simple in any app.
+![Product View Screenshot](https://raw.github.com/Shopify/mobile-buy-sdk-ios/master/Assets/Product_View_Screenshot_1.png)
+![Product View Screenshot](https://raw.github.com/Shopify/mobile-buy-sdk-ios/master/Assets/Product_View_Screenshot_2.png)
+The [Advanced Sample App](https://github.com/Shopify/mobile-buy-sdk-ios/tree/master/Mobile Buy SDK Sample Apps/Sample App Advanced/) includes a demo of the `BUYProductViewController`. Documentation on how to use the `BUYProductViewController` is also available [here](https://github.com/Shopify/mobile-buy-sdk-ios/tree/master/Mobile Buy SDK Sample Apps/Sample App Advanced/PRODUCT_VIEW_README.md).
 ### Unit Tests
 To run the Mobile Buy SDK integration tests against an actual shop, you will need a Shopify shop that is publicly accessible (not password protected). Please note that the integration tests **will create an order** on that shop. This is to validate that the SDK works properly with Shopify.  Modify the **test_shop_data.json** file to contain your shop's credentials and the required product IDs, gift cards, and discounts as necessary.