diff --git a/app.html b/app.html
index 2c36005..ff06f92 100644
--- a/app.html
+++ b/app.html
@@ -54,7 +54,7 @@
 		if (!webComponentsSupported) {
 		  var script = document.createElement('script');
 		  script.async = true;
-		  script.src = '../webcomponentsjs/webcomponents-lite.min.js';
+		  script.src = 'bower_components/webcomponentsjs/webcomponents-lite.min.js';
 		  script.onload = onload;
 		  document.head.appendChild(script);
 		} else {
@@ -64,7 +64,7 @@
 	</script>
 
 	<link rel="import" href="stitch-order-element.html">
-	<link rel="import" href="../paper-styles/default-theme.html">
+	<link rel="import" href="bower_components/paper-styles/default-theme.html">
 	<style>
 		body {
 			margin: 0;
diff --git a/stitch-order-request.html b/stitch-order-request.html
index d157eb8..fdc4216 100644
--- a/stitch-order-request.html
+++ b/stitch-order-request.html
@@ -1,18 +1,11 @@
 <link rel="import" href="../polymer/polymer.html">
-<script src="../jsSHA/src/sha.js"></script>
 
 <dom-module id="stitch-order-request">
 	<template>
-		<iron-ajax id="ajaxProductInfo" url="[[request.endpoint]]" method="POST"
+		<iron-ajax url="[[request.endpoint]]" method="POST"
 		           content-type="application/json"
 		           on-response="_handleResponse"
-		           debounce-duration="300"
-		           loading="{{loadingAjax}}">
-		</iron-ajax>
-
-		<iron-ajax id="ajaxProductOptions" url="[[request.endpoint]]" method="POST"
-		           content-type="application/json"
-		           on-response="_handleResponseParentASIN">
+		           debounce-duration="300">
 		</iron-ajax>
 	</template>
 	<script>
@@ -23,9 +16,17 @@
 		  is: 'stitch-order-request',
 
 		  /**
-		   * Fired when a request is sent.
+		   * Fired when a request for the product Information is sent.
+		   *
+		   * @event order-details-request
+		   */
+
+		  /**
+		   * Fired when a request for the product Options is sent.
+		   *
+		   * Note that this event will be fired only if the product has a parent.
 		   *
-		   * @event order-request
+		   * @event order-options-request
 		   */
 
 		  /**
@@ -46,7 +47,7 @@
 			 */
 			productUrl: {
 			  type: String,
-			  observer: '_setRequestParams'
+			  observer: '_requestProduct'
 			},
 
 			/**
@@ -72,34 +73,19 @@
 			  var endpoint = 'https://kc5nsidmrk.execute-api.us-west-2.amazonaws.com/production/item/lookup';
 
 			  var body = {
-				itemId: undefined,  //Required, extracted from amazon product URL
-				ResponseGroup: 'Images,ItemAttributes,OfferListings,Offers'
-			  };
-
-			  return {
-				body: function(itemId){
-				  var request = JSON.parse(JSON.stringify(body));
-				  request.itemId = itemId;
-
-				  return request;
+				lookup: {
+				  itemId: undefined,  //Required, extracted from amazon product URL
+				  ResponseGroup: 'ItemAttributes,Images,OfferListings'
 				},
-				get endpoint(){
-				  return endpoint;
+				options: {
+				  itemId: undefined, //Required, extracted from product response ParentASIN
+				  ResponseGroup: 'VariationMatrix'
 				}
 			  };
-			})();
-
-			this.requestAsinParent = (function(){
-			  var endpoint = 'https://kc5nsidmrk.execute-api.us-west-2.amazonaws.com/production/item/lookup';
-
-			  var body = {
-				itemId: undefined,
-				ResponseGroup: 'VariationMatrix'
-			  };
 
 			  return {
-				body: function(itemId){
-				  var request = JSON.parse(JSON.stringify(body));
+				body: function(itemId, options){
+				  var request = JSON.parse(JSON.stringify(options ? body.options : body.lookup));
 				  request.itemId = itemId;
 
 				  return request;
@@ -111,63 +97,89 @@
 			})();
 		  },
 
-		  _setRequestParams: function(productUrl){
+		  _requestProduct: function(productUrl){
 			this.debounce('requesting-product', function(){
 			  if (productUrl.length > 23) {
-				var ajax = this.$$('#ajaxProductInfo');
+				var ajax = this.$$('iron-ajax');
 				var itemID = this._getItemIdFromURL(productUrl);
 
 				ajax.set('body', this.request.body(itemID));
 				ajax.generateRequest();
 
-				this.fire('order-request', {itemId: itemID});
+				this.fire('order-details-request', {itemId: itemID});
 			  }
 			}, 300);
 		  },
 
 		  _handleResponse: function(e){
 			var response = e.detail.response[0];
+
+			if (response.ItemAttributes) {
+			  this._setProductDetails(response);
+			} else {
+			  this._setProductOptions(response);
+			}
+		  },
+
+		  _getItemIdFromURL: function(url){
+			var regex = /\/dp?\/(\w{10})\/?/;
+			return regex.exec(url)[1];
+		  },
+		  _setProductDetails: function(details){
 			var product = {
-			  id: response.ASIN[0],
-			  title: response.ItemAttributes[0].Title ? response.ItemAttributes[0].Title[0] : 'Untitled',
-			  image: response.ImageSets ? response.ImageSets[0].ImageSet[0].MediumImage[0].URL[0] : '',
-			  cost: response.ItemAttributes[0].ListPrice ? response.ItemAttributes[0].ListPrice[0].FormattedPrice[0] : 0,
-			  prime: response.Offers[0].Offer ? !!Number(response.Offers[0].Offer[0].OfferListing[0].IsEligibleForPrime[0]): false,
-			  itemsAttributes: response.ItemAttributes[0],
-			  options: [{name:'Quantity',values:[1,2,3,4,5],selected:1}]
+			  id: details.ASIN[0],
+			  title: details.ItemAttributes[0].Title ? details.ItemAttributes[0].Title[0] : 'Untitled',
+			  image: details.ImageSets ? details.ImageSets[0].ImageSet[0].MediumImage[0].URL[0] : '',
+			  cost: details.ItemAttributes[0].ListPrice ? details.ItemAttributes[0].ListPrice[0].FormattedPrice[0] : 'On Purchase',
+			  prime: details.Offers[0].Offer ? !!Number(details.Offers[0].Offer[0].OfferListing[0].IsEligibleForPrime[0]) : false,
+			  itemsAttributes: details.ItemAttributes[0],
+			  options: [{name: 'Quantity', values: [1, 2, 3, 4, 5], selected: 1}]
 			};
-			var ajax = this.$$('#ajaxProductOptions');
-			if(response.ParentASIN){
-				var parentID = response.ParentASIN[0];
-				ajax.set('body', this.requestAsinParent.body(parentID));
-				ajax.generateRequest();
-			}
+
+			this._requestOptions(details);
 			this.set('productDetails', product);
-			this.fire('order-response', product);
+			this.fire('order-response', {details: product});
 		  },
+		  _requestOptions: function(product){
+			if (product.ParentASIN) {
+			  var ajax = this.$$('iron-ajax');
+			  var parentID = product.ParentASIN[0];
 
-		  _handleResponseParentASIN:function(e){
-			var productItemAttributes = this.get('productDetails.itemsAttributes');
-			if(e.detail.response[0].Variations) {
-			  var variationsResponse = e.detail.response[0].Variations[0];
-			  var self = this;
-			  variationsResponse.VariationDimensions[0].VariationDimension.forEach(function(item, index){
-				self.push('productDetails.options', {name: item, values: [], selected: productItemAttributes[item][0]});
+			  ajax.set('body', this.request.body(parentID, true));
+			  ajax.generateRequest();
+
+			  this.fire('order-options-request', {itemId: product.ASIN[0], parentId: parentID});
+			}
+		  },
+		  _setProductOptions: function(details){
+			if (details.Variations) {
+			  var product = this.productDetails.itemsAttributes;
+			  var variations = details.Variations[0];
+			  var dimensions = variations.VariationDimensions[0].VariationDimension;
+			  var options = [];
+
+			  dimensions.forEach(function(dimension){
+				options.push({name: dimension, values: [], selected: product[dimension][0]});
 			  });
-			  variationsResponse.Item.forEach(function(item){
-				self.get('productDetails.options').forEach(function(option, index){
-				  if (item.ItemAttributes[0][option.name] && option.values.indexOf(item.ItemAttributes[0][option.name][0]) === -1) {
-					self.push('productDetails.options.' + index + '.values', item.ItemAttributes[0][option.name][0])
+
+			  variations = variations.Item;
+			  variations.forEach(function(variation){
+				options.forEach(function(option){
+				  var value = variation.ItemAttributes[0][option.name];
+				  value = value && value[0];
+
+				  if (value && option.values.indexOf(value) === -1) {
+					option.values.push(value);
 				  }
 				});
 			  });
-			  this.fire('order-options-response', this.get('productDetails.options'));
-			}
-		  },
 
-		  _getItemIdFromURL: function(url){
-			var regex = /\/dp?\/(\w{10})\/?/;
-			return regex.exec(url)[1];
+			  var self = this;
+			  options.forEach(function(option){
+				self.push('productDetails.options', option);
+			  });
+			  this.fire('order-response', {options: this.productDetails.options});
+			}
 		  }
 		});
 	  })();