diff --git a/.gitignore b/.gitignore
index 1768197..d92c07f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,6 @@
 .DS_Store*
 dev_examples/
 cdn/
-Embed.CDN.js
-Embed.CDN.Generator.js
 compiled/generator.html
 compiled/index.html
 compiled/generator-backup.html
diff --git a/source/js/Core/Embed/Embed.CDN.Generator.js b/source/js/Core/Embed/Embed.CDN.Generator.js
new file mode 100644
index 0000000..045ba7f
--- /dev/null
+++ b/source/js/Core/Embed/Embed.CDN.Generator.js
@@ -0,0 +1,221 @@
+/* Support Timeline Embed Generator web form (becomes storyjs-embed-generator.js) */  
+if(typeof generator_embed_path == 'undefined' || typeof generator_embed_path == 'undefined') {
+	// REPLACE WITH YOUR BASEPATH IF YOU WANT OTHERWISE IT WILL TRY AND FIGURE IT OUT
+	var generator_embed_path = getScriptPath("storyjs-embed-generator.js").split("js/")[0];
+	if (generator_embed_path.match("http")) {
+		generator_embed_path = generator_embed_path;
+	} else if (generator_embed_path == "/") {
+		generator_embed_path = "index.html";
+	} else {
+		generator_embed_path = generator_embed_path + "index.html";
+	} 
+}
+function getScriptPath(scriptname) {
+	var scriptTags = document.getElementsByTagName('script'),
+		script_path = "";
+	for(var i = 0; i < scriptTags.length; i++) {
+		if (scriptTags[i].src.match(scriptname)) {
+			script_path = scriptTags[i].src;
+		}
+	}
+	return script_path.split('?')[0].split('/').slice(0, -1).join('/') + '/';
+}
+
+
+/* EXTRA
+================================================== */
+function getUrlVars(string) {
+	var vars = [],
+		hash,
+		hashes,
+		str = string.toString();
+			
+	if (str.match('&#038;')) { 
+		str = str.replace("&#038;", "&");
+	} else if (str.match('&#38;')) {
+		str = str.replace("&#38;", "&");
+	} else if (str.match('&amp;')) {
+		str = str.replace("&amp;", "&");
+	}
+	if (str.match('#')) { 
+		str = str.split('#')[0];
+	}
+	hashes = str.slice(str.indexOf('?') + 1).split('&');
+		
+	for(var i = 0; i < hashes.length; i++) {
+		hash = hashes[i].split('=');
+		vars.push(hash[0]);
+		vars[hash[0]] = hash[1];
+	}
+	
+	return vars;
+};
+
+function getLinkAndIframe() {
+	
+	var theobj				= {},
+		e_source			= document.getElementById('embed-source-url'),
+		e_width				= document.getElementById('embed-width'),
+		e_height			= document.getElementById('embed-height'),
+		e_maptype			= document.getElementById('embed-maptype'),
+		e_language			= document.getElementById('embed-language'),
+		e_embed				= document.getElementById('embed_code'),
+		e_font				= document.getElementById('embed-font'),
+		e_wordpress			= document.getElementById('embed-wordpressplugin'),
+		e_startatend		= document.getElementById('embed-startatend'),
+		e_hashbookmark		= document.getElementById('embed-hashbookmark'),
+		e_startzoomadjust	= document.getElementById('embed-startzoomadjust'),
+		e_startatslide		= document.getElementById('embed-startatslide'),
+		e_debug				= document.getElementById('embed-debug'),
+		e_googlemapkey		= document.getElementById('embed-googlemapkey'),
+		start_at_end		= false,
+		hash_bookmark		= false,
+		is_debug			= false,
+		iframe,
+		link,
+		vars,
+		wp,
+		source_key;
+	
+	/* SOURCE KEY
+	================================================== */
+	if (e_source.value.match("docs.google.com")) {
+		source_key		= getUrlVars(e_source.value)["key"];
+	} else {
+		if (e_source.value == "") {
+			source_key	= "0Agl_Dv6iEbDadHdKcHlHcTB5bzhvbF9iTWwyMmJHdkE"
+		} else {
+			source_key	= e_source.value;
+		}
+	}
+	
+	/* START AT END
+	================================================== */
+	if (e_startatend.checked) {
+		start_at_end = true;
+	}
+	
+	/* HASH BOOKMARK
+	================================================== */
+	if (e_hashbookmark.checked) {
+		hash_bookmark = true;
+	}
+	
+	/* DEBUG
+	================================================== */
+	if (e_debug.checked) {
+		is_debug = true;
+	}
+	
+	/* WORDPRESS
+	================================================== */
+	wp		= "[timeline ";
+	if (e_width.value > 0) {
+		wp	+= "width='" + e_width.value + "' "; 
+	}
+	if (e_height.value > 0) {
+		wp	+= "height='" + e_width.value + "' "; 
+	}
+		
+	wp		+= "font='" + e_font.value + "' "; 
+	wp		+= "maptype='" + e_maptype.value + "' ";
+	wp		+= "lang='" + e_language.value + "' ";
+	wp		+= "src='" + e_source.value + "' ";
+	if (start_at_end) {
+		wp	+= "start_at_end='" + start_at_end + "' ";
+	}
+	if (hash_bookmark) {
+		wp	+= "hash_bookmark='" + hash_bookmark + "' ";
+	}
+	if (is_debug) {
+		wp	+= "debug='" + is_debug + "' ";
+	}
+	
+	if (e_googlemapkey.value != "") {
+		wp	+= "gmap_key='" + e_googlemapkey.value + "' ";
+	}
+	
+	if (parseInt(e_startatslide.value, 10) > 0) {
+		wp	+= "start_at_slide='" + parseInt(e_startatslide.value, 10) + "' ";
+	}
+	if (parseInt(e_startzoomadjust.value, 10) > 0) {
+		wp	+= "start_zoom_adjust='" + parseInt(e_startzoomadjust.value, 10) + "' ";
+	}
+	
+	wp		+= "]";
+	
+	theobj.wordpress = wp;
+	
+	/* IFRAME AND LINK
+	================================================== */
+	vars		=  generator_embed_path + "?source=" + source_key;
+	vars		+= "&font=" + e_font.value; 
+	vars		+= "&maptype=" + e_maptype.value;
+	vars		+= "&lang=" + e_language.value;
+	if (start_at_end) {
+		vars	+= "&start_at_end=" + start_at_end;
+	}
+	if (hash_bookmark) {
+		vars	+= "&hash_bookmark=" + hash_bookmark;
+	}
+	if (is_debug) {
+		vars	+= "&debug=" + is_debug;
+	}
+	
+	if (parseInt(e_startatslide.value, 10) > 0) {
+		vars	+= "&start_at_slide=" + parseInt(e_startatslide.value, 10); 
+	}
+	
+	if (parseInt(e_startzoomadjust.value, 10) > 0) {
+		vars	+= "&start_zoom_adjust=" + parseInt(e_startzoomadjust.value, 10);
+	}
+	
+	if (e_googlemapkey.value != "") {
+		vars	+= "&gmap_key=" + e_googlemapkey.value;
+	}
+	
+	if (e_width.value > 0) {
+		vars	+= "&width=" + e_width.value; 
+	}
+	if (e_height.value > 0) {
+		vars	+= "&height=" + e_height.value; 
+	}
+	
+	iframe		= "<iframe src='" + vars + "'";
+	
+	if (e_width.value > 0 || e_width.value.match("%")) {
+		iframe	+= " width='" + e_width.value + "'";
+	}
+	if (e_height.value > 0 || e_height.value.match("%")) {
+		iframe	+= " height='" + e_height.value + "'";
+	}
+	iframe		+= " frameborder='0'></iframe>";
+	
+	theobj.iframe	= iframe;
+	theobj.link		= vars;
+	
+	if (e_wordpress.checked) {
+		theobj.copybox = wp;
+	} else {
+		theobj.copybox = iframe;
+	}
+	
+	return theobj;
+};
+
+/* EMBED GENERATOR
+================================================== */
+function updateEmbedCode(element, options) {
+	
+	var e_embed		= document.getElementById('embed_code'),
+		el			= getLinkAndIframe();
+	
+	e_embed.value	= el.copybox;
+	jQuery("#preview-embed-link").attr('href', el.link);
+	jQuery("#preview-embed-iframe").html(el.iframe);
+	jQuery("#preview-embed").css("display","block");
+	
+}
+
+
+
diff --git a/source/js/Core/Embed/Embed.CDN.js b/source/js/Core/Embed/Embed.CDN.js
new file mode 100644
index 0000000..60303cd
--- /dev/null
+++ b/source/js/Core/Embed/Embed.CDN.js
@@ -0,0 +1,72 @@
+/* Embed.CDN
+	Extend the basic 'embed' functionality with Google Analytics tracking and url parsing to support URLs created with the Timeline generator form.
+*/  
+
+/* 	CodeKit Import
+	http://incident57.com/codekit/
+================================================== */
+// @codekit-append "Embed.js";
+
+/* REPLACE THIS WITH YOUR GOOGLE ANALYTICS ACCOUNT
+================================================== */
+var embed_analytics = "UA-537357-20";
+
+/* REPLACE THIS WITH YOUR BASE PATH FOR TIMELINE
+================================================== */
+//var embed_path = "http://embed.verite.co/timeline/";
+
+/* LOAD TIMER
+================================================== */
+var load_time_start = new Date().getTime(), the_load_time = 0;
+
+/* GOOGLE ANALYTICS
+================================================== */
+var _gaq = _gaq || [];
+
+
+(function() {
+	var ga = document.createElement('script'), s = document.getElementsByTagName('script')[0];
+	ga.type = 'text/javascript';
+	ga.async = true;
+	ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+	s.parentNode.insertBefore(ga, s);
+	
+	_gaq.push(['_setAccount', embed_analytics]);
+	_gaq.push(['_trackPageview']);
+	
+})();
+
+/* TIMELINE CDN SPECIFIC
+================================================== */ 
+var getUrlVars = function() {
+	var varobj = {}, url_vars = [], uv ;
+		
+	//url_vars = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+	url_vars = window.location.href.slice(window.location.href.indexOf('?') + 1);
+	
+	if (url_vars.match('#')) {
+		url_vars = url_vars.split('#')[0];
+	}
+	url_vars = url_vars.split('&');
+		
+	for(var i = 0; i < url_vars.length; i++) {
+		uv = url_vars[i].split('=');
+		varobj[uv[0]] = uv[1];
+	}
+		
+	return varobj;
+};
+
+var onHeadline = function(e, headline) {
+	var the_page_title = "/" + headline,
+		the_page_url	=	location.href;
+	
+	document.title = headline;
+	the_load_time = Math.floor((new Date().getTime() - load_time_start)/100)/10;
+	_gaq.push(['_trackEvent', 'Timeline', headline, the_page_url, the_load_time]);
+	
+};
+
+var url_config = getUrlVars();
+
+