diff --git a/README.txt b/README.txt
index f7ec3886..958dcac8 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,28 @@
-The SoundJS JavaScript library provides a simple API, and some powerful features to make working with audio a breeze.
-
-- .add() - Too many sound instances on page (combined between all sounds) will stop sound working, this varies on browser/hardware safest number is found max of 35 channels
-
-- .play() - Too many playing instances (combined between all sounds) will stop sound working till all windows are closed. The exact number is undefined but has been observed as low as 10 looping sounds in Chrome.
+SOUNDJS LIBRARY:
+
+SoundJS is a library to make working with the audio on the web easier. It provides a consistent API for playing audio in different browsers, including using a target plugin model to provide an easy way to provide additional audio plugins like Web Audio, and a Flash fallback. A mechanism has been provided for easily tying in audio preloading to PreloadJS (http://preloadjs.com)
+
+The home page for SoundJS can be found at http://soundjs.com/
+
+There is a GitHub repository, which includes downloads, issue tracking, & a wiki at https://github.com/CreateJS/SoundjS/
+
+It was built by gskinner.com, and is released for free under the MIT license, which means you can use it for almost any purpose (including commercial projects). We appreciate credit where possible, but it is not a requirement.
+
+SoundJS is currently in alpha. We will be making significant improvements to the library, samples, and documentation over the coming weeks. Please be aware that this may necessitate changes to the existing API.
+
+
+The key classes are:
+
+SoundJS
+The core API for playing sounds. Simply call SoundJS.play(sound, options), and a sound instance is created that can be used to control the audio, and receive events when it is complete, loops, or is interrupted.
+
+SoundInstance
+A controllable sound object that wraps the actual plugin implementation, providing a consistent API for audio playback, no matter what happens in the background. Sound instances can be paused, muted, and stopped, and the volume, pan (where available), and position using the simple API.
+
+HTMLAudioPlugin
+The default, built-in plugin, which manages audio playback via the HTML5 <audio> tag.
+
+FlashPlugin
+An additional plugin which uses a flash shim (and SWFObject) to playback audio using Flash.
+
+Have a look at the included examples and API documentation for more in-depth information.
\ No newline at end of file
diff --git a/VERSIONS.txt b/VERSIONS.txt
new file mode 100644
index 00000000..5c46e26f
--- /dev/null
+++ b/VERSIONS.txt
@@ -0,0 +1,11 @@
+Version 0.2.0
+****************************************************************************************************
+Second release, corresponding with the release of the CreateJS suite of tools (createjs.com).
+This version includes a target plugin model that abstracts audio playback to various plugins, which
+can be prioritized. Other updates include controllable sound instances, which are returned when a
+sound is played, providing a much easier way to control audio once it has started playback.
+
+
+Version 0.1.0
+****************************************************************************************************
+Initial release.
\ No newline at end of file
diff --git a/assets/music.mp3 b/assets/music.mp3
deleted file mode 100755
index 5beeca81..00000000
Binary files a/assets/music.mp3 and /dev/null differ
diff --git a/build/build.js b/build/build.js
index 691999f5..2a52f016 100755
--- a/build/build.js
+++ b/build/build.js
@@ -1,397 +1,405 @@
-#!/usr/bin/env node
-
-/************************************************************
-CONFIGURATION
-*/
-// listing of all source files, with dependencies listed in order:
-var SOURCE_FILES = [
-	"../src/soundjs/SoundJS.js",
-];
-
-// default name for lib output:
-var JS_FILE_NAME = "sound.js";
-
-// project name:
-var PROJECT_NAME = "SoundJS";
-
-// url for website or github repo for project:
-var PROJECT_URL = "http://soundjs.com/";
-
-
-// name of directory for docs:
-var DOCS_DIR_NAME = PROJECT_NAME+"_docs";
-
-// name of file for zipped docs:
-var DOCS_FILE_NAME = DOCS_DIR_NAME+".zip";
-
-// name of directory where generated files are placed
-var OUTPUT_DIR_NAME = "output";
-
-
-// path to directory that includes YUI Doc templates
-var TEMPLATE_DIR_PATH = "template";
-
-// tmp directory used when running scripts:
-var TMP_DIR_NAME = "tmp";
-
-// paths to tools:
-var GOOGLE_CLOSURE_PATH = "tools/google-closure/compiler.jar";
-var YUI_DOC_PATH = "tools/yuidoc/bin/yuidoc.py";
-
-// yui version being used
-var YUI_VERSION = 2;
-
-/*
-END CONFIGURATION
-************************************************************/
-
-
-// TODO: add support for recursively checking to see if we are ommiting any files
-
-
-var FILE = require("fs");
-var PATH = require("path");
-var CHILD_PROCESS = require("child_process");
-var OS = require("os");
-
-//file system utils
-var WRENCH = require("wrench");
-
-//for parsing command line args
-var OPTIMIST = require("optimist");
-
-OPTIMIST.describe("v", "Enable verbose output")
-	.alias("v", "verbose")
-	.boolean("v")
-	.describe("l", "List all available tasks")
-	.alias("l", "list")
-	.boolean("l")
-	.describe("h", "Display usage")
-	.alias("h", "help")
-	.boolean("h")
-	.describe("version", "Document build version number")
-	.string("version")
-	.describe("tasks", "Task to run")
-	.default("tasks", "all")
-	.describe("s","Include specified file in compilation. Option can be specified multiple times for multiple files.")
-	.alias("s", "source")
-	.describe("o", "Name of minified JavaScript file.")
-	.alias("o", "output")
-	.default("o", JS_FILE_NAME)
-	.usage("Build Task Manager for "+PROJECT_NAME+"\nUsage\n$0 [-v] [-h] [-l] --tasks=TASK [--version=DOC_VERSION] [--source=FILE] [--output=FILENAME.js]");
-
-
-
-//name of minified js file.
-var js_file_name = JS_FILE_NAME;
-
-var version;
-var verbose;
-
-var TASK = {
-	ALL:"ALL",
-	BUILDDOCS:"BUILDDOCS",
-	BUILDSOURCE:"BUILDSOURCE",
-	CLEAN:"CLEAN"
-};
-
-var extraSourceFiles;
-
-//main entry point for script. Takes optimist argv object which
-//contains command line arguments.
-//This function is called at the bottom of the script
-function main(argv)
-{
-	if(argv.h)
-	{
-		displayUsage();
-		process.exit(0);
-	}
-
-	if(argv.l)
-	{
-		displayTasks();
-		process.exit(0);
-	}
-
-	//default doesn't seem to be working for OPTIMIST right now
-	//if task is not specified, we default to ALL
-	var task = (!argv.tasks)?"ALL":argv.tasks.toUpperCase();
-
-	if(!taskIsRecognized(task))
-	{
-		print("Unrecognized task : " + task);
-		displayUsage();
-		process.exit(1);
-	}
-
-	verbose = argv.v != undefined;
-	version = argv.version;
-
-	extraSourceFiles = argv.s;
-	
-	if(argv.o)
-	{
-		js_file_name = argv.o;
-	}
-
-	var shouldBuildSource = (task == TASK.BUILDSOURCE);
-	var shouldBuildDocs = (task == TASK.BUILDDOCS);
-
-	if(task==TASK.CLEAN)
-	{
-		cleanTask(
-			function(success)
-			{
-				print("Clean Task Completed");
-			}
-		);
-	}
-
-	if(task == TASK.ALL)
-	{	
-		shouldBuildSource = true;
-		shouldBuildDocs = true;
-	}
-
-	if(shouldBuildDocs && (version == undefined))
-	{
-		displayUsage();
-		process.exit(0);
-	}
-
-	if(shouldBuildSource)
-	{
-		buildSourceTask(function(success)
-		{		
-			print("Build Source Task Complete");
-			if(shouldBuildDocs)
-			{
-				buildDocsTask(version,
-					function(success)
-					{
-						print("Build Docs Task Complete");
-					}
-				);
-			}
-
-		});
-	}
-
-	if(shouldBuildDocs && task != "ALL")
-	{
-		buildDocsTask(version,
-			function(success)
-			{
-				print("Build Docs Task Complete");
-			}
-		);
-	}	
-}
-
-
-/********** TASKS *************/
-
-
-function cleanTask(completeHandler)
-{
-	if(PATH.existsSync(TMP_DIR_NAME))
-	{	
-		WRENCH.rmdirSyncRecursive(TMP_DIR_NAME);
-	}
-	
-	if(PATH.existsSync(OUTPUT_DIR_NAME))
-	{
-		WRENCH.rmdirSyncRecursive(OUTPUT_DIR_NAME);
-	}
-}
-
-function buildSourceTask(completeHandler)
-{	
-	if(!PATH.existsSync(OUTPUT_DIR_NAME))
-	{
-		FILE.mkdirSync(OUTPUT_DIR_NAME);
-	}
-
-	var file_args = [];
-	var len = SOURCE_FILES.length;
-	for(var i = 0; i < len; i++)
-	{
-		file_args.push("--js");
-		file_args.push(SOURCE_FILES[i]);
-	}
-	
-	if(extraSourceFiles)
-	{
-		len = extraSourceFiles.length;
-		for(var i = 0; i < len; i++)
-		{
-			file_args.push("--js");
-			file_args.push(extraSourceFiles[i]);
-		}
-	}
-	
-	
-	var tmp_file = PATH.join(OUTPUT_DIR_NAME,"tmp.js");
-	var final_file = PATH.join(OUTPUT_DIR_NAME, js_file_name);
-
-	var cmd = [
-		"java", "-jar", GOOGLE_CLOSURE_PATH
-	].concat(
-			file_args
-		).concat(
-			["--js_output_file", tmp_file]
-		);
-		
-
-	CHILD_PROCESS.exec(
-		cmd.join(" "),
-		function(error, stdout, stderr)
-		{
-			if(verbose)
-			{
-				if(stdout)
-				{
-					print(stdout);
-				}
-			
-				if(stderr)
-				{
-					print(stderr);
-				}
-			}
-
-		    if (error !== null)
-			{
-				print("Error Running Google Closure : " + error);
-				exitWithFailure();
-		    }
-		
-			var license_data = FILE.readFileSync("license.txt", "UTF-8");
-			var final_data = FILE.readFileSync(tmp_file, "UTF-8");
-
-			FILE.writeFileSync(final_file, license_data + final_data, "UTF-8");
-
-			FILE.unlinkSync(tmp_file);
-			
-			completeHandler(true);
-		}
-	);
-}
-
-function buildDocsTask(version, completeHandler)
-{	
-	var parser_in="../src";
-	var	parser_out= PATH.join(TMP_DIR_NAME , "parser");
-
-	var doc_dir=DOCS_DIR_NAME;
-	
-	var generator_out=PATH.join(OUTPUT_DIR_NAME, doc_dir);
-	
-	var cmd = [
-		"python", YUI_DOC_PATH,
-		parser_in,
-		"-p", parser_out,
-		"-o", generator_out,
-		"-t", TEMPLATE_DIR_PATH,
-		"-v", version,
-		"-Y", YUI_VERSION,
-		"-m", PROJECT_NAME,
-		"-u", PROJECT_URL
-	];
-	
-	CHILD_PROCESS.exec(
-		cmd.join(" "),
-		function(error, stdout, stderr)
-		{
-			if(verbose)
-			{
-				if(stdout)
-				{
-					print(stdout);
-				}
-			
-				if(stderr)
-				{
-					print(stderr);
-				}
-			}
-
-		    if (error !== null)
-			{
-				print("Error Running YUI DOC : " + error);
-				exitWithFailure();
-		    }
-		
-			CHILD_PROCESS.exec(
-				"cd " + OUTPUT_DIR_NAME + ";zip -r " + DOCS_FILE_NAME + " " + doc_dir + " -x *.DS_Store",
-				function(error, stdout, stderr)
-				{
-					if(verbose)
-					{
-						if(stdout)
-						{
-							print(stdout);
-						}
-
-						if(stderr)
-						{
-							print(stderr);
-						}
-					}
-
-				    if (error !== null)
-					{
-						print("Error ZIPPING Docs : " + error);
-						exitWithFailure();
-				    }
-				
-					WRENCH.rmdirSyncRecursive(TMP_DIR_NAME);
-				
-					completeHandler(true);				
-				});		
-		
-		
-		});	
-}
-
-/*************** some util methods ******************/
-
-function exitWithFailure()
-{
-	process.exit(1);
-}
-
-function displayUsage()
-{
-	print(OPTIMIST.help());
-}
-
-function displayTasks()
-{
-	var out = "Available tasks: ";
-	
-	for(var _t in TASK)
-	{
-		out += TASK[_t] +", "
-	}
-	
-	print(out.slice(0, -2));
-}
-
-function taskIsRecognized(task)
-{
-	return TASK.hasOwnProperty(task);
-}
-
-function print(msg)
-{
-	console.log(msg);
-}
-
-//call the main script entry point
-main(OPTIMIST.argv);
-
-
-
-
+#!/usr/bin/env node
+
+/************************************************************
+CONFIGURATION
+*/
+// listing of all source files, with dependencies listed in order:
+var SOURCE_FILES = [
+	"../src/soundjs/SoundJS.js",
+	"../src/soundjs/HTMLAudioPlugin.js",
+	//"../src/soundjs/FlashPlugin.js"
+];
+
+// default name for lib output:
+var JS_FILE_NAME = "soundjs-%VERSION%.min.js";
+
+// project name:
+var PROJECT_NAME = "SoundJS";
+
+// url for website or github repo for project:
+var PROJECT_URL = "http://soundjs.com";
+
+// name of directory for docs:
+var DOCS_DIR_NAME = PROJECT_NAME+"_docs-%VERSION%";
+
+// name of file for zipped docs:
+var DOCS_FILE_NAME = DOCS_DIR_NAME+".zip";
+
+// name of directory where generated files are placed
+var OUTPUT_DIR_NAME = "output";
+
+
+// path to directory that includes YUI Doc templates
+var TEMPLATE_DIR_PATH = "template";
+
+// tmp directory used when running scripts:
+var TMP_DIR_NAME = "tmp";
+
+// paths to tools:
+var GOOGLE_CLOSURE_PATH = "tools/google-closure/compiler.jar";
+var YUI_DOC_PATH = "tools/yuidoc/bin/yuidoc.py";
+
+// yui version being used
+var YUI_VERSION = 2;
+
+
+/*
+END CONFIGURATION
+************************************************************/
+
+
+// TODO: add support for recursively checking to see if we are ommiting any files
+
+
+var FILE = require("fs");
+var PATH = require("path");
+var CHILD_PROCESS = require("child_process");
+var OS = require("os");
+
+//file system utils
+var WRENCH = require("wrench");
+
+//for parsing command line args
+var OPTIMIST = require("optimist");
+
+OPTIMIST.describe("v", "Enable verbose output")
+	.alias("v", "verbose")
+	.boolean("v")
+	.describe("l", "List all available tasks")
+	.alias("l", "list")
+	.boolean("l")
+	.describe("h", "Display usage")
+	.alias("h", "help")
+	.boolean("h")
+	.describe("version", "Document build version number")
+	.string("version")
+	.describe("tasks", "Task to run")
+	.default("tasks", "all")
+	.describe("s","Include specified file in compilation. Option can be specified multiple times for multiple files.")
+	.alias("s", "source")
+	.describe("o", "Name of minified JavaScript file.")
+	.alias("o", "output")
+	.default("o", JS_FILE_NAME)
+	.usage("Build Task Manager for "+PROJECT_NAME+"\nUsage\n$0 [-v] [-h] [-l] --tasks=TASK [--version=DOC_VERSION] [--source=FILE] [--output=FILENAME.js]");
+
+
+
+//name of minified js file.
+var js_file_name = JS_FILE_NAME;
+
+var version;
+var verbose;
+
+var TASK = {
+	ALL:"ALL",
+	BUILDDOCS:"BUILDDOCS",
+	BUILDSOURCE:"BUILDSOURCE",
+	CLEAN:"CLEAN"
+};
+
+var extraSourceFiles;
+
+//main entry point for script. Takes optimist argv object which
+//contains command line arguments.
+//This function is called at the bottom of the script
+function main(argv)
+{
+	if(argv.h)
+	{
+		displayUsage();
+		process.exit(0);
+	}
+
+	if(argv.l)
+	{
+		displayTasks();
+		process.exit(0);
+	}
+
+	//default doesn't seem to be working for OPTIMIST right now
+	//if task is not specified, we default to ALL
+	var task = (!argv.tasks)?"ALL":argv.tasks.toUpperCase();
+
+	if(!taskIsRecognized(task))
+	{
+		print("Unrecognized task : " + task);
+		displayUsage();
+		process.exit(1);
+	}
+
+	verbose = argv.v != undefined;
+	version = argv.version;
+
+	extraSourceFiles = argv.s;
+
+	if(argv.o)
+	{
+		js_file_name = argv.o;
+	}
+
+	var shouldBuildSource = (task == TASK.BUILDSOURCE);
+	var shouldBuildDocs = (task == TASK.BUILDDOCS);
+
+	if(task==TASK.CLEAN)
+	{
+		cleanTask(
+			function(success)
+			{
+				print("Clean Task Completed");
+			}
+		);
+	}
+
+	if(task == TASK.ALL)
+	{
+		shouldBuildSource = true;
+		shouldBuildDocs = true;
+	}
+
+	if(shouldBuildDocs && (version == undefined))
+	{
+		displayUsage();
+		process.exit(0);
+	}
+
+	if(shouldBuildSource)
+	{
+		buildSourceTask(function(success)
+		{
+			print("Build Source Task Complete");
+			if(shouldBuildDocs)
+			{
+				buildDocsTask(version,
+					function(success)
+					{
+						print("Build Docs Task Complete");
+					}
+				);
+			}
+
+		});
+	}
+
+	if(shouldBuildDocs && task != "ALL")
+	{
+		buildDocsTask(version,
+			function(success)
+			{
+				print("Build Docs Task Complete");
+			}
+		);
+	}
+}
+
+
+/********** TASKS *************/
+
+
+function cleanTask(completeHandler)
+{
+	if(PATH.existsSync(TMP_DIR_NAME))
+	{
+		WRENCH.rmdirSyncRecursive(TMP_DIR_NAME);
+	}
+
+	if(PATH.existsSync(OUTPUT_DIR_NAME))
+	{
+		WRENCH.rmdirSyncRecursive(OUTPUT_DIR_NAME);
+	}
+}
+
+function buildSourceTask(completeHandler)
+{
+	if(!PATH.existsSync(OUTPUT_DIR_NAME))
+	{
+		FILE.mkdirSync(OUTPUT_DIR_NAME);
+	}
+
+	js_file_name = js_file_name.split("%VERSION%").join(version);
+
+	var file_args = [];
+	var len = SOURCE_FILES.length;
+	for(var i = 0; i < len; i++)
+	{
+		file_args.push("--js");
+		file_args.push(SOURCE_FILES[i]);
+	}
+
+	if(extraSourceFiles)
+	{
+		len = extraSourceFiles.length;
+		for(var i = 0; i < len; i++)
+		{
+			file_args.push("--js");
+			file_args.push(extraSourceFiles[i]);
+		}
+	}
+
+
+	var tmp_file = PATH.join(OUTPUT_DIR_NAME,"tmp.js");
+	var final_file = PATH.join(OUTPUT_DIR_NAME, js_file_name);
+
+	var cmd = [
+		"java", "-jar", GOOGLE_CLOSURE_PATH
+	].concat(
+			file_args
+		).concat(
+			["--js_output_file", tmp_file]
+		);
+
+
+	CHILD_PROCESS.exec(
+		cmd.join(" "),
+		function(error, stdout, stderr)
+		{
+			if(verbose)
+			{
+				if(stdout)
+				{
+					print(stdout);
+				}
+
+				if(stderr)
+				{
+					print(stderr);
+				}
+			}
+
+		    if (error !== null)
+			{
+				print("Error Running Google Closure : " + error);
+				exitWithFailure();
+		    }
+
+			var license_data = FILE.readFileSync("license.txt", "UTF-8");
+			var final_data = FILE.readFileSync(tmp_file, "UTF-8");
+
+			FILE.writeFileSync(final_file, license_data + final_data, "UTF-8");
+
+			FILE.unlinkSync(tmp_file);
+
+			completeHandler(true);
+		}
+	);
+}
+
+function buildDocsTask(version, completeHandler)
+{
+	var parser_in="../src";
+	var	parser_out= PATH.join(TMP_DIR_NAME , "parser");
+
+	var doc_dir=DOCS_DIR_NAME.split("%VERSION%").join(version);
+	var doc_file=DOCS_FILE_NAME.split("%VERSION%").join(version);
+
+	var generator_out=PATH.join(OUTPUT_DIR_NAME, doc_dir);
+
+	var cmd = [
+		"python", YUI_DOC_PATH,
+		parser_in,
+		"-p", parser_out,
+		"-o", generator_out,
+		"-t", TEMPLATE_DIR_PATH,
+		"-v", version,
+		"-Y", YUI_VERSION,
+		"-m", PROJECT_NAME,
+		"-u", PROJECT_URL
+	];
+
+	CHILD_PROCESS.exec(
+		cmd.join(" "),
+		function(error, stdout, stderr)
+		{
+			if(verbose)
+			{
+				if(stdout)
+				{
+					print(stdout);
+				}
+
+				if(stderr)
+				{
+					print(stderr);
+				}
+			}
+
+		    if (error !== null)
+			{
+				print("Error Running YUI DOC : " + error);
+				exitWithFailure();
+		    }
+
+			CHILD_PROCESS.exec(
+				"cd " + OUTPUT_DIR_NAME + ";zip -r " + doc_file + " " + doc_dir + " -x *.DS_Store",
+				function(error, stdout, stderr)
+				{
+					if(verbose)
+					{
+						if(stdout)
+						{
+							print(stdout);
+						}
+
+						if(stderr)
+						{
+							print(stderr);
+						}
+					}
+
+				    if (error !== null)
+					{
+						print("Error ZIPPING Docs : " + error);
+						exitWithFailure();
+				    }
+
+					WRENCH.rmdirSyncRecursive(TMP_DIR_NAME);
+
+					completeHandler(true);
+				});
+
+
+		});
+}
+
+/*************** some util methods ******************/
+
+function exitWithFailure()
+{
+	process.exit(1);
+}
+
+function displayUsage()
+{
+	print(OPTIMIST.help());
+}
+
+function displayTasks()
+{
+	var out = "Available tasks: ";
+
+	for(var _t in TASK)
+	{
+		out += TASK[_t] +", "
+	}
+
+	print(out.slice(0, -2));
+}
+
+function taskIsRecognized(task)
+{
+	return TASK.hasOwnProperty(task);
+}
+
+function print(msg)
+{
+	console.log(msg);
+}
+
+//call the main script entry point
+main(OPTIMIST.argv);
+
+
+
+
+
+
+
diff --git a/build/flashplugin-license.txt b/build/flashplugin-license.txt
new file mode 100644
index 00000000..b7f63143
--- /dev/null
+++ b/build/flashplugin-license.txt
@@ -0,0 +1,31 @@
+/**
+* SoundJS
+* Visit http://createjs.com/ for documentation, updates and examples.
+*
+* Copyright (c) 2012 Grant Skinner
+* 
+* 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.
+**/
+
+/**
+ * SoundJS FlashPlugin also includes swfobject (http://code.google.com/p/swfobject/)
+ */
\ No newline at end of file
diff --git a/build/license.txt b/build/license.txt
index 14baf1bf..f4bd765b 100644
--- a/build/license.txt
+++ b/build/license.txt
@@ -1,27 +1,27 @@
-/**
-* EaselJS
-* Visit http://easeljs.com/ for documentation, updates and examples.
-*
-* Copyright (c) 2011 Grant Skinner
-* 
-* 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.
-**/
+/**
+* SoundJS
+* Visit http://createjs.com/ for documentation, updates and examples.
+*
+* Copyright (c) 2012 Grant Skinner
+* 
+* 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.
+**/
diff --git a/build/template/assets/logo.png b/build/template/assets/logo.png
index e51d6042..584f7bcc 100644
Binary files a/build/template/assets/logo.png and b/build/template/assets/logo.png differ
diff --git a/build/template/main.tmpl b/build/template/main.tmpl
index dae69321..7b3db15a 100644
--- a/build/template/main.tmpl
+++ b/build/template/main.tmpl
@@ -1,682 +1,682 @@
-#encoding UTF-8
-#filter EncodeUnicode
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html xmlns:yui="http://yuilibrary.com/rdf/1.0/yui.rdf#">
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<title>EaselJS API Documentation</title>
-
-	<link rel="stylesheet" type="text/css" href="assets/reset-fonts-grids-min.css?stamp=$timestamp" />
-	<link rel="stylesheet" type="text/css" href="assets/api.css?stamp=$timestamp" />
-
-    <script type="text/javascript" src="assets/api-js?stamp=$timestamp"></script>
-    <script type="text/javascript" src="assets/ac-js?stamp=$timestamp"></script>
-</head>
-
-<body id="yahoo-com">
-
-<div id="doc3" class="yui-t2">
-	<div id="hd">
-        <h1><a href="$projecturl" title="$projectname">$projectname</a></h1>
-        <h3>$moduletitle&nbsp; <span class="subtitle">$version</span></h3>
-        <a href="./index.html" title="$projectname">$projectname</a> 
-        #if $modulename
-            &gt; <a href="./${cleansedmodulename}.html" title="$modulename">$modulename</a>
-                #if $classname# &gt; $classname #end if#
-                #if $filename# &gt; $filename (source view) #end if#
-        #end if
-        <form onsubmit="return false">
-            <div id="propertysearch">
-                Search: <input autocomplete="off" id="searchinput" />
-                <div id="searchresults">
-                    &nbsp;
-                </div>
-            </div>
-        </form>
-	</div>
-
-	<div id="bd">
-		<div id="yui-main">
-			<div class="yui-b">
-            <form action="#" name="yui-classopts-form" method="get" id="yui-classopts-form">
-                <fieldset>
-                    <legend>Filters</legend>
-                <span class="classopts"><input type="checkbox" name="show_private" id="show_private" /> <label for="show_private">Show Private</label></span>
-                <span class="classopts"><input type="checkbox" name="show_protected" id="show_protected" /> <label for="show_protected">Show Protected</label></span>
-                <span class="classopts"><input type="checkbox" name="show_deprecated" id="show_deprecated" /> <label for="show_deprecated">Show Deprecated</label></span>
-                </fieldset>
-            </form>
-                #if $index
-
-                    <div class="summary description">
-                      This is the API documentation for the 
-                      <a href="http://easeljs.com">EaselJS JavaScript Library</a>.
-                    </div>
-
-                #end if
-
-                #if $filename
-                    <div id="srcout">
-                        <style>
-                            #doc3 .classopts { display:none; }
-                        </style>
-                        #include raw $filepath_highlighted
-                    </div>
-                #else if $classname 
-                    <h2>
-                        #if $access#<code>$access</code>#end if#
-
-                        #if $static#<code>$static</code>#end if#
-                        #if $final#<code>$final</code>#end if#
-                            Class <b property="yui:name">$classname</b>
-                        <span class="extends">
-                        #if $extends
-                           - extends <a href="${extends}.html" title="$extends">$extends</a>
-                        #end if
-                        </span>
-
-                        #if $uses
-                            <span class="extends" rel="yui:extends">
-                          - uses 
-                            #set $i=0
-                            #for $provider in $uses##if $i > 0#, #end if#
-                                <span rel="extend" resource="${provider}.html">
-                                <a href="${provider}.html" property="yui:name" title="$provider">$provider</a>#set $i=$i+1#
-                                </span>
-                            #end for#
-                            
-                        </span>
-                        #end if
-                    </h2>
-                    <!-- class tree goes here -->
-                    
-                    #if $subclasses
-                        <dl class="subclasses" rel="yui:subclasses">
-                            <dt>Known Subclasses:</dt>
-                            <dd>
-                                #for $subclass in $subclasses
-                                    <span rel="yui:subclass" resource="${subclass}.html">
-                                    <a href="${subclass}.html" property="yui:name" title="$subclass">$subclass</a>
-                                    </span>
-                                #end for
-                            </dd>
-                       </dl>
-                    #end if
-                
-                    #if $deprecated
-                        <div class="deprecated"><strong>Deprecated:</strong> $deprecated</div>
-                    #end if
-  
-                    #if $see
-                        <div class="deprecated"><strong>See also:</strong> $see</div>
-                    #end if
-
-                    <div class="summary description" property="yui:description">
-                        $description
-                    </div>
-
-                    #if $constructor
-                        <div class="section constructor details" rel="yui:constructor" resource="#constructor">
-                        <h3 id="constructor">Constructor</h3>
-                        <div class="content">
-                            <div class="detail">
-                                <strong property="yui:name">$classname</strong>
-                                <code>
-                                    (
-                                    #if $constructor.params
-                                        #set $i=0
-                                        #set $current=""
-  
-                                        #for $param in $constructor.params#
-                                            #if $current != $param.name
-                                                #if $i > 0#, #end if#
-                                                #set $i = $i + 1
-                                                #set $current = $param.name
-                                                $param.name
-                                            #end if
-                                        #end for
-                                    #end if
-                                    )
-                                </code>
-                                <div class="description">
-                                    #if $constructor.params
-                                        <dl rel="yui:parameters">
-                                            <dt>Parameters:</dt>
-                                            #for $param in $constructor.params
-                                                <dd rel="yui:parameter">
-                                                    <code><span property="yui:name">$param.name</span>
-                                                    &lt;<span property="yui:type">$param.type</span>&gt;
-                                                    </code>
-                                                    <span property="yui:description">$param.description</span>
-                                                </dd>
-                                            #end for
-                                        </dl>
-                                    #end if
-                                    
-                                    #if $constructor.return
-                                        <dl>
-                                            <dt>Returns:</dt>
-                                            <dd property="yui:return">
-                                                $constructor.return
-                                            </dd>
-                                        </dl>
-                                    #end if 
-                                    
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    #end if
-                    
-                    <div rel="yui:properties" resource="#properties">
-                    #if $properties
-                        <div class="section field details">
-                            <h3 id="properties">Properties</h3>
-                            <div class="content">
-                                #for $property in $properties
-                                    <div class="$property.access#if $property.deprecated# deprecated#end if#" rel="yui:property" resource="#property_$property.name">
-                                    <h4><a name="property_$property.name" property="yui:name">$property.name</a>
-                                        - <code>#if $property.access#$property.access #end if##if $property.static#$property.static #end if##if $property.final#$property.final #end if#<span property="yui:type">$property.type</span></code>
-                                    </h4>
-                                    <div class="detail">
-                                        <div class="description" property="yui:description">
-                                            $property.description
-                                        </div>
-                                    </div>
-     
-                                        
-                                    #if $property.default
-                                    <div class="default" property="yui:defaultValue">
-                                        Default Value: $property.default
-                                    </div>        
-                                    #end if
-
-                                     #if $property.deprecated
-                                    <div class="deprecated" property="yui:deprecated">
-                                        <strong>Deprecated:</strong> $property.deprecated
-                                    </div>        
-                                    #end if
-
-                                    <hr />
-                                    </div>
-                                #end for
-                            </div>
-                        </div>
-                    #end if
-
-                    #if $inherited.properties
-                        <div rel="yui:inheritance">
-                        #for $superclassname in $inherited.properties
-                        <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
-                            <h4>Properties inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
-                            <div class="content" rel="yui:properties">
-                                <code>
-                                    #set i=0
-                                    #set l=len($inherited.properties[$superclassname])-1
-                                    #for $prop in $inherited.properties[$superclassname]#
-                                        <span rel="yui:property" resource="${superclassname}.html#property_$prop.name">
-                                        <a class="$prop.access#if $prop.deprecated# deprecated#end if#" href="${superclassname}.html#property_$prop.name" property="yui:name" title="$prop.name">$prop.name</a>#if $i<$l#<span class="$prop.access#if $prop.deprecated# deprecated#end if#">,</span>#end if#
-                                        </span>
-                                        #set i=i+1
-                                    #end for#
-                                </code>
-                            </div>
-                        </div>
-                        #end for
-                        </div>
-                    #end if
-                    </div>
-
-                    <div rel="yui:methods" resource="#methods">
-                    #if $methods
-                        <div class="section method details">
-                            <h3 id="methods">Methods</h3>
-                            <div class="content">
-                                #for $method in $methods
-                                    <div class="$method.access#if $method.deprecated# deprecated#end if#" rel="yui:method" resource="#method_$method.name">
-                                    <h4>
-                                        <a name="method_$method.name">$method.name</a></h4>
-                                    <div class="detail" >
-                                        <code>
-                                        #if $method.access# $method.access #end if#
-                                        #if $method.static# $method.static #end if#
-                                        #if $method.final# $method.final #end if#
-                                        $method.return.type
-                                            <strong property="yui:name">$method.name</strong>
-                                           (
-                                            #if $method.params
-                                                #set $i=0
-                                                #set $current = ""
-                                                #for $param in $method.params#
-                                                    #if $current != $param.name
-                                                        #if $i > 0#, #end if#
-                                                        #set $i = $i + 1
-                                                        #set $current = $param.name
-                                                         $param.name
-                                                    #end if#
-                                                #end for#
-                                            #end if
-                                            )
-                                        </code>
-                                        
-                                        <div class="description" property="yui:description">
-                                            $method.description
-                                        </div>
-
-                                        <div class="description">
-
-                                            #if $method.params
-                                                <dl rel="yui:parameters">
-                                                    <dt>Parameters:</dt>
-                                                    #for $param in $method.params
-                                                        <dd rel="yui:parameter">
-                                                        <code><span property="yui:name">$param.name</span>
-                                                        &lt;<span property="yui:type">$param.type</span>&gt;
-                                                        </code>
-                                                        <span property="yui:description">$param.description</span>
-                                                        </dd>
-                                                    #end for
-                                                </dl>
-                                            #end if
-
-                                            #if $method.return.type
-                                                <dl>
-                                                    <dt>Returns:
-                                                    <code property="yui:return">
-                                                        $method.return.type
-                                                    </code></dt>
-                                                    <dd property="yui:returnInfo">$method.return.description</dd>
-                                                </dl>
-                                            #end if
-
-                                            #if $method.chainable
-                                            <div class="chainable">
-                                                <strong>Chainable:</strong> This method is chainable.
-                                            </div>        
-                                            #end if
-
-             
-                                            #if $method.deprecated
-                                            <div class="deprecated">
-                                                <strong>Deprecated</strong> $method.deprecated
-                                            </div>        
-                                            #end if
-
-                                        </div>
-
-                                    </div>
-                                    <hr />
-                                    </div>
-                                #end for
-                            </div>
-                        </div>
-                    #end if
-
-                    #if $inherited.methods
-                        <div rel="yui:inheritance">                    
-                        #for $superclassname in $inherited.methods
-                            <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
-                                <h4>Methods inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
-                                <div class="content" rel="yui:methods">
-                                    <code>
-                                        #set i=0
-                                        #set l=len($inherited.methods[$superclassname])-1
-                                        #for $method in $inherited.methods[$superclassname]
-                                            <span rel="yui:method" resource="${superclassname}.html#method_$method.name">                                        
-                                            <a class="$method.access#if $method.deprecated# deprecated#end if#" href="${superclassname}.html#method_$method.name" property="yui:name" title="$method.name">$method.name</a>#if $i<$l#<span class="$method.access#if $method.deprecated# deprecated#end if#">,</span>#end if#
-                                            </span>
-                                            #set i=i+1
-                                            #end for
-                                    </code>
-                                </div>
-                            </div>
-                        #end for
-                        </div>
-                    #end if
-                    </div>
-
-                    <div rel="yui:events" resource="#events">
-                    #if $events
-                        <div class="section method details">
-                            <h3 id="events">Events</h3>
-                            <div class="content">
-                                #for $event in $events
-                                    <div class="$event.access#if $event.deprecated# deprecated#end if#" rel="yui:event" resource="#event_$event.name">
-                                    <h4>
-                                        <a name="event_$event.name">$event.name</a></h4>
-                                    <div class="detail">
-                                        <code>
-                                        #if $event.access# $event.access #end if#
-                                        #if $event.static# $event.static #end if#
-                                        #if $event.final# $event.final #end if#
-                                            <strong property="yui:name">$event.name</strong>
-
-                                            (
-                                            #if $event.params
-                                                #set $i=0
-                                                #set $current = ""
-                                                #for $param in $event.params#
-                                                    #if $current != $param.name
-                                                        #if $i > 0#, #end if#
-                                                        #set $i = $i + 1
-                                                        #set $current = $param.name
-                                                         $param.name
-                                                    #end if#
-                                                #end for#
-                                            #end if
-                                            )
-
-                                        </code>
-                                        
-                                        <div class="description" property="yui:description">
-                                            $event.description
-                                        </div>
-
-                                        <div class="description">
-
-
-                                            #if $event.params
-                                                <dl rel="yui:parameters">
-                                                    <dt>Parameters:</dt>
-                                                    #for $param in $event.params
-                                                        <dd rel="yui:parameter">
-                                                            <code><span property="yui:name">$param.name</span>
-                                                                &lt;<span property="yui:type">$param.type</span>&gt;
-                                                            </code>
-                                                            <span property="yui:description">$param.description</span>
-                                                        </dd>
-                                                        
-                                                    #end for
-                                                </dl>
-                                            #end if
-
-                                            #if $event.bubbles
-                                            <div class="bubbles">
-                                                <strong>Bubbles:</strong> This event bubbles to <a href="${event.bubbles}.html" title="$event.bubbles">$event.bubbles</a>.
-                                            </div>        
-                                            #end if
-                                            #if $event.preventable
-                                            <div class="preventable">
-                                                <strong>Preventable:</strong> This event is preventable by method: $event.preventable.
-                                            </div>        
-                                            #end if
-
-                                            #if $event.deprecated
-                                            <div class="deprecated">
-                                                <strong>Deprecated</strong> $event.deprecated
-                                            </div>        
-                                            #end if
-                                        </div>
-
-                                    </div>
-                                    <hr />
-                                    </div>
-                                #end for
-                            </div>
-                        </div>
-                    #end if
-
-
-                    #if $inherited.events
-                        <div rel="yui:inheritance">                    
-                        #for $superclassname in $inherited.events
-                        <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
-                            <h4>Events inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
-                            <div class="content" rel="yui:events">
-                                <code>
-                                    #set i=0
-                                    #set l=len($inherited.methods[$superclassname])-1
-                                    #for $event in $inherited.events[$superclassname]
-                                        #set i=i+1
-                                        <span rel="yui:event" resource="${superclassname}.html#event_$event.name">
-                                        <a class="$event.access#if $event.deprecated# deprecated#end if#" href="${superclassname}.html#event_$event.name" property="yui:name" title="$event.name">$event.name</a>#if $i<$l#<span class="$event.access#if $event.deprecated# deprecated#end if#">,</span>#end if##set i=i+1#
-                                        </span>
-                                    #end for#
-                                </code>
-                            </div>
-                        </div>
-                        #end for
-                        </div>
-                    #end if
-                    </div>
-
-                    <div rel="yui:attributes" resource="#configattributes">
-                    #if $configs
-                        <div class="section field details">
-                            <h3 id="configattributes">Configuration Attributes</h3>
-                            <div class="content">
-                                #for $config in $configs
-                                    <div class="$config.access#if $config.deprecated# deprecated#end if#" rel="yui:attribute" resource="#config_$config.name">
-                                    <h4><a name="config_$config.name">$config.name</a>
-                                        <code>- #if $config.access#$config.access #end if##if $config.static#$config.static #end if##if $config.writeonce#$config.writeonce #end if##if $config.final#$config.final #end if#<span property="yui:type">$config.type</span></code>
-                                    </h4>
-                                    <div class="detail">
-                                        <div class="description" property="yui:description">
-                                            $config.description
-                                        </div>
-                                    </div>
- 
-                                    #if $config.deprecated
-                                    <div class="deprecated">
-                                        <strong>Deprecated</strong> $config.deprecated
-                                    </div>        
-                                    #end if
-     
-                                    #if $config.default
-                                    <div class="default">
-                                        Default Value: $config.default
-                                    </div>        
-                                    #end if
-
-                                    <hr />
-                                    </div>        
-                                #end for
-
-                            </div>
-                        </div>
-                    #end if
-
-                    #if $inherited.configs
-                        <div rel="yui:inheritance">                    
-                        #for $superclassname in $inherited.configs
-                        <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
-                            <h4>Configuration attributes inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
-                            <div class="content" rel="yui:attributes">
-                                <code>
-                                    #set i=0
-                                    #set l=len($inherited.methods[$superclassname])-1
-                                    #for $config in $inherited.configs[$superclassname]
-                                        #set i=i+1
-                                        <span rel="yui:attribute" resource="${superclassname}.html#config_$config.name">                                        
-                                        <a class="$config.access#if $config.deprecated# deprecated#end if#" href="${superclassname}.html#config_$config.name" property="yui:name" title="$config.name">$config.name</a>#if $i<$l#<span class="$config.access#if $config.deprecated# deprecated#end if#">,</span>#end if#
-                                        </span>
-                                        #set i=i+1
-                                        #end for#
-                                </code>
-                            </div>
-                        </div>
-                        #end for
-                        </div>
-                    #end if
-                    </div>
-
-                #else if $modulename
-                   
-                    <h3>Module: $modulename
-                    
-                    #if $beta
-                    <span class="description"><em>Beta</em></span>
-                    #end if
-
-                    #if $experimental
-                    <span class="description"><em>Experimental</em></span>
-                    #end if
-
-                    </h3>
-                    <div class="description summary">
-                        $moduledesc
-                    </div>
-
-
-                    #if $requires
-                    <div class="content">
-                        Requires: $requires
-                    </div>
-                    #end if
-                    #if $optional
-                    <div class="content">
-                        Optional: $optional
-                    </div>
-                    #end if
-
-                <div class="yui-gc">
-                    <div class="yui-u first">
-
-                        #if $classnames
-                            <p>This module contains the following classes:</p>
-                            <script>
-                            //var YUI_CLASS_LIST = $classList;
-                            </script>
-                            <div id="splash_classList">
-                                <ul>
-                                #set $counter = 0
-                                #for $classNames in $classList_raw
-                                    <li><a href="${classNames.name}.html" title="$classNames.name" id="class_${counter}">$classNames.guessedname</a></li>
-                                    #set $counter = $counter + 1
-                                #end for
-                                </ul>
-                            </div>
-                        #end if
-                    </div>
-                    <div class="yui-u">
-                            #set count = 0;
-                            #for $info in $submodules
-                                #set count = count + 1
-                            #end for
-                                    #if count != 0 
-                                    <div class="submodules">
-                                        <h4>Submodules:</h4> 
-                                        <dl>
-                                        #for $info in $submodules
-                                            <dt><code><a href="${$subdata[$info].name}.html" title="$info">$info</a></code></dt>
-                                            <dd>$subdata[$info].description</dd>
-                                        #end for
-                                        </dl>
-                                    </div>
-                                    #end if
-
-                        </div>
-                </div>
-
-                #end if
-			</div>
-		</div>
-		<div class="yui-b">
-            <div class="nav">
-
-                #if $modulenames
-                    <div id="moduleList" class="module">
-                        <h4>Modules</h4>
-                        <ul class="content">
-                            #for $moduledef in $modulenames
-                                #set $css = ""
-                                #if $moduledef == $modulename
-                                    #set $css = "selected"
-                                #end if
-                                <li class="$css"><a href="module_${moduledef}.html" title="$moduledef">$moduledef</a></li>
-                            #end for
-                        </ul>
-                    </div>
-                #end if
-
-                #if $classnames
-                    <div id="classList" class="module">
-                        <h4>Classes</h4>
-                        <ul class="content">
-                            #for $classdef in $classnames
-                                #set $css = ""
-                                #if $classdef == $classname
-                                    #set $css = "selected"
-                                #end if
-                                <li class="$css"><a href="${classdef}.html" title="$classdef">$classdef</a></li>
-                            #end for
-                        </ul>
-                    </div>
-                #end if
-
-                #if $filenames
-                    <div id="fileList" class="module">
-                        <h4>Files</h4>
-                        <ul class="content">        
-                            #for $filedef in $filenames
-                                #set $css = ""
-                                #if $filedef == $filename
-                                    #set $css = "selected"
-                                #end if
-                                <li class="$css"><a href="${filedef}.html" title="$filedef">$filedef</a></li>
-                            #end for
-                        </ul>
-                    </div>
-                #end if
-
-                #if $properties
-                    <div id="propertyList" class="module">
-                        <h4>Properties</h4>
-                        <ul class="content">        
-                            #for $prop in $properties
-                                <li class="${prop.access}#if $prop.deprecated# deprecated#end if#"><a href="#property_${prop.name}" title="$prop.name">$prop.name</a></li>
-                            #end for
-                        </ul>
-                    </div>
-                #end if
-
-                #if $methods
-                    <div id="methodsList" class="module">
-                        <h4>Methods</h4>
-                        <ul class="content">        
-                            #for $method in $methods
-                                <li class="${method.access}#if $method.deprecated# deprecated#end if#"><a href="#method_${method.name}" title="$method.name">$method.name</a></li>
-                            #end for
-                        </ul>
-                    </div>
-                #end if
-
-                #if $events
-                    <div id="eventsList" class="module">
-                        <h4>Events</h4>
-                        <ul class="content">        
-                            #for $event in $events
-                                <li class="${event.access}#if $event.deprecated# deprecated#end if#"><a href="#event_${event.name}" title="$event.name">$event.name</a></li>
-                            #end for
-                        </ul>
-                    </div>
-                #end if
-
-                #if $configs
-                    <div id="configList" class="module">
-                        <h4>Configuration Attributes</h4>
-                        <ul class="content">        
-                            #for $config in $configs
-                                <li class="${config.access}#if $config.deprecated# deprecated#end if#"><a href="#config_${config.name}" title="$config.name">$config.name</a></li>
-                            #end for
-                        </ul>
-                    </div>
-                #end if
-
-            </div>
-		</div>
-	</div>
-	
-	<!--footer-->
-	<!--
-	<div id="ft">
-        <hr />
-	</div>
-	-->
-</div>
-<script type="text/javascript">
-    ALL_YUI_PROPS = $allprops;
-</script>
-</body>
-</html>
-#end filter
+#encoding UTF-8
+#filter EncodeUnicode
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns:yui="http://yuilibrary.com/rdf/1.0/yui.rdf#">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<title>SoundJS API Documentation</title>
+
+	<link rel="stylesheet" type="text/css" href="assets/reset-fonts-grids-min.css?stamp=$timestamp" />
+	<link rel="stylesheet" type="text/css" href="assets/api.css?stamp=$timestamp" />
+
+    <script type="text/javascript" src="assets/api-js?stamp=$timestamp"></script>
+    <script type="text/javascript" src="assets/ac-js?stamp=$timestamp"></script>
+</head>
+
+<body id="yahoo-com">
+
+<div id="doc3" class="yui-t2">
+	<div id="hd">
+        <h1><a href="$projecturl" title="$projectname">$projectname</a></h1>
+        <h3>$moduletitle&nbsp; <span class="subtitle">$version</span></h3>
+        <a href="./index.html" title="$projectname">$projectname</a> 
+        #if $modulename
+            &gt; <a href="./${cleansedmodulename}.html" title="$modulename">$modulename</a>
+                #if $classname# &gt; $classname #end if#
+                #if $filename# &gt; $filename (source view) #end if#
+        #end if
+        <form onsubmit="return false">
+            <div id="propertysearch">
+                Search: <input autocomplete="off" id="searchinput" />
+                <div id="searchresults">
+                    &nbsp;
+                </div>
+            </div>
+        </form>
+	</div>
+
+	<div id="bd">
+		<div id="yui-main">
+			<div class="yui-b">
+            <form action="#" name="yui-classopts-form" method="get" id="yui-classopts-form">
+                <fieldset>
+                    <legend>Filters</legend>
+                <span class="classopts"><input type="checkbox" name="show_private" id="show_private" /> <label for="show_private">Show Private</label></span>
+                <span class="classopts"><input type="checkbox" name="show_protected" id="show_protected" /> <label for="show_protected">Show Protected</label></span>
+                <span class="classopts"><input type="checkbox" name="show_deprecated" id="show_deprecated" /> <label for="show_deprecated">Show Deprecated</label></span>
+                </fieldset>
+            </form>
+                #if $index
+
+                    <div class="summary description">
+                      This is the API documentation for the 
+                      <a href="http://createjs.com/#!SoundJS">SoundJS JavaScript Library</a>.
+                    </div>
+
+                #end if
+
+                #if $filename
+                    <div id="srcout">
+                        <style>
+                            #doc3 .classopts { display:none; }
+                        </style>
+                        #include raw $filepath_highlighted
+                    </div>
+                #else if $classname 
+                    <h2>
+                        #if $access#<code>$access</code>#end if#
+
+                        #if $static#<code>$static</code>#end if#
+                        #if $final#<code>$final</code>#end if#
+                            Class <b property="yui:name">$classname</b>
+                        <span class="extends">
+                        #if $extends
+                           - extends <a href="${extends}.html" title="$extends">$extends</a>
+                        #end if
+                        </span>
+
+                        #if $uses
+                            <span class="extends" rel="yui:extends">
+                          - uses 
+                            #set $i=0
+                            #for $provider in $uses##if $i > 0#, #end if#
+                                <span rel="extend" resource="${provider}.html">
+                                <a href="${provider}.html" property="yui:name" title="$provider">$provider</a>#set $i=$i+1#
+                                </span>
+                            #end for#
+                            
+                        </span>
+                        #end if
+                    </h2>
+                    <!-- class tree goes here -->
+                    
+                    #if $subclasses
+                        <dl class="subclasses" rel="yui:subclasses">
+                            <dt>Known Subclasses:</dt>
+                            <dd>
+                                #for $subclass in $subclasses
+                                    <span rel="yui:subclass" resource="${subclass}.html">
+                                    <a href="${subclass}.html" property="yui:name" title="$subclass">$subclass</a>
+                                    </span>
+                                #end for
+                            </dd>
+                       </dl>
+                    #end if
+                
+                    #if $deprecated
+                        <div class="deprecated"><strong>Deprecated:</strong> $deprecated</div>
+                    #end if
+  
+                    #if $see
+                        <div class="deprecated"><strong>See also:</strong> $see</div>
+                    #end if
+
+                    <div class="summary description" property="yui:description">
+                        $description
+                    </div>
+
+                    #if $constructor
+                        <div class="section constructor details" rel="yui:constructor" resource="#constructor">
+                        <h3 id="constructor">Constructor</h3>
+                        <div class="content">
+                            <div class="detail">
+                                <strong property="yui:name">$classname</strong>
+                                <code>
+                                    (
+                                    #if $constructor.params
+                                        #set $i=0
+                                        #set $current=""
+  
+                                        #for $param in $constructor.params#
+                                            #if $current != $param.name
+                                                #if $i > 0#, #end if#
+                                                #set $i = $i + 1
+                                                #set $current = $param.name
+                                                $param.name
+                                            #end if
+                                        #end for
+                                    #end if
+                                    )
+                                </code>
+                                <div class="description">
+                                    #if $constructor.params
+                                        <dl rel="yui:parameters">
+                                            <dt>Parameters:</dt>
+                                            #for $param in $constructor.params
+                                                <dd rel="yui:parameter">
+                                                    <code><span property="yui:name">$param.name</span>
+                                                    &lt;<span property="yui:type">$param.type</span>&gt;
+                                                    </code>
+                                                    <span property="yui:description">$param.description</span>
+                                                </dd>
+                                            #end for
+                                        </dl>
+                                    #end if
+                                    
+                                    #if $constructor.return
+                                        <dl>
+                                            <dt>Returns:</dt>
+                                            <dd property="yui:return">
+                                                $constructor.return
+                                            </dd>
+                                        </dl>
+                                    #end if 
+                                    
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    #end if
+                    
+                    <div rel="yui:properties" resource="#properties">
+                    #if $properties
+                        <div class="section field details">
+                            <h3 id="properties">Properties</h3>
+                            <div class="content">
+                                #for $property in $properties
+                                    <div class="$property.access#if $property.deprecated# deprecated#end if#" rel="yui:property" resource="#property_$property.name">
+                                    <h4><a name="property_$property.name" property="yui:name">$property.name</a>
+                                        - <code>#if $property.access#$property.access #end if##if $property.static#$property.static #end if##if $property.final#$property.final #end if#<span property="yui:type">$property.type</span></code>
+                                    </h4>
+                                    <div class="detail">
+                                        <div class="description" property="yui:description">
+                                            $property.description
+                                        </div>
+                                    </div>
+     
+                                        
+                                    #if $property.default
+                                    <div class="default" property="yui:defaultValue">
+                                        Default Value: $property.default
+                                    </div>        
+                                    #end if
+
+                                     #if $property.deprecated
+                                    <div class="deprecated" property="yui:deprecated">
+                                        <strong>Deprecated:</strong> $property.deprecated
+                                    </div>        
+                                    #end if
+
+                                    <hr />
+                                    </div>
+                                #end for
+                            </div>
+                        </div>
+                    #end if
+
+                    #if $inherited.properties
+                        <div rel="yui:inheritance">
+                        #for $superclassname in $inherited.properties
+                        <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
+                            <h4>Properties inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
+                            <div class="content" rel="yui:properties">
+                                <code>
+                                    #set i=0
+                                    #set l=len($inherited.properties[$superclassname])-1
+                                    #for $prop in $inherited.properties[$superclassname]#
+                                        <span rel="yui:property" resource="${superclassname}.html#property_$prop.name">
+                                        <a class="$prop.access#if $prop.deprecated# deprecated#end if#" href="${superclassname}.html#property_$prop.name" property="yui:name" title="$prop.name">$prop.name</a>#if $i<$l#<span class="$prop.access#if $prop.deprecated# deprecated#end if#">,</span>#end if#
+                                        </span>
+                                        #set i=i+1
+                                    #end for#
+                                </code>
+                            </div>
+                        </div>
+                        #end for
+                        </div>
+                    #end if
+                    </div>
+
+                    <div rel="yui:methods" resource="#methods">
+                    #if $methods
+                        <div class="section method details">
+                            <h3 id="methods">Methods</h3>
+                            <div class="content">
+                                #for $method in $methods
+                                    <div class="$method.access#if $method.deprecated# deprecated#end if#" rel="yui:method" resource="#method_$method.name">
+                                    <h4>
+                                        <a name="method_$method.name">$method.name</a></h4>
+                                    <div class="detail" >
+                                        <code>
+                                        #if $method.access# $method.access #end if#
+                                        #if $method.static# $method.static #end if#
+                                        #if $method.final# $method.final #end if#
+                                        $method.return.type
+                                            <strong property="yui:name">$method.name</strong>
+                                           (
+                                            #if $method.params
+                                                #set $i=0
+                                                #set $current = ""
+                                                #for $param in $method.params#
+                                                    #if $current != $param.name
+                                                        #if $i > 0#, #end if#
+                                                        #set $i = $i + 1
+                                                        #set $current = $param.name
+                                                         $param.name
+                                                    #end if#
+                                                #end for#
+                                            #end if
+                                            )
+                                        </code>
+                                        
+                                        <div class="description" property="yui:description">
+                                            $method.description
+                                        </div>
+
+                                        <div class="description">
+
+                                            #if $method.params
+                                                <dl rel="yui:parameters">
+                                                    <dt>Parameters:</dt>
+                                                    #for $param in $method.params
+                                                        <dd rel="yui:parameter">
+                                                        <code><span property="yui:name">$param.name</span>
+                                                        &lt;<span property="yui:type">$param.type</span>&gt;
+                                                        </code>
+                                                        <span property="yui:description">$param.description</span>
+                                                        </dd>
+                                                    #end for
+                                                </dl>
+                                            #end if
+
+                                            #if $method.return.type
+                                                <dl>
+                                                    <dt>Returns:
+                                                    <code property="yui:return">
+                                                        $method.return.type
+                                                    </code></dt>
+                                                    <dd property="yui:returnInfo">$method.return.description</dd>
+                                                </dl>
+                                            #end if
+
+                                            #if $method.chainable
+                                            <div class="chainable">
+                                                <strong>Chainable:</strong> This method is chainable.
+                                            </div>        
+                                            #end if
+
+             
+                                            #if $method.deprecated
+                                            <div class="deprecated">
+                                                <strong>Deprecated</strong> $method.deprecated
+                                            </div>        
+                                            #end if
+
+                                        </div>
+
+                                    </div>
+                                    <hr />
+                                    </div>
+                                #end for
+                            </div>
+                        </div>
+                    #end if
+
+                    #if $inherited.methods
+                        <div rel="yui:inheritance">                    
+                        #for $superclassname in $inherited.methods
+                            <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
+                                <h4>Methods inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
+                                <div class="content" rel="yui:methods">
+                                    <code>
+                                        #set i=0
+                                        #set l=len($inherited.methods[$superclassname])-1
+                                        #for $method in $inherited.methods[$superclassname]
+                                            <span rel="yui:method" resource="${superclassname}.html#method_$method.name">                                        
+                                            <a class="$method.access#if $method.deprecated# deprecated#end if#" href="${superclassname}.html#method_$method.name" property="yui:name" title="$method.name">$method.name</a>#if $i<$l#<span class="$method.access#if $method.deprecated# deprecated#end if#">,</span>#end if#
+                                            </span>
+                                            #set i=i+1
+                                            #end for
+                                    </code>
+                                </div>
+                            </div>
+                        #end for
+                        </div>
+                    #end if
+                    </div>
+
+                    <div rel="yui:events" resource="#events">
+                    #if $events
+                        <div class="section method details">
+                            <h3 id="events">Events</h3>
+                            <div class="content">
+                                #for $event in $events
+                                    <div class="$event.access#if $event.deprecated# deprecated#end if#" rel="yui:event" resource="#event_$event.name">
+                                    <h4>
+                                        <a name="event_$event.name">$event.name</a></h4>
+                                    <div class="detail">
+                                        <code>
+                                        #if $event.access# $event.access #end if#
+                                        #if $event.static# $event.static #end if#
+                                        #if $event.final# $event.final #end if#
+                                            <strong property="yui:name">$event.name</strong>
+
+                                            (
+                                            #if $event.params
+                                                #set $i=0
+                                                #set $current = ""
+                                                #for $param in $event.params#
+                                                    #if $current != $param.name
+                                                        #if $i > 0#, #end if#
+                                                        #set $i = $i + 1
+                                                        #set $current = $param.name
+                                                         $param.name
+                                                    #end if#
+                                                #end for#
+                                            #end if
+                                            )
+
+                                        </code>
+                                        
+                                        <div class="description" property="yui:description">
+                                            $event.description
+                                        </div>
+
+                                        <div class="description">
+
+
+                                            #if $event.params
+                                                <dl rel="yui:parameters">
+                                                    <dt>Parameters:</dt>
+                                                    #for $param in $event.params
+                                                        <dd rel="yui:parameter">
+                                                            <code><span property="yui:name">$param.name</span>
+                                                                &lt;<span property="yui:type">$param.type</span>&gt;
+                                                            </code>
+                                                            <span property="yui:description">$param.description</span>
+                                                        </dd>
+                                                        
+                                                    #end for
+                                                </dl>
+                                            #end if
+
+                                            #if $event.bubbles
+                                            <div class="bubbles">
+                                                <strong>Bubbles:</strong> This event bubbles to <a href="${event.bubbles}.html" title="$event.bubbles">$event.bubbles</a>.
+                                            </div>        
+                                            #end if
+                                            #if $event.preventable
+                                            <div class="preventable">
+                                                <strong>Preventable:</strong> This event is preventable by method: $event.preventable.
+                                            </div>        
+                                            #end if
+
+                                            #if $event.deprecated
+                                            <div class="deprecated">
+                                                <strong>Deprecated</strong> $event.deprecated
+                                            </div>        
+                                            #end if
+                                        </div>
+
+                                    </div>
+                                    <hr />
+                                    </div>
+                                #end for
+                            </div>
+                        </div>
+                    #end if
+
+
+                    #if $inherited.events
+                        <div rel="yui:inheritance">                    
+                        #for $superclassname in $inherited.events
+                        <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
+                            <h4>Events inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
+                            <div class="content" rel="yui:events">
+                                <code>
+                                    #set i=0
+                                    #set l=len($inherited.methods[$superclassname])-1
+                                    #for $event in $inherited.events[$superclassname]
+                                        #set i=i+1
+                                        <span rel="yui:event" resource="${superclassname}.html#event_$event.name">
+                                        <a class="$event.access#if $event.deprecated# deprecated#end if#" href="${superclassname}.html#event_$event.name" property="yui:name" title="$event.name">$event.name</a>#if $i<$l#<span class="$event.access#if $event.deprecated# deprecated#end if#">,</span>#end if##set i=i+1#
+                                        </span>
+                                    #end for#
+                                </code>
+                            </div>
+                        </div>
+                        #end for
+                        </div>
+                    #end if
+                    </div>
+
+                    <div rel="yui:attributes" resource="#configattributes">
+                    #if $configs
+                        <div class="section field details">
+                            <h3 id="configattributes">Configuration Attributes</h3>
+                            <div class="content">
+                                #for $config in $configs
+                                    <div class="$config.access#if $config.deprecated# deprecated#end if#" rel="yui:attribute" resource="#config_$config.name">
+                                    <h4><a name="config_$config.name">$config.name</a>
+                                        <code>- #if $config.access#$config.access #end if##if $config.static#$config.static #end if##if $config.writeonce#$config.writeonce #end if##if $config.final#$config.final #end if#<span property="yui:type">$config.type</span></code>
+                                    </h4>
+                                    <div class="detail">
+                                        <div class="description" property="yui:description">
+                                            $config.description
+                                        </div>
+                                    </div>
+ 
+                                    #if $config.deprecated
+                                    <div class="deprecated">
+                                        <strong>Deprecated</strong> $config.deprecated
+                                    </div>        
+                                    #end if
+     
+                                    #if $config.default
+                                    <div class="default">
+                                        Default Value: $config.default
+                                    </div>        
+                                    #end if
+
+                                    <hr />
+                                    </div>        
+                                #end for
+
+                            </div>
+                        </div>
+                    #end if
+
+                    #if $inherited.configs
+                        <div rel="yui:inheritance">                    
+                        #for $superclassname in $inherited.configs
+                        <div class="section field inheritance" rel="yui:superclass"  resource="${superclassname}.html">
+                            <h4>Configuration attributes inherited from <a href="${superclassname}.html" property="yui:name" title="$superclassname">$superclassname</a>:</h4>
+                            <div class="content" rel="yui:attributes">
+                                <code>
+                                    #set i=0
+                                    #set l=len($inherited.methods[$superclassname])-1
+                                    #for $config in $inherited.configs[$superclassname]
+                                        #set i=i+1
+                                        <span rel="yui:attribute" resource="${superclassname}.html#config_$config.name">                                        
+                                        <a class="$config.access#if $config.deprecated# deprecated#end if#" href="${superclassname}.html#config_$config.name" property="yui:name" title="$config.name">$config.name</a>#if $i<$l#<span class="$config.access#if $config.deprecated# deprecated#end if#">,</span>#end if#
+                                        </span>
+                                        #set i=i+1
+                                        #end for#
+                                </code>
+                            </div>
+                        </div>
+                        #end for
+                        </div>
+                    #end if
+                    </div>
+
+                #else if $modulename
+                   
+                    <h3>Module: $modulename
+                    
+                    #if $beta
+                    <span class="description"><em>Beta</em></span>
+                    #end if
+
+                    #if $experimental
+                    <span class="description"><em>Experimental</em></span>
+                    #end if
+
+                    </h3>
+                    <div class="description summary">
+                        $moduledesc
+                    </div>
+
+
+                    #if $requires
+                    <div class="content">
+                        Requires: $requires
+                    </div>
+                    #end if
+                    #if $optional
+                    <div class="content">
+                        Optional: $optional
+                    </div>
+                    #end if
+
+                <div class="yui-gc">
+                    <div class="yui-u first">
+
+                        #if $classnames
+                            <p>This module contains the following classes:</p>
+                            <script>
+                            //var YUI_CLASS_LIST = $classList;
+                            </script>
+                            <div id="splash_classList">
+                                <ul>
+                                #set $counter = 0
+                                #for $classNames in $classList_raw
+                                    <li><a href="${classNames.name}.html" title="$classNames.name" id="class_${counter}">$classNames.guessedname</a></li>
+                                    #set $counter = $counter + 1
+                                #end for
+                                </ul>
+                            </div>
+                        #end if
+                    </div>
+                    <div class="yui-u">
+                            #set count = 0;
+                            #for $info in $submodules
+                                #set count = count + 1
+                            #end for
+                                    #if count != 0 
+                                    <div class="submodules">
+                                        <h4>Submodules:</h4> 
+                                        <dl>
+                                        #for $info in $submodules
+                                            <dt><code><a href="${$subdata[$info].name}.html" title="$info">$info</a></code></dt>
+                                            <dd>$subdata[$info].description</dd>
+                                        #end for
+                                        </dl>
+                                    </div>
+                                    #end if
+
+                        </div>
+                </div>
+
+                #end if
+			</div>
+		</div>
+		<div class="yui-b">
+            <div class="nav">
+
+                #if $modulenames
+                    <div id="moduleList" class="module">
+                        <h4>Modules</h4>
+                        <ul class="content">
+                            #for $moduledef in $modulenames
+                                #set $css = ""
+                                #if $moduledef == $modulename
+                                    #set $css = "selected"
+                                #end if
+                                <li class="$css"><a href="module_${moduledef}.html" title="$moduledef">$moduledef</a></li>
+                            #end for
+                        </ul>
+                    </div>
+                #end if
+
+                #if $classnames
+                    <div id="classList" class="module">
+                        <h4>Classes</h4>
+                        <ul class="content">
+                            #for $classdef in $classnames
+                                #set $css = ""
+                                #if $classdef == $classname
+                                    #set $css = "selected"
+                                #end if
+                                <li class="$css"><a href="${classdef}.html" title="$classdef">$classdef</a></li>
+                            #end for
+                        </ul>
+                    </div>
+                #end if
+
+                #if $filenames
+                    <div id="fileList" class="module">
+                        <h4>Files</h4>
+                        <ul class="content">        
+                            #for $filedef in $filenames
+                                #set $css = ""
+                                #if $filedef == $filename
+                                    #set $css = "selected"
+                                #end if
+                                <li class="$css"><a href="${filedef}.html" title="$filedef">$filedef</a></li>
+                            #end for
+                        </ul>
+                    </div>
+                #end if
+
+                #if $properties
+                    <div id="propertyList" class="module">
+                        <h4>Properties</h4>
+                        <ul class="content">        
+                            #for $prop in $properties
+                                <li class="${prop.access}#if $prop.deprecated# deprecated#end if#"><a href="#property_${prop.name}" title="$prop.name">$prop.name</a></li>
+                            #end for
+                        </ul>
+                    </div>
+                #end if
+
+                #if $methods
+                    <div id="methodsList" class="module">
+                        <h4>Methods</h4>
+                        <ul class="content">        
+                            #for $method in $methods
+                                <li class="${method.access}#if $method.deprecated# deprecated#end if#"><a href="#method_${method.name}" title="$method.name">$method.name</a></li>
+                            #end for
+                        </ul>
+                    </div>
+                #end if
+
+                #if $events
+                    <div id="eventsList" class="module">
+                        <h4>Events</h4>
+                        <ul class="content">        
+                            #for $event in $events
+                                <li class="${event.access}#if $event.deprecated# deprecated#end if#"><a href="#event_${event.name}" title="$event.name">$event.name</a></li>
+                            #end for
+                        </ul>
+                    </div>
+                #end if
+
+                #if $configs
+                    <div id="configList" class="module">
+                        <h4>Configuration Attributes</h4>
+                        <ul class="content">        
+                            #for $config in $configs
+                                <li class="${config.access}#if $config.deprecated# deprecated#end if#"><a href="#config_${config.name}" title="$config.name">$config.name</a></li>
+                            #end for
+                        </ul>
+                    </div>
+                #end if
+
+            </div>
+		</div>
+	</div>
+	
+	<!--footer-->
+	<!--
+	<div id="ft">
+        <hr />
+	</div>
+	-->
+</div>
+<script type="text/javascript">
+    ALL_YUI_PROPS = $allprops;
+</script>
+</body>
+</html>
+#end filter
diff --git a/build/tools/yuidoc/bin/const.pyc b/build/tools/yuidoc/bin/const.pyc
old mode 100644
new mode 100755
index 4aa5d1f1..cb78d874
Binary files a/build/tools/yuidoc/bin/const.pyc and b/build/tools/yuidoc/bin/const.pyc differ
diff --git a/build/tools/yuidoc/bin/yuidoc_generate.pyc b/build/tools/yuidoc/bin/yuidoc_generate.pyc
old mode 100644
new mode 100755
index 9638e7a9..febb08ca
Binary files a/build/tools/yuidoc/bin/yuidoc_generate.pyc and b/build/tools/yuidoc/bin/yuidoc_generate.pyc differ
diff --git a/build/tools/yuidoc/bin/yuidoc_highlight.pyc b/build/tools/yuidoc/bin/yuidoc_highlight.pyc
old mode 100644
new mode 100755
index fd4b0b5f..7cbaf9be
Binary files a/build/tools/yuidoc/bin/yuidoc_highlight.pyc and b/build/tools/yuidoc/bin/yuidoc_highlight.pyc differ
diff --git a/build/tools/yuidoc/bin/yuidoc_parse.pyc b/build/tools/yuidoc/bin/yuidoc_parse.pyc
old mode 100644
new mode 100755
index 585a9672..cfcc5608
Binary files a/build/tools/yuidoc/bin/yuidoc_parse.pyc and b/build/tools/yuidoc/bin/yuidoc_parse.pyc differ
diff --git a/dev/.DS_Store b/dev/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/dev/.DS_Store differ
diff --git a/dev/FlashAudioPlugin.fla b/dev/FlashAudioPlugin.fla
new file mode 100644
index 00000000..56970f5d
Binary files /dev/null and b/dev/FlashAudioPlugin.fla differ
diff --git a/dev/com/gskinner/soundjs/FlashAudioPlugin.as b/dev/com/gskinner/soundjs/FlashAudioPlugin.as
new file mode 100644
index 00000000..4ec925c7
--- /dev/null
+++ b/dev/com/gskinner/soundjs/FlashAudioPlugin.as
@@ -0,0 +1 @@
+package com.gskinner.soundjs {
	
	import flash.display.Sprite;
	import flash.external.ExternalInterface;
	import flash.events.Event;
	import fl.controls.List;
	import flash.media.Sound;
	import flash.net.URLRequest;
	import flash.events.ProgressEvent;
	import flash.events.IOErrorEvent;
	import fl.controls.ProgressBar;
	import flash.events.ErrorEvent;
	import flash.utils.Dictionary;
	
	public class FlashAudioPlugin extends Sprite {
		
	// Constants:
		/** The maximum concurrent sounds that can play */
		public static const MAX_INSTANCES:uint = 255;
	
		/** Generic ExternalInterface callback string to Flash. */
		public static const FLASH_CALLBACK:String = "SoundJS.activePlugin.handleEvent";
		/** Generic ExternalInterface error callback string to Flash. */
		public static const ERROR_CALLBACK:String = "SoundJS.activePlugin.handleErrorEvent";
		/** Generic ExternalInterface preload callback string to Flash. */
		public static const PRELOAD_CALLBACK:String = "SoundJS.activePlugin.handlePreloadEvent";
		/** Generic ExternalInterface sound instance callback string to Flash. */
		public static const SOUND_CALLBACK:String = "SoundJS.activePlugin.handleSoundEvent";

		
	// Public Properties:
		/** The list instance to log errors to. Will be removed for production. */
		public var list:List;
		
	// Protected Properties:
		protected var lookup:Object;
		protected var preloadLookup:Dictionary;
		protected var preloadHash:Object;
		protected var nextId:int = 0;
		public var masterVolume:Number = 1;
		
	// UI Elements:
	// ** AUTO-UI ELEMENTS **
	// ** END AUTO-UI ELEMENTS **
		
	// Initialization:
		public function FlashAudioPlugin() {
			configUI();
			initializeInterface();
		}
		
		protected function configUI():void { 
			lookup = {};
			preloadHash = {};
			preloadLookup = new Dictionary();
		}
		
	// Protected Methods:
		/**
		 * Add callbacks for ExternalInterface communication
		 */
		protected function initializeInterface():void {
			var map:Object = {
				
				register: handleRegister,
				
				preload: handlePreload,
				cancelPreload: handleCancelPreload,
				
				playSound: handlePlaySound,
				stopAll: handleStopAll,
				stopSound: handleStopSound,
				interrupt: handleSoundInterrupt,
				pauseSound: handlePauseSound,
				resumeSound: handleResumeSound,
				muteSound: handleMuteSound,
				unmuteSound: handleUnmuteSound,

				setVolume: handleSetVolume,
				getVolume: handleGetVolume,
				setPan: handleSetPan,
				getPan: handleGetPan,
				setPosition: handleSetPosition,
				getPosition: handleGetPosition,
				getDuration: handleGetDuration,
				
				command: handleCommand
			};
			
			if (!ExternalInterface.available) { 
				handleError({message:"ExternalInterface is not available"});
				return;
			}
			
			// Usually happens when running locally, or cross-scripting
			try {
				for (var n:String in map) {
					ExternalInterface.addCallback(n, map[n]);
				}
				ExternalInterface.call(FLASH_CALLBACK, "ready");
			} catch (e:*) {
				handleError(e);
			}
		}
		
		// General error handler.
		protected function handleError(e:Object):void {
			log("*** Error:", e.message);
		}
		
		// For now, spit out messages to a list.
		public function log(...args:Array):void {
			var str = args.join(" ");
			if (list == null) { return; }
			list.addItem({label:str});
			list.verticalScrollPosition = list.maxVerticalScrollPosition;
		}
		
		
	/******** REGISTER ********/
		protected function handleRegister(src:String):Boolean { 
			log("Register", src);
			return true;
		}
		
	/******** PRELOAD ********/
		protected function handlePreload(src:String):String {
			var id:String = "p"+nextId++;
			var sound:Sound = new Sound();
			sound.addEventListener(ProgressEvent.PROGRESS, handleLoadProgress, false, 0, true);
			sound.addEventListener(Event.COMPLETE, handleLoadComplete, false, 0, true);
			sound.addEventListener(IOErrorEvent.IO_ERROR, handleLoadError, false, 0, true);
			//TODO: Other Errors
			sound.load(new URLRequest(src));
			preloadLookup[sound] = id;
			preloadHash[id] = sound;
			return id;
		}
		
		protected function handleCancelPreload(id:String):Boolean {
			var sound:Sound = preloadHash[id] as Sound;
			if (sound == null) { return false; }
			try {
				sound.close();
			} catch(error:Error) {}
			delete preloadLookup[sound];
			delete preloadHash[id]
			return true;
		}
		
		protected function handleLoadProgress(event:ProgressEvent):void {
			var id = preloadLookup[event.target];
			ExternalInterface.call(PRELOAD_CALLBACK, id, "handleProgress", event.bytesLoaded, event.bytesTotal);
		}
		
		protected function handleLoadComplete(event:Event):void {
			var id = preloadLookup[event.target];
			ExternalInterface.call(PRELOAD_CALLBACK, id, "handleComplete");
			delete preloadLookup[event.target];
			delete preloadHash[id];
			log("Preload Complete", id);
		}
		
		protected function handleLoadError(event:ErrorEvent):void {
			var id = preloadLookup[event.target];
			ExternalInterface.call(PRELOAD_CALLBACK, id, "handleError", event.text);
			delete preloadLookup[event.target];
			delete preloadHash[id];
			log("Error Loading", id, event.text);
		}
		
		
	/******** PLAYBACK ********/		
		protected function handlePlaySound(src:String, offset:Number=0, loop:int=0, volume:Number=1, pan:Number=0):String {
			var id:String = "s" + nextId++;
			
			var wrapper:SoundWrapper = new SoundWrapper(id, src, this);			
			wrapper.play(offset, loop, volume, pan);
			
			lookup[id] = wrapper;
			wrapper.addEventListener(Event.SOUND_COMPLETE, handleSoundFinished, false, 0, true);
			wrapper.addEventListener("interrupt", handleSoundInterrupt, false, 0, true);
			log("Play Sound", id, src, "o:",offset, "l:",loop, "v:",volume, "p:",pan, "mv:",masterVolume);
			return id;
		}
		
		// An instance completed playback.
		protected function handleSoundFinished(event:Event):void {
			var wrapper:SoundWrapper = event.target as SoundWrapper;
			delete(lookup[wrapper.id]);
			wrapper.destroy();
			ExternalInterface.call(SOUND_CALLBACK, wrapper.id, "handleSoundFinished");
			log("Complete", wrapper.id, "Remaining:", activeSoundCount);
		}
		
		protected function handleSoundInterrupt(id:String):void {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			wrapper.interrupt();
			delete(lookup[wrapper.id]);
			log("Interrupted", wrapper.id);
		}
		
		// Stop all instances
		protected function handleStopAll():Boolean {
			log("Stop All");
			var list:Array = [];
			for (var n:String in lookup) { list.push(lookup[n]); }
			for (var i:uint=0, l:uint=list.length; i<l; i++) {
				var wrapper:SoundWrapper = list[i] as SoundWrapper;
				wrapper.stop();
			}
			return true;
		}
		
		// Stop a specific instance
		protected function handleStopSound(id:String):Boolean {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return false; }
			log("Stop",wrapper.id);
			wrapper.stop();
			delete(lookup[wrapper.id]);
			wrapper.destroy();
			return true;
		}
		
		// Pause an instance
		protected function handlePauseSound(id:String):Boolean {
			var wrapper:SoundWrapper = lookup[id];
			if (wrapper == null) { return false; }
			log("Pause",wrapper.id);
			wrapper.pause();
			return true;
		}
		
		// Resume a paused instance
		protected function handleResumeSound(id:String):Boolean {
			var wrapper:SoundWrapper = lookup[id];
			if (wrapper == null) { return false; }
			log("Resume",wrapper.id);
			wrapper.resume();
			return true;
		}
		
		// Mute an instance
		protected function handleMuteSound(id:String):Boolean { 
			var wrapper:SoundWrapper = lookup[id];
			if (wrapper == null) { return false; }
			log("Mute",wrapper.id);
			wrapper.mute(true);
			return true;
		}
		
		// Unmute an instance
		protected function handleUnmuteSound(id:String):Boolean { 
			var wrapper:SoundWrapper = lookup[id];
			if (wrapper == null) { return false; }
			log("Unmute",wrapper.id);
			wrapper.mute(false);
			return true;
		}
		
		// Get the master volume
		protected function handleGetMasterVolume():Number { return masterVolume; }
		
		// Set the master volume
		protected function handleSetMasterVolume(value:Number):Boolean {
			log("Set Master Volume", value);
			masterVolume = value;
			for (var n:String in lookup) {
				var wrapper:SoundWrapper = lookup[n] as SoundWrapper;
				wrapper.masterVolume = value;
				wrapper.volume = wrapper.volume; //LM: Combine?
			}
			return true;
		}
		
		// Set the volume of an instance
		protected function handleSetVolume(id:String, value:Number):Boolean {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return false; }
			log("SetVolume", wrapper.id, value);
			wrapper.volume = value;
			return true;
		}
		
		// Get the volume of an instance
		protected function handleGetVolume(id:String):Number {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return -1; }
			return wrapper.volume;
		}
		
		// Set the pan of an instance
		protected function handleSetPan(id:String, value:Number):Boolean { 
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return false; }
			log("SetPan", wrapper.id, value);
			wrapper.pan = value;
			return true;
		}
		
		// Get the pan of an instance
		protected function handleGetPan(id:String):Number {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return -1; }
			return wrapper.pan;
		}
		
		// Set the playhead position of an instance
		protected function handleSetPosition(id:String, value:Number):Boolean {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return false; }
			log("SetPosition", wrapper.id, value);
			wrapper.position = value;
			return true;
		}
		
		// Get the playhead position of an instance
		protected function handleGetPosition(id:String):Number {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return -1; }
			return wrapper.position;
		}
		
		// Get the duration of an instance
		protected function handleGetDuration(id:String):Number {
			var wrapper:SoundWrapper = lookup[id] as SoundWrapper;
			if (wrapper == null) { return -1; }
			return wrapper.duration;
		}
		
		// Call a command on an instance (currently N/A)
		protected function handleCommand(id:String, command:String, value:*):Boolean { 
			log("Command", command, value);
			return false;
		}
		
		// Get the number of active sounds.
		protected function get activeSoundCount():uint {
			var count:uint = 0;
			for (var n:String in lookup) {
				count++;
			}
			return count;
		}
		
		override public function toString():String { return "[FlashAudioPlugin]"; }
		
	}
	
}

import flash.media.Sound;
import flash.media.SoundChannel;
import flash.events.Event;
import flash.net.URLRequest;
import flash.utils.Timer;
import flash.events.TimerEvent;
import flash.events.EventDispatcher;
import flash.media.SoundTransform;
import flash.events.IOErrorEvent;
import flash.events.ErrorEvent;

import com.gskinner.soundjs.FlashAudioPlugin;
import flash.events.SecurityErrorEvent;

/**
 * The SoundWrapper controls a single sound instance. Instances can be played, and then modified during playback.
 * Once an instance completes, it is cleaned up. Any attempt by JavaScript to replay the same instance, will result
 * in a new instance being created.
 */
class SoundWrapper extends EventDispatcher {
	
	/** The unique ID of an instance */
	public var id:String;
	/** The path the audio source */
	public var src:String;
	/** How far into the sound to start playback (milliseconds) */
	public var offset:Number = 0;
	/** How many loops to play */
	public var loop:int = 0;
	/** A reference to the Plugin owner */
	public var owner:FlashAudioPlugin;
	
	/** The master volume of the app */
	public var masterVolume:Number = 1;
	/** Whether the audio is currently muted */
	public var muted:Boolean = false;
	/** Whether the audio has completed playback */
	public var completed:Boolean = false;
	
	protected var sound:Sound;
	protected var channel:SoundChannel;
	protected var lastPosition:Number = 0;
	protected var timer:Timer;
	protected var _volume:Number = 1;
	protected var _pan:Number = 0;
	protected var _paused:Boolean = false;
	
	/**
	 * SoundInstances are alive as long as they are playing.
	 * When they complete, or are stopped, they will be released for cleanup
	 * If a sound is re-played, a new instance is created. There is no need to
	 * keep them around once they are stopped, since the reference to the sound is
	 * maintained in JS.
	 *
	 * @param id The unique ID of the instance
	 * @param owner The owner of this sound instance
	 */
	public function SoundWrapper(id:String, src:String, owner:FlashAudioPlugin) {
		this.owner = owner;
		this.id = id;
		this.src = src;
		
		sound = new Sound();
		sound.addEventListener(IOErrorEvent.IO_ERROR, handleSoundError, false, 0, true);
		sound.addEventListener(SecurityErrorEvent.SECURITY_ERROR, handleSoundError, false, 0, true);
		sound.addEventListener(Event.COMPLETE, handleSoundLoaded, false, 0, true);
	}
	
	/**
	 * Play the sound.
	 * @param src The path the the asset source
	 * @param delay How long to wait before beginning playback
	 * @param offset How far in to the sound to begin playback
	 * @param loop How many times to loop the audio
	 * @param volume The starting volume of the audio
	 * @param pan The starting pan of the audio
	 */
	public function play(offset:Number, loop:int, volume:Number, pan:Number) {
		this.offset = offset;
		this.loop = loop;
		sound.load(new URLRequest(src));
	}
	
	/**
	 * Clean up a sound instance.
	 */
	public function destroy():void {
		sound = null;
		channel = null;
	}
	
	/**
	 * Interrupt this instance
	 */
	public function interrupt():void {
		channel.stop();
		destroy();
	}
	
	/**
	 * Determine if the audio is currently paused. It is always unpaused when started, even while delaying.
	 */
	public function get paused():Boolean {
		return _paused;
	}
	
	/**
	 * Pause sound playback.
	 */
	public function pause():void {
		_paused = true;
		lastPosition = channel.position;
		channel.stop();
	}
	
	/**
	 * Resume sound playback.
	 */
	public function resume():void {
		_paused = false;
		channel = sound.play(lastPosition, loop?0:1);
		updateVolume();
	}
	
	/**
	 * Stop sound playback.
	 */
	public function stop():void {
		channel.stop();
		destroy();
	}
	
	/**
	 * Mute playback.
	 * @param value if the audio should be muted or not.
	 */
	public function mute(value:Boolean):void {
		muted = value;
		updateVolume();
	}
	
	/** Get/Set the volume of the sound. */
	public function get volume():Number { return _volume; }
	/** @private */
	public function set volume(value:Number):void { 
		_volume = value;
		updateVolume();
	}
	
	/** Get/Set the pan of the sound. */
	public function get pan():Number { return _pan; }
	/** @private */
	public function set pan(value:Number):void {
		_pan = value;
		updateVolume();
	}
	
	/** Get/Set the playhead position. */
	public function get position():Number { return channel.position; }
	/** @private */
	public function set position(value:Number):void {
		startSound(value);
	}
	
	/** Get the duration of the sound. */
	public function get duration():Number {
		return sound.length;
	}
	
	// Begin playing the sound at a certain position.
	protected function startSound(startAt:Number):void {
		if (startAt > sound.length) {
			owner.log("Can not play, out of range");
			dispatchEvent(new Event(Event.SOUND_COMPLETE));
			return;
		}
		channel = sound.play(startAt, loop);
		channel.addEventListener(Event.SOUND_COMPLETE, handleSoundComplete, false, 0, true);
	}
	
	// Update the sound volume based on the volume, masterVolume, and mute settings.
	protected function updateVolume():void {
		if (channel == null) { return; }
		var transform:SoundTransform = channel.soundTransform;
		transform.volume = muted ? 0 : owner.masterVolume * _volume;
		transform.pan = _pan;
		channel.soundTransform = transform;
	}
	
	// Sound has completed loading
	protected function handleSoundLoaded(event:Event):void {
		startSound(offset);
	}
	
	// Sound playback has completed.
	protected function handleSoundComplete(event:Event):void {
		completed = true;
		dispatchEvent(event);
	}
	
	// An error has occurred.
	protected function handleSoundError(event:ErrorEvent):void {
		owner.log("Error!", event.text);
		dispatchEvent(new Event("playbackFailed"));
	}
	
}
\ No newline at end of file
diff --git a/docs/SoundJS_docs-0.2.0.zip b/docs/SoundJS_docs-0.2.0.zip
new file mode 100644
index 00000000..e0614ab4
Binary files /dev/null and b/docs/SoundJS_docs-0.2.0.zip differ
diff --git a/docs/SoundJS_docs.zip b/docs/SoundJS_docs.zip
deleted file mode 100644
index 772d8baf..00000000
Binary files a/docs/SoundJS_docs.zip and /dev/null differ
diff --git a/examples/Game.html b/examples/Game.html
new file mode 100644
index 00000000..46972804
--- /dev/null
+++ b/examples/Game.html
@@ -0,0 +1,469 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>CreateJS Example: Space Rocks Game</title>
+
+	<script src="http://code.createjs.com/preloadjs-0.1.0.min.js"></script>
+	<script src="http://code.createjs.com/easeljs-0.4.1.min.js"></script>
+	<script src="http://code.createjs.com/soundjs-0.2.0.min.js"></script>
+	<script src="http://code.createjs.com/soundjs.flashplugin-0.2.0.min.js"></script>
+
+	<!-- Game script below -->
+	<script type="text/javascript" src="assets/SpaceRock.js"></script>
+	<script type="text/javascript" src="assets/Ship.js"></script>
+	<script>
+
+	var DIFFICULTY = 2;			//how fast the game gets mor difficult
+	var ROCK_TIME = 110;		//aprox tick count untill a new asteroid gets introduced
+	var SUB_ROCK_COUNT = 4;		//how many small rocks to make on rock death
+	var BULLET_TIME = 5;		//ticks between bullets
+	var BULLET_ENTROPY = 100;	//how much energy a bullet has before it runs out.
+
+	var TURN_FACTOR = 7;		//how far the ship turns per frame
+	var BULLET_SPEED = 17;		//how fast the bullets move
+
+	var KEYCODE_ENTER = 13;		//usefull keycode
+	var KEYCODE_SPACE = 32;		//usefull keycode
+	var KEYCODE_UP = 38;		//usefull keycode
+	var KEYCODE_LEFT = 37;		//usefull keycode
+	var KEYCODE_RIGHT = 39;		//usefull keycode
+	var KEYCODE_W = 87;			//usefull keycode
+	var KEYCODE_A = 65;			//usefull keycode
+	var KEYCODE_D = 68;			//usefull keycode
+
+	var shootHeld;			//is the user holding a shoot command
+	var lfHeld;				//is the user holding a turn left command
+	var rtHeld;				//is the user holding a turn right command
+	var fwdHeld;			//is the user holding a forward command
+
+	var timeToRock;			//difficulty adjusted version of ROCK_TIME
+	var nextRock;			//ticks left untill a new space rock arrives
+	var nextBullet;			//ticks left untill the next shot is fired
+
+	var rockBelt;			//space rock array
+	var bulletStream;		//bullet array
+
+	var canvas;			//Main canvas
+	var stage;			//Main display stage
+
+	var ship;			//the actual ship
+	var alive;			//wheter the player is alive
+
+	var messageField;		//Message display field
+	var scoreField;			//score Field
+
+	var loadingInterval = 0;
+
+	//register key functions
+	document.onkeydown = handleKeyDown;
+	document.onkeyup = handleKeyUp;
+
+	var preload;
+
+	function init() {
+		if (window.top == window) { start(); }
+	}
+	
+	function start() {
+		// set references
+		/*document.getElementById("canvasWrapper").onselectstart=function(){return false};
+		document.getElementById("canvasWrapper").onmousedown=function(){return false};*/
+
+		// begin loading content (only sounds to load)
+		SoundJS.FlashPlugin.BASE_PATH = "../../src/soundjs/";
+		SoundJS.registerPlugins([SoundJS.HTMLAudioPlugin]);
+
+		var manifest = [
+			{id:"begin", src:"assets/Game-Spawn.mp3|../../assets/Game-Spawn.ogg"},
+			{id:"break", src:"assets/Game-Break.mp3|../../assets/Game-Break.ogg", data:6},
+			{id:"death", src:"assets/Game-Death.mp3|../../assets/Game-Death.ogg"},
+			{id:"laser", src:"assets/Game-Shot.mp3|../../assets/Game-Shot.ogg", data:6},
+			{id:"music", src:"assets/18-machinae_supremacy-lord_krutors_dominion.mp3|../../assets/18-machinae_supremacy-lord_krutors_dominion.ogg"}
+		];
+
+		SoundJS.FlashPlugin.BASE_PATH = "assets/" // Initialize the base path from this document to the Flash Plugin
+
+		preload = new PreloadJS();
+		preload.onComplete = doneLoading;
+		preload.installPlugin(SoundJS);
+		preload.loadManifest(manifest);
+		/*
+		for (var i=0, l=manifest.length; i<l; i++) {
+			var item = manifest[i];
+			var details = SoundJS.initLoad(item.src, "sound", item.id, item.data);
+			details.src;
+		}
+		setTimeout(doneLoading, 3000);//LM: All local for now.*/
+
+		canvas = document.getElementById("testCanvas");
+		stage = new Stage(canvas);
+		messageField = new Text("Loading", "bold 24px Arial", "#FFFFFF");
+		messageField.maxWidth = 1000;
+		messageField.textAlign = "center";
+		messageField.x = canvas.width / 2;
+		messageField.y = canvas.height / 2;
+		stage.addChild(messageField);
+		stage.update(); 	//update the stage to show text
+
+		loadingInterval = setInterval(updateLoading, 200);
+	}
+
+	function stop() {
+		if (preload != null) { preload.close(); }
+		SoundJS.stop();
+	}
+
+	function updateLoading() {
+		var states = "/-\|";
+		var index = states.indexOf(messageField.text.charAt(8));
+		var newIndex = (index == -1 || index == states.length-1) ? 0 : index+1;
+		messageField.text = "Loading " + preload.progress + "% " + states.charAt(newIndex);
+		stage.update();
+	}
+
+
+	function doneLoading() {
+		clearInterval(loadingInterval);
+
+		//associate the canvas with the stage
+
+		scoreField = new Text("0", "bold 12px Arial", "#FFFFFF");
+		scoreField.textAlign = "right";
+		scoreField.x = canvas.width - 10;
+		scoreField.y = 22;
+		scoreField.maxWidth = 1000;
+
+		messageField.text = "Welcome:  Click to play";
+
+		// start the music
+		SoundJS.play("music", SoundJS.INTERRUPT_NONE, 0, 0, -1, 0.4);
+
+		watchRestart();
+	}
+
+	function watchRestart() {
+		//watch for clicks
+		stage.addChild(messageField);
+		stage.update(); 	//update the stage to show text
+		canvas.onclick = handleClick;
+	}
+
+	function handleClick() {
+		//prevent extra clicks and hide text
+		canvas.onclick = null;
+		stage.removeChild(messageField);
+
+		// indicate the player is now on screen
+		SoundJS.play("begin");
+
+		restart();
+	}
+
+	//reset all game logic
+	function restart() {
+		//hide anything on stage and show the score
+		stage.removeAllChildren();
+		scoreField.text = (0).toString();
+		stage.addChild(scoreField);
+
+		//new arrays to dump old data
+		rockBelt = new Array();
+		bulletStream = new Array();
+
+		//create the player
+		alive = true;
+		ship = new Ship();
+		ship.x = canvas.width / 2;
+		ship.y = canvas.height / 2;
+
+		//log time untill values
+		timeToRock = ROCK_TIME;
+		nextRock = nextBullet = 0;
+
+		//reset key presses
+		shootHeld =	lfHeld = rtHeld = fwdHeld = dnHeld = false;
+
+		//ensure stage is blank and add the ship
+		stage.clear();
+		stage.addChild(ship);
+
+		//start game timer
+		Ticker.addListener(window);
+	}
+
+	function tick() {
+		//handle firing
+		if(nextBullet <= 0) {
+			if(alive && shootHeld){
+				nextBullet = BULLET_TIME;
+				fireBullet();
+			}
+		} else {
+			nextBullet--;
+		}
+
+		//handle turning
+		if(alive && lfHeld){
+			ship.rotation -= TURN_FACTOR;
+		} else if(alive && rtHeld) {
+			ship.rotation += TURN_FACTOR;
+		}
+
+		//handle thrust
+		if(alive && fwdHeld){
+			ship.accelerate();
+		}
+
+		//handle new spaceRocks
+		if(nextRock <= 0) {
+			if(alive){
+				timeToRock -= DIFFICULTY;	//reduce spaceRock spacing slowly to increase difficulty with time
+				var index = getSpaceRock(SpaceRock.LRG_ROCK);
+				rockBelt[index].floatOnScreen(canvas.width, canvas.height);
+				nextRock = timeToRock + timeToRock*Math.random();
+			}
+		} else {
+			nextRock--;
+		}
+
+		//handle ship looping
+		if(alive && outOfBounds(ship, ship.bounds)) {
+			placeInBounds(ship, ship.bounds);
+		}
+
+		//handle bullet movement and looping
+		for(bullet in bulletStream) {
+			var o = bulletStream[bullet];
+			if(!o || !o.active) { continue; }
+			if(outOfBounds(o, ship.bounds)) {
+				placeInBounds(o, ship.bounds);
+			}
+			o.x += Math.sin(o.rotation*(Math.PI/-180))*BULLET_SPEED;
+			o.y += Math.cos(o.rotation*(Math.PI/-180))*BULLET_SPEED;
+
+			if(--o.entropy <= 0) {
+				stage.removeChild(o);
+				o.active = false;
+			}
+		}
+
+		//handle spaceRocks (nested in one loop to prevent excess loops)
+		for(spaceRock in rockBelt) {
+			var o = rockBelt[spaceRock];
+			if(!o || !o.active) { continue; }
+
+			//handle spaceRock movement and looping
+			if(outOfBounds(o, o.bounds)) {
+				placeInBounds(o, o.bounds);
+			}
+			o.tick();
+
+
+			//handle spaceRock ship collisions
+			if(alive && o.hitRadius(ship.x, ship.y, ship.hit)) {
+				alive = false;
+
+				stage.removeChild(ship);
+				messageField.text = "You're dead:  Click or hit enter to play again";
+				stage.addChild(messageField);
+				watchRestart();
+
+				//play death sound
+				SoundJS.play("death", SoundJS.INTERRUPT_ANY);
+				continue;
+			}
+
+			//handle spaceRock bullet collisions
+			for(bullet in bulletStream) {
+				var p = bulletStream[bullet];
+				if(!p || !p.active) { continue; }
+
+				if(o.hitPoint(p.x, p.y)) {
+					var newSize;
+					switch(o.size) {
+						case SpaceRock.LRG_ROCK: newSize = SpaceRock.MED_ROCK;
+							break;
+						case SpaceRock.MED_ROCK: newSize = SpaceRock.SML_ROCK;
+							break;
+						case SpaceRock.SML_ROCK: newSize = 0;
+							break;
+					}
+
+					//score
+					if(alive) {
+						addScore(o.score);
+					}
+
+					//create more
+					if(newSize > 0) {
+						var i;
+						var index;
+						var offSet;
+
+						for(i=0; i < SUB_ROCK_COUNT; i++){
+							index = getSpaceRock(newSize);
+							offSet = (Math.random() * o.size*2) - o.size;
+							rockBelt[index].x = o.x + offSet;
+							rockBelt[index].y = o.y + offSet;
+						}
+					}
+
+					//remove
+					stage.removeChild(o);
+					rockBelt[spaceRock].active = false;
+
+					stage.removeChild(p);
+					bulletStream[bullet].active = false;
+
+					// play sound
+					SoundJS.play("break", SoundJS.INTERUPT_LATE, 0, 0.8);
+				}
+			}
+		}
+
+		//call sub ticks
+		ship.tick();
+		stage.update();
+	}
+
+	function outOfBounds(o, bounds) {
+		//is it visibly off screen
+		return o.x < bounds*-2 || o.y < bounds*-2 || o.x > canvas.width+bounds*2 || o.y > canvas.height+bounds*2;
+	}
+
+	function placeInBounds(o, bounds) {
+		//if its visual bounds are entirely off screen place it off screen on the other side
+		if(o.x > canvas.width+bounds*2) {
+			o.x = bounds*-2;
+		} else if(o.x < bounds*-2) {
+			o.x = canvas.width+bounds*2;
+		}
+
+		//if its visual bounds are entirely off screen place it off screen on the other side
+		if(o.y > canvas.height+bounds*2) {
+			o.y = bounds*-2;
+		} else if(o.y < bounds*-2) {
+			o.y = canvas.height+bounds*2;
+		}
+	}
+
+	function fireBullet() {
+		//create the bullet
+		var o = bulletStream[getBullet()];
+		o.x = ship.x;
+		o.y = ship.y;
+		o.rotation = ship.rotation;
+		o.entropy = BULLET_ENTROPY;
+		o.active = true;
+
+		//draw the bullet
+		o.graphics.beginStroke("#FFFFFF").moveTo(-1, 0).lineTo(1, 0);
+
+		// play the shot sound
+		SoundJS.play("laser", SoundJS.INTERUPT_LATE);
+	}
+
+	function getSpaceRock(size) {
+		var i = 0;
+		var len = rockBelt.length;
+
+		//pooling approach
+		while(i <= len){
+			if(!rockBelt[i]) {
+				rockBelt[i] = new SpaceRock(size);
+				break;
+			} else if(!rockBelt[i].active) {
+				rockBelt[i].activate(size);
+				break;
+			} else {
+				i++;
+			}
+		}
+
+		if(len == 0) {
+			rockBelt[0] = new SpaceRock(size);
+		}
+
+		stage.addChild(rockBelt[i]);
+		return i;
+	}
+
+	function getBullet() {
+		var i = 0;
+		var len = bulletStream.length;
+
+		//pooling approach
+		while(i <= len){
+			if(!bulletStream[i]) {
+				bulletStream[i] = new Shape();
+				break;
+			} else if(!bulletStream[i].active) {
+				bulletStream[i].active = true;
+				break;
+			} else {
+				i++;
+			}
+		}
+
+		if(len == 0) {
+			bulletStream[0] = new Shape();
+		}
+
+		stage.addChild(bulletStream[i]);
+		return i;
+	}
+
+	//allow for WASD and arrow control scheme
+	function handleKeyDown(e) {
+		//cross browser issues exist
+		if(!e){ var e = window.event; }
+		switch(e.keyCode) {
+			case KEYCODE_SPACE:	shootHeld = true; return false;
+			case KEYCODE_A:
+			case KEYCODE_LEFT:	lfHeld = true; return false;
+			case KEYCODE_D:
+			case KEYCODE_RIGHT: rtHeld = true; return false;
+			case KEYCODE_W:
+			case KEYCODE_UP:	fwdHeld = true; return false;
+			case KEYCODE_ENTER:	 if(canvas.onclick == handleClick){ handleClick(); }return false;
+		}
+	}
+
+	function handleKeyUp(e) {
+		//cross browser issues exist
+		if(!e){ var e = window.event; }
+		switch(e.keyCode) {
+			case KEYCODE_SPACE:	shootHeld = false; return false;
+			case KEYCODE_A:
+			case KEYCODE_LEFT:	lfHeld = false; return false;
+			case KEYCODE_D:
+			case KEYCODE_RIGHT: rtHeld = false; return false;
+			case KEYCODE_W:
+			case KEYCODE_UP:	fwdHeld = false; return false;
+		}
+	}
+
+	function addScore(value) {
+		//trust the field will have a number and add the score
+		scoreField.text = (Number(scoreField.text) + Number(value)).toString();
+	}
+
+	</script>
+
+	<link rel="stylesheet" type="text/css" href="assets/demoStyles.css" />
+<style type="text/css">
+	BODY {
+		user-select: none;
+	}
+</style>
+</head>
+
+<body onload="init();">
+		<!--<p>Example use of SoundJS for a game, game example taken from <a href="http://www.createjs.com/#!EaselJS">EaselJS</a> a canvas management tool.
+		Music Copyright &copy; 2010 <a href="http://machinaesupremacy.com">Machinae Supremacy</a> - Lord Krutors Dominion. Used with permission for non commercial use.</p> -->
+	<div id="canvasWrapper" class="canvasHolder" style="background-color:#000000; width:960px; height:400px;">
+		<canvas id="testCanvas" width="960" height="400px"></canvas>
+	</div>
+</body>
+</html>
diff --git a/examples/PreloadAndPlay.html b/examples/PreloadAndPlay.html
new file mode 100644
index 00000000..412fcbad
--- /dev/null
+++ b/examples/PreloadAndPlay.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>SoundJS: Preload & Sound APIs</title>
+
+<script language="javascript" src="http://code.createjs.com/preloadjs-0.1.0.min.js"></script>
+<script language="javascript" src="http://code.createjs.com/soundjs-0.2.0.min.js"></script>
+<script type="text/javascript" src="http://code.createjs.com/soundjs.flashplugin-0.2.0.min.js"></script>
+<script>
+
+var queue;
+var displayStatus;
+function init() {
+	if (window.top == window) { start(); }
+}
+
+function start() {
+	displayStatus = document.getElementById("status");
+
+	// Create a single item to load.
+	var assetsPath = "assets/";
+	var item = {src:assetsPath+"18-machinae_supremacy-lord_krutors_dominion.mp3|"+assetsPath+"18-machinae_supremacy-lord_krutors_dominion.ogg", id:"music"};
+
+	SoundJS.FlashPlugin.BASE_PATH = "assets/" // Initialize the base path from this document to the Flash Plugin
+
+	// Instantiate a queue.
+	queue = new PreloadJS();
+	queue.installPlugin(SoundJS); // Plug in SoundJS to handle browser-specific paths
+	queue.onComplete = loadComplete;
+	queue.onFileError = handleFileError;
+	queue.onProgress = handleProgress;
+	queue.loadFile(item, true);
+}
+
+function stop() {
+	if (queue != null) { queue.cancel(); }
+	SoundJS.stop();
+}
+
+function handleFileError(o) {
+	// An error occurred.
+	displayStatus.innerText = "Error :("
+}
+
+function handleProgress(event) {
+	// Progress happened.
+	displayStatus.innerText = "Loading: " + (queue.progress.toFixed(2) * 100) + "%";
+}
+
+function loadComplete() {
+	// Load completed.
+	displayStatus.innerText = "Complete :)";
+	playSound("music");
+}
+
+function playSound(name, loop) {
+	// Play the sound using the ID created above.
+	return SoundJS.play(name);
+}
+</script>
+
+	<link rel="stylesheet" type="text/css" href="assets/demoStyles.css" />
+</head>
+
+<body onload="init()">
+	<div class="content">
+		<h1 id="status">Loading...</h1>
+	</div>
+</body>
+</html>
diff --git a/examples/SoundGrid.html b/examples/SoundGrid.html
new file mode 100644
index 00000000..4d87dac2
--- /dev/null
+++ b/examples/SoundGrid.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Using PreloadJS and SoundJS together</title>
+
+	<script src="http://code.createjs.com/preloadjs-0.1.0.min.js"></script>
+	<script src="http://code.createjs.com/soundjs-0.2.0.min.js"></script>
+	<script src="http://code.createjs.com/soundjs.flashplugin-0.2.0.min.js"></script>
+	<script>
+
+	function init() {
+		if (window.top == window) { start(); }
+	}
+
+	var preload;
+	function start() {
+		var assetsPath = "assets/";
+		var manifest = [
+		    {src:assetsPath+"Game-Break.mp3|"+assetsPath+"Game-Break.ogg", id:1, data: 1},
+		    {src:assetsPath+"Game-Spawn.mp3|"+assetsPath+"Game-Spawn.ogg", id:2, data: 1},
+		    {src:assetsPath+"Game-Shot.mp3|"+assetsPath+"Game-Shot.ogg", id:3, data: 1},
+
+		    {src:assetsPath+"GU-StealDaisy.mp3|"+assetsPath+"GU-StealDaisy.ogg", id:4, data: 1},
+		    {src:assetsPath+"Humm.mp3|"+assetsPath+"Humm.ogg", id:5, data: 1},
+		    {src:assetsPath+"R-Damage.mp3|"+assetsPath+"R-Damage.ogg", id:6, data: 1},
+
+		    {src:assetsPath+"Thunder1.mp3|"+assetsPath+"Thunder1.ogg", id:7, data: 1},
+		    {src:assetsPath+"S-Damage.mp3|"+assetsPath+"S-Damage.ogg", id:8, data: 1},
+		    {src:assetsPath+"U-CabinBoy3.mp3|"+assetsPath+"U-CabinBoy3.ogg", id:9, data: 1},
+
+		    {src:assetsPath+"ToneWobble.mp3|"+assetsPath+"ToneWobble.ogg", id:10, data: 1},
+		    {src:assetsPath+"Game-Death.mp3|"+assetsPath+"Game-Death.ogg", id:11, data: 1},
+		    {src:assetsPath+"Game-Break.mp3|"+assetsPath+"Game-Break.ogg", id:12, data: 1}
+		];
+
+		SoundJS.FlashPlugin.BASE_PATH = "assets/" // Initialize the base path from this document to the Flash Plugin
+
+	    preload = new PreloadJS();
+	    //Install SoundJS as a plugin, then PreloadJS will initialize it automatically.
+	    preload.installPlugin(SoundJS);
+
+	    //Available PreloadJS callbacks
+	    preload.onFileLoad = function(event) {
+		    // Show the icon on loaded items.
+			var div = document.getElementById(event.id);
+		    div.style.backgroundImage = "url('assets/audioButtonSheet.png')";
+	    };
+
+	    //Load the manifest and pass 'true' to start loading immediately. Otherwise, you can call load() manually.
+	    preload.loadManifest(manifest, true);
+	}
+
+	function stop() {
+		if (preload != null) { preload.close(); }
+		SoundJS.stop();
+	}
+
+	function playSound(target) {
+	    //Play the sound: play (src, interrupt, delay, offset, loop, volume, pan)
+	    var instance = SoundJS.play(target.id, SoundJS.INTERRUPT_NONE, 0, 0, false, 1);
+		target.className = "gridBox active";
+		instance.onComplete = function(instance) {
+			target.className = "gridBox";
+		}
+
+	}
+	</script>
+
+	<link rel="stylesheet" type="text/css" href="assets/demoStyles.css"/>
+<style>
+   body {
+       font-family: sans-serif;
+       font-size: 11px;
+   }
+
+   #imageGrid {
+	   width: 1000px;
+   }
+   .gridBox {
+		float: left;
+		background-repeat: no-repeat;
+		background-position: 0 0px;
+		background-color: #222;
+	    background-size: 320px 300px;
+		border: 0px solid #666;
+		width: 320px;
+		height: 100px;
+    }
+   .gridBox:hover {
+	   background-position: 0 -100px;
+	   background-color: #322;
+	   cursor: pointer;
+   }
+   .gridBox.active, .gridbox.active:hover {
+	   background-position: 0 -200px;
+	   cursor: auto;
+   }
+ </style>
+
+</head>
+
+<body onload="init();">
+<!-- We'll use the ID of the div to determine which audio file to play.
+These id's match the ones passed into the audioList array. -->
+<div id="imageGrid">
+    <div id="1" onclick="playSound(this)" class="gridBox"></div>
+    <div id="2" onclick="playSound(this)" class="gridBox"></div>
+    <div id="3" onclick="playSound(this)" class="gridBox"></div>
+    <div id="4" onclick="playSound(this)" class="gridBox"></div>
+    <div id="5" onclick="playSound(this)" class="gridBox"></div>
+    <div id="6" onclick="playSound(this)" class="gridBox"></div>
+    <div id="7" onclick="playSound(this)" class="gridBox"></div>
+    <div id="8" onclick="playSound(this)" class="gridBox"></div>
+    <div id="9" onclick="playSound(this)" class="gridBox"></div>
+    <div id="10" onclick="playSound(this)" class="gridBox"></div>
+    <div id="11" onclick="playSound(this)" class="gridBox"></div>
+    <div id="12" onclick="playSound(this)" class="gridBox"></div>
+</div>
+<div style="margin-left: 500px">
+	<!--
+    <p><strong>Advanced Options</strong></p>
+    <p>Interrupt Mode:<select id="interruptInput" style="display: inline-block"><option value="any">INTERRUPT_ANY</option><option value="early">INTERRUPT_EARLY</option><option id="late">INTERRUPT_LATE</option><option value="none">INTERRUPT_NONE</option></select></p>
+    <p>Delay:<input id="delayInput" type="number" value="0" min="0" max="5" step=".5" /></p>
+    <p>Volume:<input id="volumeInput" type="number" value="100" min="0" max="100" step="5" /></p>-->
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/TestSuite.html b/examples/TestSuite.html
index 609672a6..d56a474b 100644
--- a/examples/TestSuite.html
+++ b/examples/TestSuite.html
@@ -1,302 +1,454 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-<script language="javascript" src="../src/soundjs/SoundJS.js"></script>
-<script language="javascript">
-
-/* Setup */
-function init() {
-	startLoad();
-	enableSet("sound", false);
-	enableSet("instance", false);
-}
-
-/* Preload sounds. Will not work on iOS
-	All Sounds are pre-populated into the library list with the (waiting) label
-*/
-function startLoad() {
-	enableSet("load", false);
-	var list = [
-		{name:"Steal", src:["../assets/GU-StealDaisy.ogg","../assets/GU-StealDaisy.mp3"], instances:4},
-		{name:"Humm (MP3)", src:"../assets/Humm.mp3"}, // NOTE: mp3-only
-		{name:"Humm (OGG)", src:"../assets/Humm.ogg"}, // NOTE: ogg-only
-		{name:"Damage1", src:["../assets/R-Damage.mp3","../assets/R-Damage.ogg"], instances:4},
-		{name:"Damage2", src:["../assets/S-Damage.mp3","../assets/S-Damage.ogg"], instances:4},
-		{name:"Thunder", src:["../assets/Thunder1.mp3","../assets/Thunder1.ogg"], instances:2},
-		{name:"ToneWobble", src:["../assets/ToneWobble.mp3","../assets/ToneWobble.ogg"], instances:2},
-		{name:"CabinBoy", src:["../assets/U-CabinBoy3.mp3","../assets/U-CabinBoy3.ogg"], instances:2},
-		{name:"GameBG", src:["../assets/M-GameBG.mp3","../assets/M-GameBG.ogg"], instances:2},
-		{name:"Machinae Supremacy", src:["../assets/18-machinae_supremacy-lord_krutors_dominion.mp3","../assets/18-machinae_supremacy-lord_krutors_dominion.ogg"], instances:2}
-	];
-	
-	/* 
-	// For later. iOS will not preload audio, so we must pre-populate the list so audio can be played
-	var form = $("#playControls").get(0);
-	form.library.remove(0);
-	for (var i=0, l=list.length; i<l; i++) {
-		form.library.options.add(new Option(list[i].name + " (waiting)", list[i].name));	
-	}
-	form.library.disabled = false;*/
-	
-	SoundJS.addBatch(list);
-	
-	SoundJS.onSoundLoadComplete = handleComplete;
-	//SoundJS.onProgress = handleProgress;
-	SoundJS.onLoadQueueComplete = handleAllComplete;
-	SoundJS.onSoundEnded = handleSoundEnded;
-}
-
-/* Display the progress of the load */
-function handleProgress(progress) {
-	var progress = Math.round(1/progress*100) + "%"
-}
-
-/* When each sound completes, it is replaced in the list with an entry that shows the available instances */
-function handleComplete(sound, name) {
-	var form = $("#playControls").get(0);
-	var library = form.library;
-	
-	if (library.options[0].value == "-1") {
-		library.remove(0);
-	}
-	
-	for (var i=0, l=library.options.length; i<l; i++) {
-		var item = library.options[i];
-		if (item.value == name) {
-			form.library.remove(i);
-			break;
-		}
-	}
-	form.library.options.add(new Option(name + " ("+SoundJS.getNumInstances(name)+")", name));
-	if (library.disabled) { library.disabled = false; }
-}
-
-function handleAllComplete() {}
-
-/* A reference to the selected item */
-var selectedItem;
-
-/* When a library item is selected, the UI is enabled to play it */
-function selectItem(select) {
-	// Enable UI!
-	var item = select.options[select.selectedIndex];
-	if (item == null) {
-		enableSet("sound", false);
-		selectedItem = null;
-	} else {
-		enableSet("sound", true);
-		selectedItem = item.value;
-	}
-}
-
-/* Plays a sound using SoundJS.
-	The sound is added to the "nowPlaying" list while it is playing */
-function playSound() {
-	var form = $("#playControls").get(0);
-	var field = form.interrupt;
-	var interrupt = field.options[field.selectedIndex];
-	
-	var result = SoundJS.play(selectedItem, field.value, 1, form.loop.checked);
-	
-	if (result >= 0) {
-		// Remove Default
-		form = $("#instanceControls").get(0);
-		if (form.nowPlaying.options[0].value == "-1") {
-			form.nowPlaying.remove(0);	
-		}
-		
-		var id = selectedItem+"_"+result;
-		removeSound(id, true);
-		
-		// Add latest. To add at beginning like I want we have to put in an IE hack, so forget that.
-		form.nowPlaying.options.add(new Option(selectedItem + " ("+result+")", id));
-		form.nowPlaying.disabled = false;
-	}
-}
-
-/* Remove a sound from the "nowPlaying" list. */
-function removeSound(id, resetItems) {
-	var form = $("#instanceControls").get(0);
-	// Remove existing if this is an override
-	for (var i=0, l=form.nowPlaying.options.length; i<l; i++) {
-		if (form.nowPlaying.options[i].value == id) { 
-			form.nowPlaying.remove(i); 
-			break;
-		}
-	}
-		
-	if (resetItems != true && form.nowPlaying.options.length == 0) {
-		form.nowPlaying.options.add(new Option("-- No Audio Playing --","-1"));
-		form.nowPlaying.disabled = true;
-	}
-
-}
-
-/* An instance of a playing sound has been selected.
-	The instance controls are enabled */
-function selectInstance(select) {
-	var form = $("#instanceControls").get(0);
-	if (form.nowPlaying.selectedIndex > -1) {
-		var item = form.nowPlaying.options[form.nowPlaying.selectedIndex];
-		var parts = item.value.split("_");
-		form.volume.value = SoundJS.getVolume(parts[0], parts[1]) * 100;
-		enableSet("instance", true);
-	} else {
-		enableSet("instance", false);
-	}
-}
-
-/* Stop all sounds, and clear the "nowPlaying" list. */
-function stopAllSounds() {
-	SoundJS.stop();
-	
-	// Update UI
-	var form = $("#instanceControls").get(0);
-	while (form.nowPlaying.options.length) { form.nowPlaying.remove(0); }
-	form.nowPlaying.options.add(new Option("-- No Audio Playing --", "-1"));
-	form.nowPlaying.disabled = true;
-}
-
-/* Stop playing a specific sound instance. */
-function stopSound() {
-	// Pull selected info, and stop it.
-	var form = $("#instanceControls").get(0);
-	if (form.nowPlaying.disabled) { return; }
-	if (form.nowPlaying.selectedIndex == -1) { return; }
-	var id = form.nowPlaying.options[form.nowPlaying.selectedIndex].value;
-	var parts = id.split("_");
-	
-	SoundJS.stop(parts[0], parts[1]);
-	removeSound(id);
-	
-	enableSet("instance", false);
-}
-
-/* A sound has completed. Remove it from the "nowPlaying" list */
-function handleSoundEnded(sound, name, index) {
-	removeSound(name + "_" + index);
-}
-
-/* Change the volume of a sound instance */
-function changeVolume(slider) {
-	var form = $("#instanceControls").get(0);
-	var item = form.nowPlaying.options[form.nowPlaying.selectedIndex];
-	if (item == null) { return; }
-	var parts = item.value.split("_");
-	SoundJS.setVolume(slider.value/100, parts[0], parts[1]);
-}
-
-/* Change the master volume of SoundJS */
-function changeMasterVolume(slider) {
-	SoundJS.setMasterVolume(slider.value/100);
-}
-
-/* Toggle the enabled property of a named set of components in a specific form */
-function enableSet(name, enabled) {
-	switch (name) {
-		case "load":
-			enableItems("loadForm", enabled, ["startLoad"]);
-			break;
-		case "sound":
-			enableItems("playControls", enabled, ["playPause", "interrupt", "loop"]);
-			break;
-		case "instance":
-			enableItems("instanceControls", enabled, ["volume", "stop"]);
-			break;
-	}
-}
-
-/* Toggle the enabled property of a number of named elements in a form */
-function enableItems(formName, value, items) {
-	var form = $("#" + formName).get(0);
-	if (form == null) { return; }
-	for (var i=0, l=items.length; i<l; i++) {
-		var item = form[items[i]];
-		if (item == null) { continue; }
-		item.disabled = !value;	
-	}
-}
-		
-
-</script>
-<title>SoundJS Test Suit</title>
-<style>
-FORM {
-	margin: 10px;
-	text-align:left;
-}
-.select {
-	width: 150px;
-	height: 120px;
-}
-</style>
-<link href="styles.css" rel="stylesheet" type="text/css" />
-<link href="../styles.css" rel="stylesheet" type="text/css" />
-</head>
-<body align="center" onload="init()">
-	<div class="content">
-	
-		<header>
-		<a href="http://github.com/gskinner/SoundJS"><img style="position: fixed; top: 0; left: 0; border: 0; z-index:200;" src="https://assets0.github.com/img/6429057dfef9e98189338d22e7f6646c6694f032?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_orange_ff7600.png&path=" alt="Fork me on GitHub"></a> 
-		<a href="../" title="SoundJS - A Javascript lIbrary for working with html5 audio"><img src="../img/logo.gif" width="240" height="120" style="margin-top:-5px;" alt="A javascript library for working with html5 audio"/></a>
-		<h1>Test Suite</h1>
-		<img src="../img/flourish.gif" style="margin-bottom:10px;"/>
-		</header>
-<p>This test suite loads and plays a number of sounds, defined in the source. Playing sounds can be controlled, stopped, etc</p>
-
-<form id="playControls" onsubmit="return false;" class="demoWrap">
-	<p>Select a sound to play it. Each sound shows how many instances it can play at once.</p>
-	<select id="library" multiple="multiple" disabled="disabled" onchange="selectItem(this)" class="select">
-		<option value="-1">-- No Audio Loaded --</option>
-	</select><br />
-	
-	<input id="playPause" name="playPause" type="button" value="Play" onclick="playSound()" />
-	<label for="interrupt">Interrupt</label>
-	<select id="interrupt">
-		<option selected="selected" value="1">
-		Any</option>
-		<option value="4">None</option>
-		<option value="2">Early</option>
-		<option value="3">Late</option>
-	</select>
-	<input type="checkbox" id="loop" />
-	<label for="loop">Loop</label><br />
-	
-	<label for="masterVolume">Master Volume</label>
-	<input id="masterVolume" type="range" min="0" max="100" onchange="changeMasterVolume(this)" value="100" /><br />
-	<input name="stopAll" type="button" value="Stop All Sounds" onclick="stopAllSounds()" /><br />
-</form>
-	
-<form id="instanceControls" onsubmit="return false;" class="demoWrap">
-	<p>Select a playing sound to stop it, or control its volume. When a sound completes, it is removed from this list.</p>
-	<select id="nowPlaying" multiple="multiple" disabled="disabled" onchange="selectInstance(this)" class="select">
-		<option value="-1">-- No Audio Playing --</option>
-	</select>
-	<br />
-	<label for="volume">Instance Volume</label>
-	<input id="volume" type="range" min="0" max="100" onchange="changeVolume(this)" value="100" />
-	<br />
-	<input id="stop" name="stop" type="button" value="Stop" onclick="stopSound()" />
-	<br />
-</form>
-		<p class="callout"><strong>examples:</strong> 
-			<a href="../examples/convolution.html">Convolution</a>, 
-			<a href="../examples/interrupt.html">Interrupt</a>, 
-			<a href="../examples/dynamicInstance.html">Dynamic Instances</a>, 
-			<a href="../examples/masterVolume.html">Master Volume</a>, 
-			<a href="../examples/game/game.html">A Game</a> , 
-			<a href="../examples/TestSuite.html">Test Suite</a>
-		</p>
-		<footer>
-		<img src="../img/flourish2.gif" style="margin: 5px;"/>
-		<p>
-		<script>
-			document.write("&copy;" + new Date().getFullYear()); 
-		 </script>
-			<a href="http://gskinner.com/">gskinner.com, inc.</a> | proudly hosted by <a href="http://mediatemple.com/">Media Temple</a></p>
-		</footer>
-	</div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>SoundJS: Test Suite</title>
+
+<script src="http://code.createjs.com/preloadjs-0.1.0.min.js"></script>
+<script src="http://code.createjs.com/soundjs-0.2.0.min.js"></script>
+<script src="http://code.createjs.com/soundjs.flashplugin-0.2.0.min.js"></script>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
+<link type="text/css" href="assets/css/jquery-ui-1.8.18.custom.css" rel="stylesheet" />
+
+<style type="text/css">
+    /* define a width for the sliders by styling the wrapping div */
+    .panSlider,
+    .volumeSlider,
+    .offsetSlider,
+    .delaySlider,
+    .masterVolumeSlider,
+    .loopSlider { width:200px; }
+</style>
+<script>
+
+	// Read the URL Params
+	var params = {};
+	var pieces = window.location.search.slice(1).split("&");
+	for (var i=0, l=pieces.length; i<l; i++) {
+	    var parts = pieces[i].split("=");
+	    params[parts[0]] = parts[1];
+	}
+
+	function init() {
+		if (window.top == window) {
+			start();
+			document.getElementById("header").style.display = "block";
+		}
+	}
+
+	var preload;
+
+	function start() {
+	    enableSet("sound", false);
+	    enableSet("instance", false);
+
+	    SoundJS.FlashPlugin.BASE_PATH = "assets/" // Initialize the base path from this document to the Flash Plugin
+	    if (params.type == "flash") {
+	        SoundJS.registerPlugins([SoundJS.FlashPlugin]);
+	    } else {
+	        SoundJS.registerPlugins([SoundJS.HTMLAudioPlugin, SoundJS.FlashPlugin]);
+	    }
+
+	    $(".panSlider").slider({value: 0,
+	        min: -1,
+	        max: 1,
+	        disabled:true,
+	        change:handleSliderChange
+	    });
+
+	    $(".volumeSlider").slider({value: 100,
+	        min: 0,
+	        max: 100,
+	        disabled:true,
+	        change:handleSliderChange
+	    });
+
+	    $(".offsetSlider").slider({value: 0,
+	        min: 0,
+	        max: 10,
+	        disabled:true,
+	        change:handleSliderChange
+	    });
+
+	    $(".delaySlider").slider({value: 0,
+	        min: 0,
+	        max: 10,
+	        disabled:true,
+	        change:handleSliderChange
+	    });
+
+	    $(".masterVolumeSlider").slider({value: 100,
+	        min: 0,
+	        max: 100,
+	        disabled:false,
+	        change:handleSliderChange
+	    });
+
+	    $(".loopSlider").slider({value: 0,
+	        min: -1,
+	        max: 5,
+	        disabled:true,
+	        change:handleSliderChange
+	    });
+
+	    preload = new PreloadJS();
+	    preload.installPlugin(SoundJS);
+	    preload.onFileLoad = handleFileLoad;
+	    preload.onProgress = handleProgress;
+	    preload.onComplete = handleComplete;
+
+	    var assetsPath = "./assets/";
+	    var manifest = [
+	        //basePath + "music.mp3",
+	        {id:"Music", src:assetsPath + "M-GameBG.mp3", data:2},
+	        {id:"Humm (mp3)", src:assetsPath + "Humm.mp3"},
+	        {id:"Humm (ogg)", src:assetsPath + "Humm.ogg"},
+	        {id:"Thunder", src:assetsPath + "Thunder1.mp3|"+assetsPath + "Thunder1.ogg", data:3},
+	        {id:"Tone wobble", src:assetsPath + "ToneWobble.mp3|"+assetsPath + "ToneWobble.ogg", type:"sound"},
+	        {id:"Rat Damage", src:assetsPath + "R-Damage.mp3", type:"sound"},
+	        {id:"Seagull Damage", src:assetsPath + "S-Damage.mp3", type:"sound", id:"Damage"},
+	        {id:"Cabin Boy", src:assetsPath + "U-CabinBoy3.mp3", type:"sound", id:"CabinBoy", data:1}
+	    ];
+	    preload.loadManifest(manifest);
+
+	    // Library Controls
+	    $("#library").change(selectItem);
+	    $("#playSoundBtn").click(playSound);
+	    $("#stopAllSoundsBtn").click(function(event) {
+	        SoundJS.stop();
+	        removeSound("all");
+	    });
+
+	    $(".masterVolumeSlider").slider().bind('slide',function(event){
+	        var value = $(this).slider("option", "value");
+		    console.log(value);
+	        SoundJS.setVolume(value/100);
+	    });
+
+	    // Instance Controls
+	    $("#nowPlaying").change(selectInstance);
+	    $("#stopBtn").click(function(event){
+	        var instance = getInstance()
+	        if (instance == null) { return; }
+	        instance.stop();
+	        removeSound(instance);
+	    });
+	    $("#pauseBtn").click(function(event){
+	        var instance = getInstance();
+	        if (instance == null) { return; }
+	        instance.paused ? instance.resume() : instance.pause();
+	        $("#pauseBtn").attr("value", instance.paused ? "Resume" : "Pause");
+	    });
+
+	    $(".volumeSlider").slider().bind('slide',function(event){
+	        var instance = getInstance();
+	        if (instance == null) { return; }
+	        var value = $(this).slider("option", "value");
+	        instance.setVolume(value/100);
+	    });
+
+	    $(".panSlider").slider().bind('slide',function(event){
+	        var instance = getInstance();
+	        var value = $(this).slider("option", "value");
+	        instance.setPan(value/100);
+	    });
+	}
+
+	function stop() {
+		if (preload != null) { preload.close(); }
+		SoundJS.stop();
+	}
+
+	function handleSliderChange() {
+		var units = this.dataset.units;
+		var value = $(this).slider("option", "value");
+		$("#"+this.id+"Value").text(value + (units ? " " + units + (value==1?"":"s"):""));
+	}
+
+	function handleFileLoad(event) {
+	    var list = $("#library").get(0);
+	    var item = event.result;
+	    list.options.add(new Option((event.id || event.src) + " ("+(event.data||0)+")", event.id));
+	}
+
+	function handleProgress(event) {}
+
+	function handleComplete(event) {}
+
+	function playSound(event) {
+	    var list = $("#library").get(0);
+	    if (list.selectedIndex == -1) { return; }
+
+	    //LM: Consider merging the two for loops
+	    var indices = [];
+	    for (var i=0, l=list.options.length; i<l; i++) {
+	        if (list.options[i].selected) { indices.push(i); }
+	    }
+
+	    // Options
+	    var interrupt = $("#interrupt").get(0);
+	    var interruptValue = interrupt.options[interrupt.selectedIndex].value;
+	    var loop = $(".loopSlider").slider("option", "value");
+	    var delay = $(".delaySlider").slider("option", "value") *1000;
+	    var offset = $(".offsetSlider").slider("option", "value")*1000;
+	    var nowPlaying = $("#nowPlaying").get(0);
+
+	    for (var i=0, l=indices.length; i<l; i++) {
+	        var index = indices[i]; //list.selectedIndex;
+	        if (index == null) { continue; }
+	        var item = list.options[index];
+
+	        // Play Sound
+	        var instance = SoundJS.play(item.value, interruptValue, delay, offset, loop, 1, 0);
+	        if (instance == null) { continue; }
+	        instance.onPlayFailed = handlePlayFailed;
+	        instance.onComplete = handleSoundComplete;
+	        instance.onPlayInterrupted = handlePlayFailed;
+
+		    // Put in the nowPlaying list. (Remember to remove first temp item)
+	        if (nowPlaying.options[0].value == "-1") {
+	            nowPlaying.remove(0);
+	            nowPlaying.disabled = false;
+	        } else {
+	            for (var j=nowPlaying.options.length-1; j>=0; j--) {
+	                if (nowPlaying.options[j].value == instance.uniqueId) {
+	                    if (nowPlaying.options.remove) {
+	                        nowPlaying.options.remove(j);
+	                    } else if (nowPlaying.remove) {
+	                        nowPlaying.remove(j);
+	                    }
+	                }
+	            }
+	        }
+
+	        nowPlaying.options.add(new Option(instance.src + "("+instance.uniqueId + ")", instance.uniqueId));
+	    }
+	}
+
+	// Sound finished. Remove it from the list.
+	function handleSoundComplete(instance) {
+	    removeSound(instance);
+	}
+
+	// Playback failed (usually interrupt failed)
+	function handlePlayFailed(instance) {
+	    removeSound(instance);
+	}
+
+	// Remove the sound from the list.
+	function removeSound(instance) {
+	    var list = $("#nowPlaying").get(0);
+	    for (var i=list.options.length-1; i>=0; i--) {
+	        if (instance == "all" || list.options[i].value == instance.uniqueId) {
+	            if (list.selectedIndex == i) {
+	                enableSet("instance", false);
+	            }
+	            if (list.options.remove) { list.options.remove(i); }
+	            else if (list.remove) { list.remove(i); }
+	            if (instance != "all") { break; }
+	        }
+	    }
+	    if (list.options.length == 0) {
+	        list.options.add(new Option("-- No Audio Playing --", -1));
+	        list.disabled = true;
+	        enableSet("instance", false);
+	    } else if (list.selectedIndex > -1) {
+	        var item = list.options[list.selectedIndex];
+	    }
+
+	}
+
+	// Get the currently selected sound from nowPlaying
+	function getInstance() {
+	    var list = $("#nowPlaying").get(0);
+	    var item = list.options[list.selectedIndex];
+
+	    var instance = SoundJS.getInstanceById(item.value);
+	    if (instance == null) { return null; }
+	    return instance;
+	}
+
+	// A library item was selected
+	function selectItem(event) {
+	    var list = $("#library").get(0);
+	    if (list.selectedIndex != -1) {
+	        enableSet("sound", true)
+	    } else {
+	        enableSet("sound", false)
+	    }
+	}
+
+	// A playing instance was selected
+	function selectInstance(event) {
+	    var list = $("#nowPlaying").get(0);
+	    if (list.selectedIndex > -1) {
+	        enableSet("instance", true);
+	        var instance = getInstance();
+	        $("#pauseBtn").attr("value", instance.paused ? "Resume" : "Pause");
+	        $("#volume").val(instance.getVolume()*100|0);
+	        $("#volumeValue").text(instance.getVolume()*100|0);
+	        $("#pan").val(instance.getPan()*100|0);
+	        $("#panValue").text(instance.getPan()*100|0);
+	    } else {
+	        enableSet("instance", false);
+	    }
+	}
+
+	// Toggle the enabled property of a named set of components in a specific form
+	function enableSet(name, enabled) {
+	    switch (name) {
+	        case "sound":
+	            enableItems("playControls", enabled, ["playSoundBtn", "interrupt", "loop", "delay", "offset"]);
+	            break;
+	        case "instance":
+	            enableItems("instanceControls", enabled, ["pause", "volume", "stop", "pan"]);
+	            break;
+	    }
+	}
+
+	// Toggle the enabled property of a number of named elements in a form
+	function enableItems(formName, value, items) {
+	    var form = $("#" + formName);
+	    var element = form.get(0);
+	    if (element == null) { return; }
+	    value ? form.removeClass("disabled") : form.addClass("disabled");
+	    for (var i=0, l=items.length; i<l; i++) {
+	        var item = element[items[i]];
+
+	        if ($('.'+items[i]+'Slider')) {
+	            $('.'+items[i]+'Slider').slider('option', 'disabled', !value);
+	        }
+
+	        if (item == null) { continue; }
+	        item.disabled = !value;
+	    }
+	}
+
+</script>
+
+	<link rel="stylesheet" type="text/css" href="assets/demoStyles.css"/>
+	<style>
+	    FORM {
+	        text-align:left;
+		    width: 450px;
+		    padding: 5px;
+		    float:left;
+	    }
+	    FORM P {
+		    margin: 0 0 10px 0;
+	    }
+	    #instanceControls {
+		    border: 1px solid #999;
+		    border-width: 0 0 0 1px;
+		    padding-left: 20px;
+	    }
+	    .select {
+	        width: 200px;
+	        height: 80px;
+	    }
+	    .disabled {
+	        color: #999;
+	        font-style: italic;
+	    }
+	    .disabled p, .disabled .nodisable {
+	        color: #000;
+	        font-style: normal;
+	    }
+	</style>
+
+</head>
+<body onload="init()">
+
+<div class="content">
+    <header id="header">
+	    <h1><span>SoundJS</span> Test Suite</h1>
+        <p>This test suite loads and plays a number of sounds, defined in the source. Playing sounds can be controlled, stopped, etc</p>
+    </header>
+
+    <div>
+        <a href="?type=normal">HTML with Flash Fallback</a> | <a href="?type=flash">Flash Only</a>
+    </div>
+
+    <form id="playControls">
+        <p>Select a sound to play it. <br/>Each sound shows how many instances it can play at once.</p>
+        <select id="library" multiple="multiple" class="select"></select><br />
+
+        <input type="button" id="playSoundBtn" value="Play" />
+
+        <label for="interrupt">Interrupt</label>
+        <select id="interrupt">
+            <option selected="selected" value="any">
+                Any</option>
+            <option value="none">None</option>
+            <option value="early">Early</option>
+            <option value="late">Late</option>
+        </select>
+
+        <br />
+        <br />
+
+        <table border="0" width="400" cellpadding="5" cellspacing="5">
+            <tr>
+                <td><label for="loop">Loop</label></td>
+                <td><div class="loopSlider" id="loop"></div></td>
+                <td><label for="loop" id="loopValue">0</label></td>
+            </tr>
+            <tr>
+                <td> <label for="delay">Delay</label></td>
+                <td><div class="delaySlider" id="delay" data-units="second"></div></td>
+                <td><label for="delay" id="delayValue">0 seconds</label></td>
+            </tr>
+            <tr>
+                <td><label for="offset">Offset</label></td>
+                <td><div class="offsetSlider" id="offset" data-units="second"></div></td>
+                <td><label for="offset" id="offsetValue">0 seconds</label></td>
+            </tr>
+            <tr>
+                <td><label for="masterVolume" class="nodisable">Master Volume</label></td>
+                <td> <div class="masterVolumeSlider" id="masterVolume"></div></td>
+                <td><label for="masterVolume" id="masterVolumeValue">100</label></td>
+            </tr>
+            <tr>
+                <td></label></td>
+                <td></td>
+                <td><br /></td>
+            </tr>
+        </table>
+        <input id="stopAllSoundsBtn" name="stopAll" type="button" value="Stop All Sounds" />
+    </form>
+
+    <form id="instanceControls">
+        <p>Select a playing sound to stop it, or control its volume. <br/>When a sound completes, it is removed from this list.</p>
+        <select id="nowPlaying" multiple="multiple" disabled="disabled" class="select">
+            <option value="-1">-- No Audio Playing --</option>
+        </select>
+
+        <br/>
+        <br/>
+        <table border="0" width="400" cellpadding="5" cellspacing="5">
+            <tr>
+                <td><label for="volume">Instance Volume</label></td>
+                <td><div id="volume" class="volumeSlider"></div></td>
+                <td><label for="volume" id="volumeValue">100</label></td>
+            </tr>
+            <tr>
+                <td><label for="pan">Pan</label></td>
+                <td><div class="panSlider" id="pan"></div></td>
+                <td><label for="pan" id="panValue">0</label></td>
+            </tr>
+            <tr>
+                <td></td>
+
+
+            </tr>
+        </table>
+        <input id="pauseBtn" name="pause" type="button" value="Pause" />
+        <input id="stopBtn" name="stop" type="button" value="Stop" />
+    </form>
+
+</div>
+
+</body>
+</html>
diff --git a/examples/assets/.DS_Store b/examples/assets/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/examples/assets/.DS_Store differ
diff --git a/assets/18-machinae_supremacy-lord_krutors_dominion.mp3 b/examples/assets/18-machinae_supremacy-lord_krutors_dominion.mp3
similarity index 100%
rename from assets/18-machinae_supremacy-lord_krutors_dominion.mp3
rename to examples/assets/18-machinae_supremacy-lord_krutors_dominion.mp3
diff --git a/assets/18-machinae_supremacy-lord_krutors_dominion.ogg b/examples/assets/18-machinae_supremacy-lord_krutors_dominion.ogg
similarity index 100%
rename from assets/18-machinae_supremacy-lord_krutors_dominion.ogg
rename to examples/assets/18-machinae_supremacy-lord_krutors_dominion.ogg
diff --git a/examples/assets/FlashAudioPlugin.swf b/examples/assets/FlashAudioPlugin.swf
new file mode 100644
index 00000000..0b13fa84
Binary files /dev/null and b/examples/assets/FlashAudioPlugin.swf differ
diff --git a/assets/GU-StealDaisy.mp3 b/examples/assets/GU-StealDaisy.mp3
similarity index 100%
rename from assets/GU-StealDaisy.mp3
rename to examples/assets/GU-StealDaisy.mp3
diff --git a/assets/GU-StealDaisy.ogg b/examples/assets/GU-StealDaisy.ogg
similarity index 100%
rename from assets/GU-StealDaisy.ogg
rename to examples/assets/GU-StealDaisy.ogg
diff --git a/assets/Game-Break.mp3 b/examples/assets/Game-Break.mp3
similarity index 100%
rename from assets/Game-Break.mp3
rename to examples/assets/Game-Break.mp3
diff --git a/assets/Game-Break.ogg b/examples/assets/Game-Break.ogg
similarity index 100%
rename from assets/Game-Break.ogg
rename to examples/assets/Game-Break.ogg
diff --git a/assets/Game-Death.mp3 b/examples/assets/Game-Death.mp3
similarity index 100%
rename from assets/Game-Death.mp3
rename to examples/assets/Game-Death.mp3
diff --git a/assets/Game-Death.ogg b/examples/assets/Game-Death.ogg
similarity index 100%
rename from assets/Game-Death.ogg
rename to examples/assets/Game-Death.ogg
diff --git a/assets/Game-Shot.mp3 b/examples/assets/Game-Shot.mp3
similarity index 100%
rename from assets/Game-Shot.mp3
rename to examples/assets/Game-Shot.mp3
diff --git a/assets/Game-Shot.ogg b/examples/assets/Game-Shot.ogg
similarity index 100%
rename from assets/Game-Shot.ogg
rename to examples/assets/Game-Shot.ogg
diff --git a/assets/Game-Spawn.mp3 b/examples/assets/Game-Spawn.mp3
similarity index 100%
rename from assets/Game-Spawn.mp3
rename to examples/assets/Game-Spawn.mp3
diff --git a/assets/Game-Spawn.ogg b/examples/assets/Game-Spawn.ogg
similarity index 100%
rename from assets/Game-Spawn.ogg
rename to examples/assets/Game-Spawn.ogg
diff --git a/assets/Humm.mp3 b/examples/assets/Humm.mp3
similarity index 100%
rename from assets/Humm.mp3
rename to examples/assets/Humm.mp3
diff --git a/assets/Humm.ogg b/examples/assets/Humm.ogg
similarity index 100%
rename from assets/Humm.ogg
rename to examples/assets/Humm.ogg
diff --git a/assets/M-GameBG.mp3 b/examples/assets/M-GameBG.mp3
similarity index 100%
rename from assets/M-GameBG.mp3
rename to examples/assets/M-GameBG.mp3
diff --git a/assets/M-GameBG.ogg b/examples/assets/M-GameBG.ogg
similarity index 100%
rename from assets/M-GameBG.ogg
rename to examples/assets/M-GameBG.ogg
diff --git a/assets/R-Damage.mp3 b/examples/assets/R-Damage.mp3
similarity index 100%
rename from assets/R-Damage.mp3
rename to examples/assets/R-Damage.mp3
diff --git a/assets/R-Damage.ogg b/examples/assets/R-Damage.ogg
similarity index 100%
rename from assets/R-Damage.ogg
rename to examples/assets/R-Damage.ogg
diff --git a/assets/S-Damage.mp3 b/examples/assets/S-Damage.mp3
similarity index 100%
rename from assets/S-Damage.mp3
rename to examples/assets/S-Damage.mp3
diff --git a/assets/S-Damage.ogg b/examples/assets/S-Damage.ogg
similarity index 100%
rename from assets/S-Damage.ogg
rename to examples/assets/S-Damage.ogg
diff --git a/examples/game/Ship.js b/examples/assets/Ship.js
similarity index 100%
rename from examples/game/Ship.js
rename to examples/assets/Ship.js
diff --git a/examples/game/SpaceRock.js b/examples/assets/SpaceRock.js
similarity index 100%
rename from examples/game/SpaceRock.js
rename to examples/assets/SpaceRock.js
diff --git a/assets/Thunder1.mp3 b/examples/assets/Thunder1.mp3
similarity index 100%
rename from assets/Thunder1.mp3
rename to examples/assets/Thunder1.mp3
diff --git a/assets/Thunder1.ogg b/examples/assets/Thunder1.ogg
similarity index 100%
rename from assets/Thunder1.ogg
rename to examples/assets/Thunder1.ogg
diff --git a/assets/ToneWobble.mp3 b/examples/assets/ToneWobble.mp3
similarity index 100%
rename from assets/ToneWobble.mp3
rename to examples/assets/ToneWobble.mp3
diff --git a/assets/ToneWobble.ogg b/examples/assets/ToneWobble.ogg
similarity index 100%
rename from assets/ToneWobble.ogg
rename to examples/assets/ToneWobble.ogg
diff --git a/assets/U-CabinBoy3.mp3 b/examples/assets/U-CabinBoy3.mp3
similarity index 100%
rename from assets/U-CabinBoy3.mp3
rename to examples/assets/U-CabinBoy3.mp3
diff --git a/assets/U-CabinBoy3.ogg b/examples/assets/U-CabinBoy3.ogg
similarity index 100%
rename from assets/U-CabinBoy3.ogg
rename to examples/assets/U-CabinBoy3.ogg
diff --git a/examples/assets/audioButtonSheet.png b/examples/assets/audioButtonSheet.png
new file mode 100644
index 00000000..9e78f7e3
Binary files /dev/null and b/examples/assets/audioButtonSheet.png differ
diff --git a/examples/assets/css/images/ui-bg_flat_30_cccccc_40x100.png b/examples/assets/css/images/ui-bg_flat_30_cccccc_40x100.png
new file mode 100644
index 00000000..5473afff
Binary files /dev/null and b/examples/assets/css/images/ui-bg_flat_30_cccccc_40x100.png differ
diff --git a/examples/assets/css/images/ui-bg_flat_50_5c5c5c_40x100.png b/examples/assets/css/images/ui-bg_flat_50_5c5c5c_40x100.png
new file mode 100644
index 00000000..5950a8db
Binary files /dev/null and b/examples/assets/css/images/ui-bg_flat_50_5c5c5c_40x100.png differ
diff --git a/examples/assets/css/images/ui-bg_glass_40_ffc73d_1x400.png b/examples/assets/css/images/ui-bg_glass_40_ffc73d_1x400.png
new file mode 100644
index 00000000..35ec0d9d
Binary files /dev/null and b/examples/assets/css/images/ui-bg_glass_40_ffc73d_1x400.png differ
diff --git a/examples/assets/css/images/ui-bg_highlight-hard_20_0972a5_1x100.png b/examples/assets/css/images/ui-bg_highlight-hard_20_0972a5_1x100.png
new file mode 100644
index 00000000..142598c1
Binary files /dev/null and b/examples/assets/css/images/ui-bg_highlight-hard_20_0972a5_1x100.png differ
diff --git a/examples/assets/css/images/ui-bg_highlight-soft_33_003147_1x100.png b/examples/assets/css/images/ui-bg_highlight-soft_33_003147_1x100.png
new file mode 100644
index 00000000..a1d8297e
Binary files /dev/null and b/examples/assets/css/images/ui-bg_highlight-soft_33_003147_1x100.png differ
diff --git a/examples/assets/css/images/ui-bg_highlight-soft_35_222222_1x100.png b/examples/assets/css/images/ui-bg_highlight-soft_35_222222_1x100.png
new file mode 100644
index 00000000..a9b5ae30
Binary files /dev/null and b/examples/assets/css/images/ui-bg_highlight-soft_35_222222_1x100.png differ
diff --git a/examples/assets/css/images/ui-bg_highlight-soft_44_444444_1x100.png b/examples/assets/css/images/ui-bg_highlight-soft_44_444444_1x100.png
new file mode 100644
index 00000000..a5c0a4d0
Binary files /dev/null and b/examples/assets/css/images/ui-bg_highlight-soft_44_444444_1x100.png differ
diff --git a/examples/assets/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png b/examples/assets/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
new file mode 100644
index 00000000..e56eefd6
Binary files /dev/null and b/examples/assets/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png differ
diff --git a/examples/assets/css/images/ui-bg_loop_25_000000_21x21.png b/examples/assets/css/images/ui-bg_loop_25_000000_21x21.png
new file mode 100644
index 00000000..bc7ea5f7
Binary files /dev/null and b/examples/assets/css/images/ui-bg_loop_25_000000_21x21.png differ
diff --git a/examples/assets/css/images/ui-icons_222222_256x240.png b/examples/assets/css/images/ui-icons_222222_256x240.png
new file mode 100644
index 00000000..b273ff11
Binary files /dev/null and b/examples/assets/css/images/ui-icons_222222_256x240.png differ
diff --git a/examples/assets/css/images/ui-icons_4b8e0b_256x240.png b/examples/assets/css/images/ui-icons_4b8e0b_256x240.png
new file mode 100644
index 00000000..c5d93b6e
Binary files /dev/null and b/examples/assets/css/images/ui-icons_4b8e0b_256x240.png differ
diff --git a/examples/assets/css/images/ui-icons_a83300_256x240.png b/examples/assets/css/images/ui-icons_a83300_256x240.png
new file mode 100644
index 00000000..95993eab
Binary files /dev/null and b/examples/assets/css/images/ui-icons_a83300_256x240.png differ
diff --git a/examples/assets/css/images/ui-icons_cccccc_256x240.png b/examples/assets/css/images/ui-icons_cccccc_256x240.png
new file mode 100644
index 00000000..9254e05c
Binary files /dev/null and b/examples/assets/css/images/ui-icons_cccccc_256x240.png differ
diff --git a/examples/assets/css/images/ui-icons_ffffff_256x240.png b/examples/assets/css/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 00000000..42f8f992
Binary files /dev/null and b/examples/assets/css/images/ui-icons_ffffff_256x240.png differ
diff --git a/examples/assets/css/jquery-ui-1.8.18.custom.css b/examples/assets/css/jquery-ui-1.8.18.custom.css
new file mode 100644
index 00000000..673ddce8
--- /dev/null
+++ b/examples/assets/css/jquery-ui-1.8.18.custom.css
@@ -0,0 +1,565 @@
+/*
+ * jQuery UI CSS Framework 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:after { clear: both; }
+.ui-helper-clearfix { zoom: 1; }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,%20Arial,%20sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=444444&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=44&borderColorHeader=333333&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=000000&bgTextureContent=14_loop.png&bgImgOpacityContent=25&borderColorContent=555555&fcContent=ffffff&iconColorContent=cccccc&bgColorDefault=222222&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=35&borderColorDefault=444444&fcDefault=eeeeee&iconColorDefault=cccccc&bgColorHover=003147&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=33&borderColorHover=0b93d5&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=0972a5&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=20&borderColorActive=26b3f7&fcActive=ffffff&iconColorActive=222222&bgColorHighlight=eeeeee&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=80&borderColorHighlight=cccccc&fcHighlight=2e7db2&iconColorHighlight=4b8e0b&bgColorError=ffc73d&bgTextureError=02_glass.png&bgImgOpacityError=40&borderColorError=ffb73d&fcError=111111&iconColorError=a83300&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #555555; background: #000000 url(images/ui-bg_loop_25_000000_21x21.png) 50% 50% repeat; color: #ffffff; }
+.ui-widget-content a { color: #ffffff; }
+.ui-widget-header { border: 1px solid #333333; background: #444444 url(images/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #444444; background: #222222 url(images/ui-bg_highlight-soft_35_222222_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #eeeeee; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #eeeeee; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #0b93d5; background: #003147 url(images/ui-bg_highlight-soft_33_003147_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #26b3f7; background: #0972a5 url(images/ui-bg_highlight-hard_20_0972a5_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ffffff; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #cccccc; background: #eeeeee url(images/ui-bg_highlight-soft_80_eeeeee_1x100.png) 50% top repeat-x; color: #2e7db2; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #2e7db2; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #ffb73d; background: #ffc73d url(images/ui-bg_glass_40_ffc73d_1x400.png) 50% 50% repeat-x; color: #111111; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #111111; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #111111; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_cccccc_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_cccccc_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_cccccc_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_4b8e0b_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_a83300_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -khtml-border-top-left-radius: 6px; border-top-left-radius: 6px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; -khtml-border-top-right-radius: 6px; border-top-right-radius: 6px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; -khtml-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; -khtml-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #5c5c5c url(images/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
+.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(images/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.18
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/examples/assets/demo-soundGrid.png b/examples/assets/demo-soundGrid.png
new file mode 100644
index 00000000..4353c9cb
Binary files /dev/null and b/examples/assets/demo-soundGrid.png differ
diff --git a/examples/assets/demoStyles.css b/examples/assets/demoStyles.css
new file mode 100644
index 00000000..f84d5463
--- /dev/null
+++ b/examples/assets/demoStyles.css
@@ -0,0 +1,21 @@
+/*Stylesheet*/
+
+BODY, HTML {
+	margin: 0;
+	padding: 0;
+	font-family: Arial, Verdana, sans-serif;
+	font-size: 12px;
+	color: #333;
+}
+
+BODY {}
+
+.content {
+	margin: 10px;
+}
+
+#header {
+	margin: 10px;
+	width: 960px;
+	display:none;
+}
\ No newline at end of file
diff --git a/examples/convolution.html b/examples/convolution.html
index 01a53f48..a01357e1 100644
--- a/examples/convolution.html
+++ b/examples/convolution.html
@@ -1,173 +1,186 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta http-equiv="X-UA-Compatible" content="IE=9" /> <!-- req for IE 9 else audio tag won't work -->
 
-<title>SoundJS: Example - Convolution</title>
-<link href="styles.css" rel="stylesheet" type="text/css" />
-<link href="styles.css" rel="stylesheet" type="text/css" />
-<link href="../styles.css" rel="stylesheet" type="text/css" />
+<title>SoundJS: Convolution Example</title>
 
-
-<script type="text/javascript" src="../src/soundjs/SoundJS.js"></script>
+<script type="text/javascript" src="http://code.createjs.com/soundjs-0.2.0.min.js"></script>
+<script type="text/javascript" src="http://code.createjs.com/preloadjs-0.1.0.min.js"></script>
+<script type="text/javascript" src="http://code.createjs.com/soundjs.flashplugin-0.2.0.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 
 <script type="text/javascript" >
-var filetype, agent;
-
-function onLoadComplete(){
-	
-	agent = navigator.userAgent.toLowerCase();
-	document.body.innerHTML += agent;
-	
-	if(agent.indexOf("chrome") > -1){
-		filetype = ".mp3";
-	} else if(agent.indexOf("opera") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("firefox") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("safari") > -1) {
-		filetype = ".mp3";
-	} else if(agent.indexOf("msie") > -1) {
-		filetype = ".mp3";
+	var preload;
+	function init() {
+		if (window.top == window) { start(); }
 	}
-	
-	SoundJS.onLoadQueueComplete = onSoundsDone;
-	
-	SoundJS.addBatch([
-		{name:"dong", src:"../assets/ToneWobble" + filetype, instances:1},
-		{name:"rat", src:"../assets/R-Damage" + filetype, instances:2},
-		{name:"gull", src:"../assets/S-Damage" + filetype, instances:1},
-		{name:"dong", src:"FAKE-URL", instances:2}]);
-}
-
-
-function onSoundsDone(){
-	document.getElementById("demoStarter").disabled = "";
-}
-	
-function begin(){
-	document.getElementById("demoStarter").disabled = "disabled";
-	
-	document.getElementById("p11").className = "";
-	var i = SoundJS.play("dong", SoundJS.INTERUPT_NONE, 0.4, true);
-	SoundJS.play("gull", SoundJS.INTERUPT_NONE);
-	document.getElementById("p00").className = "active";
-	document.getElementById("p01").className = "active";
-	
-	SoundJS.play("gull", SoundJS.INTERUPT_ANY, null, null, 150);
-	setTimeout(function(){
-		document.getElementById("p00").className = "";
-		document.getElementById("p01").className = "";
-		document.getElementById("p02").className = "active";
-	}, 150);
-	
-	SoundJS.play("rat", SoundJS.INTERUPT_NONE, null, null, 1000);
-	setTimeout(function(){
-		document.getElementById("p02").className = "";
-		document.getElementById("p03").className = "active";
-	}, 1000);
-	
-	setTimeout(function(){
-		document.getElementById("p03").className = "";
-		SoundJS.play("rat", SoundJS.INTERUPT_ANY, null, null);
-		document.getElementById("p04").className = "active";
-	}, 1050);
-	
-	setTimeout(function(){
-		document.getElementById("p04").className = "";
-		SoundJS.play("dong", SoundJS.INTERUPT_NONE, 1, false);
-		document.getElementById("p05").className = "active";
-	}, 2500);
-	
-	setTimeout(function(){
-		document.getElementById("p05").className = "";
-		SoundJS.play("dong", SoundJS.INTERUPT_NONE, 1, false);
-		document.getElementById("p06").className = "active";
-	}, 3500);
-	
-	setTimeout(function(){
-		document.getElementById("p06").className = "";
-		SoundJS.pause("dong");
-		document.getElementById("p07").className = "active";
-	}, 4000);
-	
-	setTimeout(function(){
-		document.getElementById("p07").className = "";
-		SoundJS.play("dong", SoundJS.INTERUPT_NONE, 1, false);
-		document.getElementById("p08").className = "active";
-	}, 4500);
-	
-	setTimeout(function(){
-		document.getElementById("p08").className = "";
-		SoundJS.resume();
-		document.getElementById("p09").className = "active";
-	}, 8000);
-	
-	setTimeout(function(){
-		document.getElementById("p09").className = "";
-		SoundJS.play("dong", SoundJS.INTERUPT_NONE, 1, false);
-		document.getElementById("p10").className = "active";
-	}, 9000);
-	
-	setTimeout(function(){
-		document.getElementById("p10").className = "";
-		SoundJS.stop("dong", i);
-		document.getElementById("p11").className = "active";
-	}, 10000);
-	
-	setTimeout(function(){
-		document.getElementById("demoStarter").disabled = "";
-	}, 11000);
-}
-</script>
 
+	function start() {
+		// Preload a set of sounds.
+		var assetPath = "assets/";
+		var manifest = [
+			{id:"dong", src:assetPath+"ToneWobble.mp3|"+assetPath+"ToneWobble.ogg", data:3},
+			{id:"rat", src:assetPath+"R-Damage.mp3|"+assetPath+"R-Damage.ogg", data:2},
+			{id:"gull", src:assetPath+"S-Damage.mp3|"+assetPath+"S-Damage.ogg", data:1}
+		];
+
+		SoundJS.FlashPlugin.BASE_PATH = "assets/" // Initialize the base path from this document to the Flash Plugin
+
+		preload = new PreloadJS();
+		preload.onComplete = handleLoadComplete;
+		preload.installPlugin(SoundJS);
+		preload.loadManifest(manifest);
+	}
+
+	function stop() {
+		if (preload != null) { preload.close(); }
+		SoundJS.stop();
+	}
+
+	function handleLoadComplete() {
+		// Enable the UI
+		$("#demoStarter").attr("disabled", false);
+	}
+
+	var instance; // Controllable instance
+	function begin(){
+
+		/*
+			In this demo, we play sounds at specific times, and show
+			that the rules follow the instructions laid out.
+
+			Please report issues to create@createjs.com
+		*/
+
+		// Disable and reset the UI
+		$("#demoStarter").attr("disabled", true);
+		$("#p11").removeClass("active"); // Reset UI
+
+		// Play "dong" immediately
+		instance = SoundJS.play("dong", SoundJS.INTERRUPT_NONE, 0, 400, -1);
+		$("#p01").addClass("active");
 
+		// Play "gull" immediately
+		SoundJS.play("gull", SoundJS.INTERRUPT_NONE);
+		$("#p00").addClass("active");
+
+		// Play "gull" after 150 ms. Interrupts first gull sound
+		SoundJS.play("gull", SoundJS.INTERRUPT_ANY, 150);
+		setTimeout(function(){
+			$("#p00").removeClass("active")
+			$("#p01").removeClass("active")
+			$("#p02").addClass("active");
+		}, 150);
+
+		// Play "rat" after 1 second
+		SoundJS.play("rat", SoundJS.INTERRUPT_NONE, 1000);
+		setTimeout(function(){
+			$("#p02").removeClass("active")
+			$("#p03").addClass("active");
+		}, 1000);
+
+		// Play "rat" immediately after previous. Interrupts previous rat sound.
+		setTimeout(function(){
+			$("#p03").removeClass("active")
+			SoundJS.play("rat", SoundJS.INTERRUPT_ANY);
+			$("#p04").addClass("active");
+		}, 1050);
+
+		// Play "dong" after another second. Should start a new channel.
+		setTimeout(function(){
+			$("#p04").removeClass("active")
+			SoundJS.play("dong", SoundJS.INTERRUPT_NONE, 0, 1000);
+			$("#p05").addClass("active");
+		}, 2500);
+
+		// Play "dong" after another second. Should start a new channel.
+		setTimeout(function(){
+			$("#p05").removeClass("active")
+			SoundJS.play("dong", SoundJS.INTERRUPT_NONE, 0, 1000);
+			$("#p06").addClass("active");
+		}, 3500);
+
+		// Wait half a second, then pause all "dong" sounds.
+		setTimeout(function(){
+			$("#p06").removeClass("active")
+			SoundJS.pause("dong");
+			$("#p07").addClass("active");
+		}, 4000);
+
+		// Play another "dong" sound. instances are used up, so it should fail.
+		setTimeout(function(){
+			$("#p07").removeClass("active")
+			SoundJS.play("dong", SoundJS.INTERRUPT_NONE, 0, 1000);
+			$("#p08").addClass("active");
+		}, 4500);
+
+		// Wait 3 seconds, then resume all paused sounds.
+		setTimeout(function(){
+			$("#p08").removeClass("active")
+			SoundJS.resume();
+			$("#p09").addClass("active");
+		}, 8000);
+
+		// Wait another second, and play "dong" sound. Previous instance should be complete, so it will work.
+		setTimeout(function(){
+			$("#p09").removeClass("active")
+			SoundJS.play("dong", SoundJS.INTERRUPT_NONE, 0, 1000);
+			$("#p10").addClass("active");
+		}, 9000);
+
+		// Wait one second, and stop specific "dong" sounds.
+		setTimeout(function(){
+			$("#p10").removeClass("active")
+			instance.stop();
+			$("#p11").addClass("active");
+		}, 10000);
+
+		setTimeout(function(){
+			$("#demoStarter").attr("disabled", false);
+		}, 11000);
+	}
+</script>
+	<link rel="stylesheet" type="text/css" href="assets/demoStyles.css"/>
+	<style>
+		p {
+			padding: 10px;
+		}
+		p.item {
+			border-bottom: 1px solid #EEE;
+			padding: 5px;
+			margin: 0;
+		}
+		p.item SPAN {
+			font-weight: bold;
+			color: #333;
+		}
+		p.active {
+			font-weight:bold;
+			background-color: #ffC;
+			border-width: 1 0 1 0;
+			border: 1px solid #ccc;
+		}
+	</style>
 </head>
-<body align="center" onLoad="onLoadComplete()">
+
+<body align="center" onLoad="init()">
 	<div class="content">
-		<header>
-		<a href="http://github.com/gskinner/SoundJS"><img style="position: fixed; top: 0; left: 0; border: 0; z-index:200;" src="https://assets0.github.com/img/6429057dfef9e98189338d22e7f6646c6694f032?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_orange_ff7600.png&path=" alt="Fork me on GitHub"></a> 
-		<a href="../" title="SoundJS - A Javascript lIbrary for working with html5 audio"><img src="../img/logo.gif" width="240" height="120" style="margin-top:-5px;" alt="A javascript library for working with html5 audio"/></a>
-		<h1>Example: Convolution Test</h1>
-		<img src="../img/flourish.gif"  style="margin-bottom:10px;"/>
-		</header>
-		<!-- DEMO -->
 		<p>Click "Run Demo" to see how SoundJS handles a variety of common sound playing situations.</p>
-        <div class="demoWrap">
-			
-			<input id="demoStarter" type="button" onclick="begin()" value="Run Demo" />
-            <p id="p00">0ms - Quiet note, repeating</p>
-            <p id="p01">0ms - Gull</p>
-            <p id="p02">150ms - Gull interrupting previous gull</p>
-            <p id="p03">1000ms - Rat</p>
-            <p id="p04">1050ms - Rat overlapping prev rat</p>
-            <p id="p05">2500ms - Note single</p>
-            <p id="p06">3500ms - Note single overlapping</p>
-            <p id="p07">4000ms - Pause mid notes</p>
-            <p id="p08">4500ms - Note, (fails: instances used up)</p>
-            <p id="p09">8000ms - Resume</p>
-            <p id="p10">9000ms - Note single</p>
-            <p id="p11">10000ms - Stop repeating note, letting previous note fade out</p>
-
-        </div>
-		<!-- END DEMO -->
-		<p class="callout"><strong>examples:</strong> 
-			<a href="../examples/convolution.html">Convolution</a>, 
-			<a href="../examples/interrupt.html">Interrupt</a>, 
-			<a href="../examples/dynamicInstance.html">Dynamic Instances</a>, 
-			<a href="../examples/masterVolume.html">Master Volume</a>, 
-			<a href="../examples/game/game.html">A Game</a>, 
-			<a href="../examples/TestSuite.html">Test Suite</a> 
-        </p>
-		<footer>
-		<img src="../img/flourish2.gif" style="margin: 5px;"/>
-		<p>
-  		<script>
-			document.write("&copy;" + new Date().getFullYear()); 
-		 </script>
- 			<a href="http://gskinner.com/">gskinner.com, inc.</a> | proudly hosted by <a href="http://mediatemple.com/">Media Temple</a></p>
-		</footer>
+		<input id="demoStarter" type="button" onclick="begin()" value="Run Demo" />
+		<p id="p00" class="item"><span>0ms</span> - Quiet note, repeating</p>
+		<p id="p01" class="item"><span>0ms</span> - Gull</p>
+		<p id="p02" class="item"><span>150ms</span> - Gull interrupting previous gull</p>
+		<p id="p03" class="item"><span>1000ms</span> - Rat</p>
+		<p id="p04" class="item"><span>1050ms</span> - Rat overlapping prev rat</p>
+		<p id="p05" class="item"><span>2500ms</span> - Note single</p>
+		<p id="p06" class="item"><span>3500ms</span> - Note single overlapping</p>
+		<p id="p07" class="item"><span>4000ms</span> - Pause mid notes</p>
+		<p id="p08" class="item"><span>4500ms</span> - Note, (fails: instances used up)</p>
+		<p id="p09" class="item"><span>8000ms</span> - Resume</p>
+		<p id="p10" class="item"><span>9000ms</span> - Note single</p>
+		<p id="p11" class="item"><span>10000ms</span> - Stop repeating note, letting previous note fade out</p>
 	</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/examples/dynamicInstance.html b/examples/dynamicInstance.html
deleted file mode 100644
index dfb561eb..00000000
--- a/examples/dynamicInstance.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=9" /> <!-- req for IE 9 else audio tag won't work -->
-
-<title>SoundJS: Example - Dynamic Instances</title>
-<link href="styles.css" rel="stylesheet" type="text/css" />
-<link href="../styles.css" rel="stylesheet" type="text/css" />
-
-
-<style TYPE="text/css">
-button{
-	font-family:Tahoma, Geneva, sans-serif;
-}
-
-#volume{
-	font-family:Tahoma, Geneva, sans-serif;
-	font-size:12px;
-	line-height:14px;
-	display:inline-block;
-	background:#FA9E0D;
-	width: 300px;
-	height: 140px;
-	padding: 25px;
-	margin-right:10px;
-	vertical-align:top;
-}
-div#menu{
-	display:inline-block;
-	width:200px;
-	}
-.adjust{
-	display:inline-block;
-	width:150px;
-	height:28px;
-	text-align:left;
-}
-.whatwhat{
-	font-family:Tahoma, Geneva, sans-serif;
-	font-size:12px;
-	line-height:14px;
-}
-</style>
-
-<script type="text/javascript" src="../src/soundjs/SoundJS.js"></script>
-
-<script type="text/javascript" >
-var filetype, agent, Pluck, Lightning, Cabin, Tone, Rats, Gulls, Music;
-var counter = 0;
-var interupt = SoundJS.INTERUPT_NONE;
-
-function onLoadComplete(){
-	agent = navigator.userAgent.toLowerCase();
-	//document.body.innerHTML += agent;
-	
-	if(agent.indexOf("chrome") > -1){
-		filetype = ".mp3";
-	} else if(agent.indexOf("opera") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("firefox") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("safari") > -1) {
-		filetype = ".mp3";
-	} else if(agent.indexOf("msie") > -1) {
-		filetype = ".mp3";
-	}
-	
-	SoundJS.onLoadQueueComplete = onSoundsDone;
-
-	Pluck = {name:"Pluck", src:"../assets/GU-StealDaisy" + filetype, instances:1};
-	Lightning = {name:"Lightning", src:"../assets/Thunder1" + filetype, instances:1};
-	Cabin = {name:"Cabin", src:"../assets/U-CabinBoy3" + filetype, instances:1};
-	Tone = {name:"Tone", src:"../assets/ToneWobble" + filetype, instances:1};
-	Rats = {name:"Rats", src:"../assets/R-Damage" + filetype, instances:1};
-	Gulls = {name:"Gulls", src:"../assets/S-Damage" + filetype, instances:1};
-	Music = {name:"Music", src:"../assets/M-GameBG" + filetype, instances:1};
-	
-	SoundJS.addBatch([Pluck, Lightning, Cabin, Tone, Rats, Gulls, Music]);
-}
-
-function onSoundsDone(){
-	SoundJS.onSoundLoadComplete = soundDone;
-	SoundJS.onLoadQueueComplete = function(){};
-	
-	// All possible sounds have been loaded, now remove them. This should do a local cache of the sound meaning isntantant playback w/o using instances if you wish to assign instance counts dynamically, load normally if not dynamically assigning all instance counts.
-	setTimeout(function(){SoundJS.remove(); document.getElementById("menu").style.visibility = "visible";}, 100);
-}
-
-function mouseDown(){
-	SoundJS.pause();
-}
-
-function mouseUp(){
-	SoundJS.resume();
-}
-
-function newSnd(formObj, sound){
-	document.getElementById("menu").style.visibility = "hidden";
-	var o;
-	
-	switch(sound){
-		case "Pluck" : o = Pluck; break;
-		case "Lightning" : o = Lightning; break;
-		case "Cabin" : o = Cabin; break;
-		case "Tone" : o = Tone; break;
-		case "Rats" : o = Rats; break;
-		case "Gulls" : o = Gulls; break;
-		case "Music" : o = Music; break;
-	}
-	
-	SoundJS.add(o.name, o.src, o.instances);
-}
-
-function rmvSnd(formObj, sound){
-	if(SoundJS.remove(sound, 1)){
-		document.getElementById("count").innerHTML = Number(document.getElementById("count").innerHTML) - 1;
-	}
-}
-
-function soundDone(soundObj, name){
-	document.getElementById("count").innerHTML = Number(document.getElementById("count").innerHTML) + 1;
-	document.getElementById("menu").style.visibility = "visible";
-	setTimeout(function(){ SoundJS.play(name, null, 0.6, true); }, 10);
-}
-</script>
-
-</head>
-<body align="center" onLoad="onLoadComplete()">
-	<div class="content">
-		<header>
-		<a href="http://github.com/gskinner/SoundJS"><img style="position: fixed; top: 0; left: 0; border: 0; z-index:200;" src="https://assets0.github.com/img/6429057dfef9e98189338d22e7f6646c6694f032?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_orange_ff7600.png&path=" alt="Fork me on GitHub"></a> 
-		<a href="../" title="SoundJS - A Javascript lIbrary for working with html5 audio"><img src="../img/logo.gif" width="240" height="120" style="margin-top:-5px;" alt="A javascript library for working with html5 audio"/></a>
-		<h1>Example: Dynamic Instances</h1>
-		<img src="../img/flourish.gif"  style="margin-bottom:10px;"/>
-		</header>
-		<!-- DEMO -->
-		<p>This a test board where you can play multiple looping sounds. The code is an example of how a game would divvy up instances using an on-demand approach rather than set numbers. Additionally it can be used to test audio fidelity and the capabilities of target devices.</p>
-        <div class="demoWrap">
-        <div id="volume" onMouseDown="mouseDown()" onMouseUp="mouseUp()">
-            <div>Click and hold to pause, Active instances:</div>
-            <div id="count">0</div>
-        </div>
-        <div id="menu">
-            <div class="adjust">
-                <input type="button" value="++" onClick="newSnd(this, 'Pluck')" />
-                <input type="button" value="--" onClick="rmvSnd(this, 'Pluck')" />
-                <span class="whatwhat">Pluck</span>
-            </div>
-            <div class="adjust">
-                <input type="button" value="++" onClick="newSnd(this, 'Lightning')" />
-                <input type="button" value="--" onClick="rmvSnd(this, 'Lightning')" />
-                <span class="whatwhat">Lightning</span>
-            </div>
-            <div class="adjust">
-                <input type="button" value="++" onClick="newSnd(this, 'Cabin')" />
-                <input type="button" value="--" onClick="rmvSnd(this, 'Cabin')" />
-                <span class="whatwhat">Cabin</span>
-            </div>
-            <div class="adjust">
-                <input type="button" value="++" onClick="newSnd(this, 'Tone')" />
-                <input type="button" value="--" onClick="rmvSnd(this, 'Tone')" />
-                <span class="whatwhat">Tone</span>
-            </div>
-            <div class="adjust">
-                <input type="button" value="++" onClick="newSnd(this, 'Rats')" />
-                <input type="button" value="--" onClick="rmvSnd(this, 'Rats')" />
-                <span class="whatwhat">Rats</span>
-            </div>
-            <div class="adjust">
-                <input type="button" value="++" onClick="newSnd(this, 'Gulls')" />
-                <input type="button" value="--" onClick="rmvSnd(this, 'Gulls')" />
-                <span class="whatwhat">Gulls</span>
-            </div>
-            <div class="adjust">
-                <input type="button" value="++" onClick="newSnd(this, 'Music')" />
-                <input type="button" value="--" onClick="rmvSnd(this, 'Music')" />
-                <span class="whatwhat">Music</span>
-            </div>
-        </div>
-        </div>
-		<!-- END DEMO -->
-		<p class="callout"><strong>examples:</strong> 
-			<a href="../examples/convolution.html">Convolution</a>, 
-			<a href="../examples/interrupt.html">Interrupt</a>, 
-			<a href="../examples/dynamicInstance.html">Dynamic Instances</a>, 
-			<a href="../examples/masterVolume.html">Master Volume</a>, 
-			<a href="../examples/game/game.html">A Game</a>, 
-			<a href="../examples/TestSuite.html">Test Suite</a> 
-        </p>
-		<footer>
-		<img src="../img/flourish2.gif" style="margin: 5px;"/>
-		<p>
-  		<script>
-			document.write("&copy;" + new Date().getFullYear()); 
-		 </script>
- 			<a href="http://gskinner.com/">gskinner.com, inc.</a> | proudly hosted by <a href="http://mediatemple.com/">Media Temple</a></p>
-		</footer>
-	</div>
-</body>
-</html>
diff --git a/examples/game/game.html b/examples/game/game.html
deleted file mode 100644
index cefb5ce1..00000000
--- a/examples/game/game.html
+++ /dev/null
@@ -1,484 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>EaselJS Example: Building a game</title>
-
-<link href="../styles.css" rel="stylesheet" type="text/css" />
-<link href="../../styles.css" rel="stylesheet" type="text/css" />
-
-<!-- Import EaselJS Framework -->
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/utils/UID.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/SpriteSheet.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/Shadow.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/geom/Matrix2D.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/events/MouseEvent.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/DisplayObject.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/Container.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/Stage.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/Graphics.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/Shape.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/display/Text.js"></script>
-<script type="text/javascript" src="http://www.easeljs.com/src/easeljs/utils/Ticker.js"></script>
-<!-- End EaselJS Imports -->
-
-<!-- Import SoundJS Framework -->
-<script type="text/javascript" src="../../src/soundjs/SoundJS.js"></script>
-<!-- End SoundJS Imports -->
-
-<!-- Game script below -->
-<script type="text/javascript" src="SpaceRock.js"></script>
-<script type="text/javascript" src="Ship.js"></script>
-<script>
-
-var DIFFICULTY = 2;			//how fast the game gets mor difficult
-var ROCK_TIME = 110;		//aprox tick count untill a new asteroid gets introduced
-var SUB_ROCK_COUNT = 4;		//how many small rocks to make on rock death
-var BULLET_TIME = 5;		//ticks between bullets
-var BULLET_ENTROPY = 100;	//how much energy a bullet has before it runs out.
-
-var TURN_FACTOR = 7;		//how far the ship turns per frame
-var BULLET_SPEED = 17;		//how fast the bullets move
-
-var KEYCODE_ENTER = 13;		//usefull keycode
-var KEYCODE_SPACE = 32;		//usefull keycode
-var KEYCODE_UP = 38;		//usefull keycode
-var KEYCODE_LEFT = 37;		//usefull keycode
-var KEYCODE_RIGHT = 39;		//usefull keycode
-var KEYCODE_W = 87;			//usefull keycode
-var KEYCODE_A = 65;			//usefull keycode
-var KEYCODE_D = 68;			//usefull keycode
-
-var shootHeld;			//is the user holding a shoot command
-var lfHeld;				//is the user holding a turn left command
-var rtHeld;				//is the user holding a turn right command
-var fwdHeld;			//is the user holding a forward command
-
-var timeToRock;			//difficulty adjusted version of ROCK_TIME
-var nextRock;			//ticks left untill a new space rock arrives
-var nextBullet;			//ticks left untill the next shot is fired
-
-var rockBelt;			//space rock array
-var bulletStream;		//bullet array
-
-var canvas;			//Main canvas
-var stage;			//Main display stage
-
-var ship;			//the actual ship
-var alive;			//wheter the player is alive
-
-var messageField;		//Message display field
-var scoreField;			//score Field
-
-//register key functions
-document.onkeydown = handleKeyDown;
-document.onkeyup = handleKeyUp;
-
-function init() {
-	// determine browser
-	var filetype;
-	agent = navigator.userAgent.toLowerCase();
-	
-	// adjust for browser
-	if(agent.indexOf("chrome") > -1){
-		filetype = ".mp3";
-	} else if(agent.indexOf("opera") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("firefox") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("safari") > -1) {
-		filetype = ".mp3";
-	} else if(agent.indexOf("msie") > -1) {
-		filetype = ".mp3";
-	}
-	
-	// set references
-	SoundJS.onLoadQueueComplete = doneLoading;
-document.getElementById("canvasWrapper").onselectstart=function(){return false};
-document.getElementById("canvasWrapper").onmousedown=function(){return false};
-	
-	// begin loading content (only sounds to load)
-	SoundJS.addBatch([
-		{name:"begin", src:"../../assets/Game-Spawn" + filetype, instances:1},
-		{name:"break", src:"../../assets/Game-Break" + filetype, instances:6},
-		{name:"death", src:"../../assets/Game-Death" + filetype, instances:1},
-		{name:"laser", src:"../../assets/Game-Shot" + filetype, instances:6},
-		{name:"music", src:"../../assets/18-machinae_supremacy-lord_krutors_dominion" + filetype, instances:1}]);
-}
-	
-function doneLoading() {
-	//associate the canvas with the stage
-	canvas = document.getElementById("testCanvas");
-	stage = new Stage(canvas);
-	
-	scoreField = new Text("0", "bold 12px Arial", "#FFFFFF");
-	scoreField.textAlign = "right";
-	scoreField.x = canvas.width - 10;
-	scoreField.y = 22;
-	
-	messageField = new Text("Welcome:  Click to play", "bold 24px Arial", "#FFFFFF");
-	messageField.textAlign = "center";
-	messageField.x = canvas.width / 2;
-	messageField.y = canvas.height / 2;
-	
-	// start the music
-	SoundJS.play("music", null, 0.2, true);
-	
-	watchRestart();
-}
-
-function watchRestart() {
-	//watch for clicks
-	stage.addChild(messageField);
-	stage.update(); 	//update the stage to show text
-	canvas.onclick = handleClick;
-}
-
-function handleClick() {
-	//prevent extra clicks and hide text
-	canvas.onclick = null;
-	stage.removeChild(messageField);
-	
-	// indicate the player is now on screen
-	SoundJS.play("begin");
-	
-	restart();
-}
-
-//reset all game logic
-function restart() {
-	//hide anything on stage and show the score
-	stage.removeAllChildren();
-	scoreField.text = (0).toString();
-	stage.addChild(scoreField);
-	
-	//new arrays to dump old data
-	rockBelt = new Array();
-	bulletStream = new Array();
-	
-	//create the player
-	alive = true;
-	ship = new Ship();
-	ship.x = canvas.width / 2;
-	ship.y = canvas.height / 2;
-	
-	//log time untill values
-	timeToRock = ROCK_TIME;
-	nextRock = 0;
-	nextBullet = 0;
-	
-	//reset key presses
-	shootHeld =	false;
-	lfHeld =	false;
-	rtHeld =	false;
-	fwdHeld =	false;
-	dnHeld =	false;
-	
-	//ensure stage is blank and add the ship
-	stage.clear();
-	stage.addChild(ship);
-	
-	//start game timer
-	Ticker.addListener(window);
-}
-
-function tick() {
-	//handle firing
-	if(nextBullet <= 0) {
-		if(alive && shootHeld){
-			nextBullet = BULLET_TIME;
-			fireBullet();
-		}
-	} else {
-		nextBullet--;
-	}
-	
-	//handle turning
-	if(alive && lfHeld){
-		ship.rotation -= TURN_FACTOR;
-	} else if(alive && rtHeld) {
-		ship.rotation += TURN_FACTOR;
-	}
-	
-	//handle thrust
-	if(alive && fwdHeld){
-		ship.accelerate();
-	}
-	
-	//handle new spaceRocks
-	if(nextRock <= 0) {
-		if(alive){
-			timeToRock -= DIFFICULTY;	//reduce spaceRock spacing slowly to increase difficulty with time
-			var index = getSpaceRock(SpaceRock.LRG_ROCK);
-			rockBelt[index].floatOnScreen(canvas.width, canvas.height);
-			nextRock = timeToRock + timeToRock*Math.random();
-		}
-	} else {
-		nextRock--;
-	}
-	
-	//handle ship looping
-	if(alive && outOfBounds(ship, ship.bounds)) {
-		placeInBounds(ship, ship.bounds);
-	}
-	
-	//handle bullet movement and looping
-	for(bullet in bulletStream) {
-		var o = bulletStream[bullet];
-		if(!o || !o.active) { continue; }
-		if(outOfBounds(o, ship.bounds)) {
-			placeInBounds(o, ship.bounds);
-		}
-		o.x += Math.sin(o.rotation*(Math.PI/-180))*BULLET_SPEED;
-		o.y += Math.cos(o.rotation*(Math.PI/-180))*BULLET_SPEED;
-		
-		if(--o.entropy <= 0) {
-			stage.removeChild(o);
-			o.active = false;
-		}
-	}
-	
-	//handle spaceRocks (nested in one loop to prevent excess loops)
-	for(spaceRock in rockBelt) {
-		var o = rockBelt[spaceRock];
-		if(!o || !o.active) { continue; }
-		
-		//handle spaceRock movement and looping
-		if(outOfBounds(o, o.bounds)) {
-			placeInBounds(o, o.bounds);
-		}
-		o.tick();
-		
-		
-		//handle spaceRock ship collisions
-		if(alive && o.hitRadius(ship.x, ship.y, ship.hit)) {
-			alive = false;
-			
-			stage.removeChild(ship);
-			messageField.text = "You're dead:  Click to play again";
-			stage.addChild(messageField);
-			watchRestart();
-			
-			//play death sound
-			SoundJS.play("death", SoundJS.INTERUPT_ANY);
-			
-			continue;
-		}
-		
-		//handle spaceRock bullet collisions
-		for(bullet in bulletStream) {
-			var p = bulletStream[bullet];
-			if(!p || !p.active) { continue; }
-			
-			if(o.hitPoint(p.x, p.y)) {
-				var newSize;
-				switch(o.size) {
-					case SpaceRock.LRG_ROCK: newSize = SpaceRock.MED_ROCK;
-						break;
-					case SpaceRock.MED_ROCK: newSize = SpaceRock.SML_ROCK;
-						break;
-					case SpaceRock.SML_ROCK: newSize = 0;
-						break;
-				}
-				
-				//score
-				if(alive) {
-					addScore(o.score);
-				}
-				
-				//create more
-				if(newSize > 0) {
-					var i;
-					var index;
-					var offSet;
-					
-					for(i=0; i < SUB_ROCK_COUNT; i++){
-						index = getSpaceRock(newSize);
-						offSet = (Math.random() * o.size*2) - o.size;
-						rockBelt[index].x = o.x + offSet;
-						rockBelt[index].y = o.y + offSet;
-					}
-				}
-				
-				//remove
-				stage.removeChild(o);
-				rockBelt[spaceRock].active = false;
-				
-				stage.removeChild(p);
-				bulletStream[bullet].active = false;
-				
-				// play sound
-				SoundJS.play("break", SoundJS.INTERUPT_LATE, 0.8);
-			}
-		}
-	}
-	
-	//call sub ticks
-	ship.tick();
-	stage.update();
-}
-
-function outOfBounds(o, bounds) {
-	//is it visibly off screen
-	return o.x < bounds*-2 || o.y < bounds*-2 || o.x > canvas.width+bounds*2 || o.y > canvas.height+bounds*2;
-}
-
-function placeInBounds(o, bounds) {
-	//if its visual bounds are entirely off screen place it off screen on the other side
-	if(o.x > canvas.width+bounds*2) {
-		o.x = bounds*-2;
-	} else if(o.x < bounds*-2) {
-		o.x = canvas.width+bounds*2;
-	}
-	
-	//if its visual bounds are entirely off screen place it off screen on the other side
-	if(o.y > canvas.height+bounds*2) {
-		o.y = bounds*-2;
-	} else if(o.y < bounds*-2) {
-		o.y = canvas.height+bounds*2;
-	}
-}
-
-function fireBullet() {
-	//create the bullet
-	var o = bulletStream[getBullet()];
-	o.x = ship.x;
-	o.y = ship.y;
-	o.rotation = ship.rotation;
-	o.entropy = BULLET_ENTROPY;
-	o.active = true;
-	
-	//draw the bullet
-	o.graphics.beginStroke("#FFFFFF").moveTo(-1, 0).lineTo(1, 0);
-	
-	// play the shot sound
-	SoundJS.play("laser", SoundJS.INTERUPT_LATE);
-}
-	
-function getSpaceRock(size) {
-	var i = 0;
-	var len = rockBelt.length;
-	
-	//pooling approach
-	while(i <= len){
-		if(!rockBelt[i]) {
-			rockBelt[i] = new SpaceRock(size);
-			break;
-		} else if(!rockBelt[i].active) {
-			rockBelt[i].activate(size);
-			break;
-		} else {
-			i++;
-		}
-	}
-	
-	if(len == 0) {
-		rockBelt[0] = new SpaceRock(size);
-	}
-	
-	stage.addChild(rockBelt[i]);
-	return i;
-}
-
-function getBullet() {
-	var i = 0;
-	var len = bulletStream.length;
-	
-	//pooling approach
-	while(i <= len){
-		if(!bulletStream[i]) {
-			bulletStream[i] = new Shape();
-			break;
-		} else if(!bulletStream[i].active) {
-			bulletStream[i].active = true;
-			break;
-		} else {
-			i++;
-		}
-	}
-	
-	if(len == 0) {
-		bulletStream[0] = new Shape();
-	}
-	
-	stage.addChild(bulletStream[i]);
-	return i;
-}
-
-//allow for WASD and arrow control scheme
-function handleKeyDown(e) {
-	//cross browser issues exist
-	if(!e){ var e = window.event; }
-	switch(e.keyCode) {
-		case KEYCODE_SPACE:	shootHeld = true; return false;
-		case KEYCODE_A:;
-		case KEYCODE_LEFT:	lfHeld = true; return false;
-		case KEYCODE_D:;
-		case KEYCODE_RIGHT: rtHeld = true; return false;
-		case KEYCODE_W:;
-		case KEYCODE_UP:	fwdHeld = true; return false;
-		case KEYCODE_ENTER:	 if(canvas.onclick == handleClick){ handleClick(); }return false;
-	}
-}
-
-function handleKeyUp(e) {
-	//cross browser issues exist
-	if(!e){ var e = window.event; }
-	switch(e.keyCode) {
-		case KEYCODE_SPACE:	shootHeld = false; return false;
-		case KEYCODE_A:;
-		case KEYCODE_LEFT:	lfHeld = false; return false;
-		case KEYCODE_D:;
-		case KEYCODE_RIGHT: rtHeld = false; return false;
-		case KEYCODE_W:;
-		case KEYCODE_UP:	fwdHeld = false; return false;
-	}
-}
-
-function addScore(value) {
-	//trust the field will have a number and add the score
-	scoreField.text = (Number(scoreField.text) + Number(value)).toString();
-}
-
-</script>
-
-</head>
-	
-<body onload="init();">
-<div class="content">
-		<header>
-		<a href="http://github.com/gskinner/SoundJS"><img style="position: fixed; top: 0; left: 0; border: 0; z-index:200;" src="https://assets0.github.com/img/6429057dfef9e98189338d22e7f6646c6694f032?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_orange_ff7600.png&path=" alt="Fork me on GitHub"></a> 
-		<a href="/" title="SoundJS - A Javascript lIbrary for working with html5 audio"><img src="../../img/logo.gif" width="240" height="120" style="margin-top:-5px;" alt="A javascript library for working with html5 audio"/></a>
-		<h1>Example: A Game</h1>
-		<img src="../../img/flourish.gif"  style="margin-bottom:10px;"/>
-		</header>
-		<!-- DEMO -->
-        <div class="demoWrap">
-        
-        
-        	<p>Example use of SoundJS for a game, game example taken from <a href="http://www.easeljs.com">EaselJS</a> a canvas management tool. Music Copyright &copy; 2010 <a href="http://machinaesupremacy.com">Machinae Supremacy</a> - Lord Krutors Dominion. Used with permission for non commercial use.</p>
-	<div id="canvasWrapper" class="canvasHolder" style="background-color:#000000; width:578px; height:400px;">
-		<canvas id="testCanvas" width="578px" height="400px"></canvas>
-	</div>
-    </div>
-    
-		<!-- END DEMO -->
-		<p class="callout"><strong>examples:</strong> 
-			<a href="../convolution.html">Convolution</a>, 
-			<a href="../interrupt.html">Interrupt</a>, 
-			<a href="../dynamicInstance.html">Dynamic Instances</a>, 
-			<a href="../masterVolume.html">Master Volume</a>, 
-			<a href="../game/game.html">A Game</a>, 
-			<a href="../TestSuite.html">Test Suite</a>  
-        </p>
-		<footer>
-		<img src="../../img/flourish2.gif" style="margin: 5px;"/>
-		<p>
-  		<script>
-			document.write("&copy;" + new Date().getFullYear()); 
-		 </script>
- 			<a href="http://gskinner.com/">gskinner.com, inc.</a> | proudly hosted by <a href="http://mediatemple.com/">Media Temple</a></p>
-		</footer>
-	</div>
-</body>
-</html>
diff --git a/examples/interrupt.html b/examples/interrupt.html
deleted file mode 100644
index 01e65ad7..00000000
--- a/examples/interrupt.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=9" /> <!-- req for IE 9 else audio tag won't work -->
-
-<title>SoundJS: Example - Audio Spike</title>
-<link href="styles.css" rel="stylesheet" type="text/css" />
-<link href="../styles.css" rel="stylesheet" type="text/css" />
-
-
-<style TYPE="text/css">
-#ticker {
-	width: auto;
-	height: auto;
-	padding: 40px 10px 10px 10px;
-	position:relative;
-}
-#ticker {
-	background:url(../img/callout_bg.gif);
-	border: 1px solid #000;
-}
-#ticker.test0 {
-	border:1px solid #000;
-}
-#ticker.test1 {
-	border:1px dashed #fff;
-}
-.bar {
-	height:40px;
-	width: auto;
-	margin:0 0 10px 0; padding:0;
-	font-size:16px;
-	line-height:40px;
-	font-family:Tahoma, Geneva, sans-serif;
-	color:#000;
-	
-	-moz-border-radius:10px;
-	-webkit-border-radius:10px;
-	border-radius:10px;
-}
-#bar1{
-	background: #FA9E0D;
-	}
-#bar2 {
-	background: #00abff;
-}
-#texty {
-	height: 14px;
-	overflow: hidden;
-	font-size:12px;
-	line-height:14px;
-	font-family:Tahoma, Geneva, sans-serif;
-	color:#000;
-	margin:0; padding:0;
-}
-.code {
-	display:block;
-	margin:10px 20px;
-	font-family:'Courier New', Courier, monospace;
-	color:#666;	
-}
-</style>
-
-<script type="text/javascript" src="../src/soundjs/SoundJS.js"></script>
-
-<script type="text/javascript" >
-var filetype, agent;
-var counter = 0;
-var interrupt = SoundJS.INTERRUPT_NONE;
-
-function onLoadComplete(){
-	agent = navigator.userAgent.toLowerCase();
-	//document.body.innerHTML += agent;
-	
-	if(agent.indexOf("chrome") > -1){
-		filetype = ".mp3";
-	} else if(agent.indexOf("opera") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("firefox") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("safari") > -1) {
-		filetype = ".mp3";
-	} else if(agent.indexOf("msie") > -1) {
-		filetype = ".mp3";
-	}
-	
-	SoundJS.onLoadQueueComplete = onSoundsDone;
-	
-	SoundJS.add("music", "../assets/M-GameBG" + filetype, 2);
-}
-
-function adjust(obj){
-	interrupt = obj[obj.selectedIndex].value;
-}
-
-function onSoundsDone(){
-	setInterval(interrupting, 2500);
-	setInterval(ticking, 50);
-}
-
-function interrupting(){
-	// toggle box to show ticks
-	counter++;
-	document.getElementById("ticker").setAttribute("class", "test" + (counter % 2));
-	
-	// show which instance played
-	document.getElementById("texty").innerHTML = "Return value from .play(): " + SoundJS.play("music", interrupt);
-}
-
-function ticking(){
-	var a1 = SoundJS.getInstance("music", 0);
-	var a2 = SoundJS.getInstance("music", 1);
-	
-	document.getElementById("bar1").style.width = (450 * a1.currentTime / a1.duration)+"px";
-	document.getElementById("bar2").style.width = (450 * a2.currentTime / a2.duration)+"px";
-}
-</script>
-
-
-</head>
-<body align="center" onLoad="onLoadComplete()">
-	<div class="content">
-		<header>
-		<a href="http://github.com/gskinner/SoundJS"><img style="position: fixed; top: 0; left: 0; border: 0; z-index:200;" src="https://assets0.github.com/img/6429057dfef9e98189338d22e7f6646c6694f032?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_orange_ff7600.png&path=" alt="Fork me on GitHub"></a> 
-		<a href="../" title="SoundJS - A Javascript lIbrary for working with html5 audio"><img src="../img/logo.gif" width="240" height="120" style="margin-top:-5px;" alt="A javascript library for working with html5 audio"/></a>
-		<h1>Example: Interruption</h1>
-		<img src="../img/flourish.gif"  style="margin-bottom:10px;"/>
-		</header>
-		<!-- DEMO -->
-		<p>This a test designed to illustrate exactly how interrupt modes function. </p>
-		<p>Browsers limit the total number of instances available for sound. If all the available instances are in use, SoundJS provides an interrupt mechanism to determine which playing sound to interrupt. Every Time the border changes, the following code is run using the interrupt value from the dropdown: <span class="code">SoundJS.play("music", interrupt);</span> Specific details on the interrupt modes and the play() function can be found in the documentation. The return value from each play() command will indicate the instance used.</p>
-        <div id="ticker">
-        <form style="position:absolute; top:10px; left:10px;">
-            <select id="myList" onchange='adjust(this)'>
-                <option value="4">INTERRUPT_NONE, don't interrupt</option>
-                <option value="3">INTERRUPT_LATE, interrupt latest</option>
-                <option value="2">INTERRUPT_EARLY, interrupt earliest</option>  
-                <option value="1">INTERRUPT_ANY, interrupt first instance</option>
-            </select>
-        </form>
-            <div id="bar1" class="bar">0</div>
-            <div id="bar2" class="bar">1</div>
-            <p id="texty"></p>
-        </div>
-        <!-- END DEMO -->
-		<p class="callout"><strong>examples:</strong> 
-			<a href="../examples/convolution.html">Convolution</a>, 
-			<a href="../examples/interrupt.html">Interrupt</a>, 
-			<a href="../examples/dynamicInstance.html">Dynamic Instances</a>, 
-			<a href="../examples/masterVolume.html">Master Volume</a>, 
-			<a href="../examples/game/game.html">A Game</a>, 
-			<a href="../examples/TestSuite.html">Test Suite</a>  
-        </p>
-        
-		<footer>
-		<img src="../img/flourish2.gif" style="margin: 5px;"/>
-		<p>
-  		<script>
-			document.write("&copy;" + new Date().getFullYear()); 
-		 </script>
- 			<a href="http://gskinner.com/">gskinner.com, inc.</a> | proudly hosted by <a href="http://mediatemple.com/">Media Temple</a></p>
-		</footer>
-	</div>
-</body>
-</html>
diff --git a/examples/masterVolume.html b/examples/masterVolume.html
deleted file mode 100644
index 913da8bf..00000000
--- a/examples/masterVolume.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=9" /> <!-- req for IE 9 else audio tag won't work -->
-
-<title>SoundJS: Example - Master Volume</title>
-<link href="styles.css" rel="stylesheet" type="text/css" />
-<link href="../styles.css" rel="stylesheet" type="text/css" />
-
-<script type="text/javascript" src="../src/soundjs/SoundJS.js"></script>
-
-<script type="text/javascript" >
-var filetype, agent, muted, oldVolume, waveform;
-
-function onLoadComplete(){
-	
-	agent = navigator.userAgent.toLowerCase();
-	//document.body.innerHTML += agent;
-	
-	if(agent.indexOf("chrome") > -1){
-		filetype = ".mp3";
-	} else if(agent.indexOf("opera") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("firefox") > -1) {
-		filetype = ".ogg";
-	} else if(agent.indexOf("safari") > -1) {
-		filetype = ".mp3";
-	} else if(agent.indexOf("msie") > -1) {
-		filetype = ".mp3";
-	}
-	
-	SoundJS.onLoadQueueComplete = onSoundsDone;
-	
-	SoundJS.addBatch([
-		{name:"humm", src:"../assets/Humm" + filetype, instances:1},
-		{name:"rat", src:"../assets/R-Damage" + filetype, instances:3}]);
-}
-
-
-function onSoundsDone(){
-	waveform = 0;
-	muted = false;
-	SoundJS.play("humm", null, null, true);
-	setInterval(onTick, 100);
-	setInterval(function(){ SoundJS.play("rat", null, 1.0); }, 1500);
-	setTimeout(function(){ setInterval(function(){ SoundJS.play("rat", null, 0.4); }, 1500); }, 750);
-}
-
-function onTick(){
-	waveform += 0.7;
-	SoundJS.setVolume(Math.sin(waveform)*0.5+0.5, "humm", 0);
-}
-
-function handleSlider(value){
-	SoundJS.setMasterVolume(value);
-	muted = false;
-	document.getElementById("muter").value = "Mute";
-}
-
-function handleMute(){
-	if(muted) {
-		SoundJS.setMasterVolume(oldVolume);
-		document.getElementById("muter").value = "Mute";
-		document.getElementById("volume").value = oldVolume;
-	} else {
-		SoundJS.setMasterVolume(0);
-		document.getElementById("muter").value = "UnMute";
-		oldVolume = document.getElementById("volume").value;
-	}
-	
-	muted = !muted;
-}
-</script>
-
-
-</head>
-<body align="center" onLoad="onLoadComplete()">
-	<div class="content">
-		<header>
-		<a href="http://github.com/gskinner/SoundJS"><img style="position: fixed; top: 0; left: 0; border: 0; z-index:200;" src="https://assets0.github.com/img/6429057dfef9e98189338d22e7f6646c6694f032?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_orange_ff7600.png&path=" alt="Fork me on GitHub"></a> 
-		<a href="../" title="SoundJS - A Javascript lIbrary for working with html5 audio"><img src="../img/logo.gif" width="240" height="120" style="margin-top:-5px;" alt="A javascript library for working with html5 audio"/></a>
-		<h1>Example: Master Volume</h1>
-		<img src="../img/flourish.gif"  style="margin-bottom:10px;"/>
-		</header>
-		<!-- DEMO -->
-		<p>This is a demonstration of how master volume works, including independantly set volumes. There are two sounds playing: a rat squeak, and a single even tone. The volume of the tone is modified by a sine wave every tick and the rat alternates between high and low volume.</p>
-        <div class="demoWrap">
-            Volume: <input id="volume" type="range" min="0" max="1" step="0.02" value="1" onChange="handleSlider(this.value)" style="position:relative; top:5px;"/>
-<input id="muter" type="button" value="Mute" onClick="handleMute()" style="width:150px; margin-left:20px;"/>
-        </div>
-		<!-- END DEMO -->
-		<p class="callout"><strong>examples:</strong> 
-			<a href="../examples/convolution.html">Convolution</a>, 
-			<a href="../examples/interrupt.html">Interrupt</a>, 
-			<a href="../examples/dynamicInstance.html">Dynamic Instances</a>, 
-			<a href="../examples/masterVolume.html">Master Volume</a>, 
-			<a href="../examples/game/game.html">A Game</a>, 
-			<a href="../examples/TestSuite.html">Test Suite</a>  
-        </p>
-		<footer>
-		<img src="../img/flourish2.gif" style="margin: 5px;"/>
-		<p>
-  		<script>
-			document.write("&copy;" + new Date().getFullYear()); 
-		 </script>
- 			<a href="http://gskinner.com/">gskinner.com, inc.</a> | proudly hosted by <a href="http://mediatemple.com/">Media Temple</a></p>
-		</footer>
-	</div>
-</body>
-</html>
diff --git a/examples/styles.css b/examples/styles.css
deleted file mode 100644
index c71025e5..00000000
--- a/examples/styles.css
+++ /dev/null
@@ -1,15 +0,0 @@
-p.active{
-	font-weight:bold;
-}
-.demoWrap{
-	background:url(../img/callout_bg.gif);
-	border:1px solid #fff;
-	border:1px solid #cccccc;
-	width: auto;
-	height: auto;
-	padding: 10px;
-	position:relative;
-	font-family:Tahoma, Geneva, sans-serif;
-	font-size:12px; line-height:14px;
-	z-index:100;
-}
diff --git a/img/bg.gif b/img/bg.gif
deleted file mode 100644
index 0aa8abda..00000000
Binary files a/img/bg.gif and /dev/null differ
diff --git a/img/callout_bg.gif b/img/callout_bg.gif
deleted file mode 100644
index 0c97856c..00000000
Binary files a/img/callout_bg.gif and /dev/null differ
diff --git a/img/flourish.gif b/img/flourish.gif
deleted file mode 100644
index 0629624f..00000000
Binary files a/img/flourish.gif and /dev/null differ
diff --git a/img/flourish2.gif b/img/flourish2.gif
deleted file mode 100644
index e11ba74d..00000000
Binary files a/img/flourish2.gif and /dev/null differ
diff --git a/img/logo.gif b/img/logo.gif
deleted file mode 100644
index fe8fbccc..00000000
Binary files a/img/logo.gif and /dev/null differ
diff --git a/img/logo.png b/img/logo.png
deleted file mode 100644
index 61a8c5ff..00000000
Binary files a/img/logo.png and /dev/null differ
diff --git a/index.html b/index.html
deleted file mode 100644
index d5e3607a..00000000
--- a/index.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>SoundJS: A Javascript Library for Working with HTML5 Audio.</title>
-<link href="styles.css" rel="stylesheet" type="text/css" />
-</head>
-<body align="center">
-	<div class="content">
-		<header>
-		<p style="text-align:center;"><a href="http://github.com/gskinner/SoundJS"><img style="position: fixed; top: 0; left: 0; border: 0; z-index:200;" src="https://assets0.github.com/img/6429057dfef9e98189338d22e7f6646c6694f032?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_left_orange_ff7600.png&path=" alt="Fork me on GitHub"></a> 
-		  <img src="img/logo.gif" width="240" height="120" style="margin-top:-5px; margin-bottom: -40px;" alt="A javascript library for working with html5 audio"/></p>
-		<p>&nbsp; </p>
-		<h1>
-      a javascript library for working with<br/>
-			html5 audio
-		</h1>
-		<img src="img/flourish.gif"  style="margin-bottom:10px;"/>
-		</header>
-		<article>
-		<p class="callout news">
-			<strong class="newstitle">SoundJS v0.1</strong><br/>
-			First official alpha release of SoundJS. <strong><a href="http://github.com/gskinner/SoundJS">Download now.</a></strong>
-		</p>
-		<p class="callout"><strong>links:</strong> 
-			<a href="http://github.com/gskinner/SoundJS/downloads/">download source</a>, 
-			<a href="docs/">API documentation</a>, 
-			<a href="http://github.com/gskinner/SoundJS/">GitHub repository</a>
-		</p>
-		<p>Audio in HTML is promising, but can be quite difficult to work with. Each browser has a similar but different approach, which requires a lot of guess and test, and edge cases, which can add up to a lot of time spent. The SoundJS JavaScript library provides a simple API, and some powerful features to make working with audio a breeze.</p>
-<p class="callout"><strong>examples:</strong> 
-		<a href="examples/convolution.html">Convolution</a>, 
-		<a href="examples/interrupt.html">Interrupt</a>, 
-		<a href="examples/dynamicInstance.html">Dynamic Instances</a>, 
-		<a href="examples/masterVolume.html">Master Volume</a>, 
-		<a href="examples/game/game.html">A Game</a>, 
-		<a href="../examples/TestSuite.html">Test Suite</a>  
-      </p>
-		<p>For an example of SoundJS being used in a large-scale project, see <a href="http://pirateslovedaisies.com/">Pirates Love Daisies</a>, which uses techniques and approaches that were eventually rolled into SoundJS.</p>
-
-		<p>SoundJS was built by <a href="http://gskinner.com/">gskinner.com</a>, and is released under the MIT license, which means you can use it freely for almost any purpose (including commercial projects). We appreciate credit where appropriate, but it is not a requirement.</p>
-		<p>SoundJS is currently in early alpha. We will be making significant improvements to the library, samples, and documentation over the coming weeks. Please be aware that this may necessitate changes to the existing API.</p>
-		
-		
-		<p class="callout">
-			<strong>companions: </strong>
-			SoundJS works great with <a href="http://easeljs.com/">EaselJS</a>
-		</p>
-		<p>In our preliminary testing, SoundJS appears to be fully compatible with Android, and all major desktop browsers that support the canvas element.</p>
-		<img src="img/flourish2.gif" style="margin: 5px;"/>
-		<p> The key features are: </p>
-		<h3>Channel Management</h3>
-		<p>Deals with the maximums in different browsers, as well as helping determine the best channel to interrupt when dealing with multiple sounds of the same kind.</p>
-        <h3>Batch Loading</h3>
-		<p>Manages the preloading of a sound queue.</p>
-		<h3>Master Volume Control</h3>
-		<p>Control individual sound volume, or the volume of all sound channels at once, including muting.</p>
-		
-		<p>Have a look at the full <a href="docs/">API documentation</a> for more info.</p>
-		<img src="img/flourish2.gif" style="margin: 5px;"/>
-		<h3>Planned updates</h3>
-		<p>SoundJS will be updated as time permits. We're not making any promises, but here are some of the things we're thinking of doing:</p>
-		<ul>
-			<li>Smooth progress</li>
-			<li>Optimization</li>
-		</ul>
-		</article>
-		<footer>
-		<img src="img/flourish2.gif" style="margin: 5px;"/>
-		<p>
-  <script>
-                document.write("&copy;" + new Date().getFullYear()); 
-             </script>
- 			<a href="http://gskinner.com/">gskinner.com, inc.</a> | proudly hosted by <a href="http://mediatemple.com/">Media Temple</a></p>
-		</footer>
-	</div>
-</body>
-</html>
diff --git a/lib/sound.js b/lib/sound.js
deleted file mode 100644
index 55d1ca11..00000000
--- a/lib/sound.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
-* EaselJS
-* Visit http://easeljs.com/ for documentation, updates and examples.
-*
-* Copyright (c) 2011 Grant Skinner
-* 
-* 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.
-**/
-(function(m){function a(){throw"SoundJS cannot be instantiated";}function n(a,d){this.instances=[];this.name=a;this.src=d;this.loaded=this.canPlay=false;this.length=0}a.AUDIO_TIMEOUT=8E3;a.INTERRUPT_ANY=1;a.INTERRUPT_EARLY=2;a.INTERRUPT_LATE=3;a.INTERRUPT_NONE=4;a.onProgress=null;a.onSoundTimeout=null;a.onSoundLoadError=null;a.onSoundLoadComplete=null;a.onLoadQueueComplete=null;a.onSoundComplete=null;a.soundHash=[];a.loadQueue=[];a.itemsToLoad=0;a.instanceCount=0;a.INST_MAX=35;a.FT=0.0010;a.AUDIO_ERROR=
-"error";a.AUDIO_PROGRESS="progress";a.AUDIO_COMPLETE="canplaythrough";a.AUDIO_ENDED="ended";a.AUDIO_STALLED="stalled";a._master=1;a._currentLoad=0;a.add=function(b,d,c){a.loadQueue.push({name:b,src:d,instances:c});a.loadQueue.length==1?(a.itemsToLoad=1,a.loadNext()):a.itemsToLoad++};a.addBatch=function(b){for(var d=b.length;b.length;)a.loadQueue.push(b.shift());a.loadQueue.length==d?(a.loadNext(),a.itemsToLoad=d):a.itemsToLoad++};a.play=function(b,d,c,e,f){if(b==null||a.soundHash[b]==null||a.soundHash[b].length==
-0||d!=a.INTERRUPT_ANY&&d!=a.INTERRUPT_EARLY&&d!=a.INTERRUPT_LATE&&d!=a.INTERRUPT_NONE&&d!=null)return NaN;if(d==null)d=a.INTERRUPT_NONE;e==null&&(e=false);f||(f=0);c==null||c>1?c=1:c<0&&(c=0);if(f>0)setTimeout(function(){a.beginPlaying(b,d,c,e)},f);else return a.beginPlaying(b,d,c,e);return-1};a.getMasterVolume=function(){return a._master};a.setMasterVolume=function(b){if(Number(b)!=null){b<0?b=0:b>1&&(b=1);var d,c,e;d=a._master;a._master=b;if(a._master!=d)for(e in a.soundHash){c=a.soundHash[e];d=
-c.length;for(b=0;b<d;b++)c[b].volume=c[b].storedVolume*a._master}}};a.remove=function(b,d){var c,e,f;if(b==null)for(c in a.soundHash){f=a.soundHash[c];e=f.length;do a.stop(c,e-1),f[e-1].currentSrc="",document.body.removeChild(f[e-1]),f.pop(),e=f.length,a.instanceCount--;while(e)}else{f=a.soundHash[b];if(f==null)return false;e=f.length;if(d==null){do a.stop(b,e-1),f[e-1].currentSrc="",document.body.removeChild(f[e-1]),f.pop(),e=f.length,a.instanceCount--;while(e)}else{if(d<=0||e<=0)return false;e--;
-for(c=0;c<=e&&c<d;c++)a.stop(b,e-c),f[e-c].currentSrc="",document.body.removeChild(f[e-c]),f.pop(),a.instanceCount--}}return true};a.setVolume=function(b,d,c){var e,f;if(b==null)return false;b*=a._master;if(d==null)for(f in a.soundHash){e=a.soundHash[f];d=e.length;for(c=0;c<d;c++)e[c].storedVolume=b,e[c].volume=b}else{e=a.soundHash[d];if(e==null)return false;d=e.length;if(c==null)for(c=0;c<d;c++)e[c].storedVolume=b,e[c].volume=b;else{if(d<=c)return false;e[c].storedVolume=b;e[c].volume=b}}return true};
-a.getVolume=function(b,d){var c=a.soundHash[b];return c==null||c.length==0?-1:d==null?c[1].storedVolume:c.length<d?-1:c[d].storedVolume};a.setMute=function(b,d,c){var e,f;if(b==null)return false;if(d==null)for(f in a.soundHash){e=a.soundHash[f];d=e.length;for(c=0;c<d;c++)e[c].muted=b}else{e=a.soundHash[d];if(e==null)return false;d=e.length;if(c==null)for(c=0;c<d;c++)e[c].muted=b;else{if(d<=c)return false;e[c].muted=b}}return true};a.pause=function(b,d){var c,e,f,g;if(b==null)for(g in a.soundHash){f=
-a.soundHash[g];e=f.length;for(c=0;c<e;c++)f[c].pause()}else{f=a.soundHash[b];if(f==null)return false;e=f.length;if(d==null)for(c=0;c<e;c++)f[c].pause();else{if(e<=d)return false;f[d].pause()}}return true};a.resume=function(b,d){var c,e,f,g;if(b==null)for(g in a.soundHash){e=a.soundHash[g].length;for(c=0;c<e;c++)f=a.soundHash[g][c],(f.loop||f.currentTime!=f.duration&&f.currentTime!=0)&&f.play()}else{if(a.soundHash[b]==null)return false;e=a.soundHash[b].length;if(d==null)for(c=0;c<e;c++)f=a.soundHash[b][c],
-(f.loop||f.currentTime!=f.duration&&f.currentTime!=0)&&f.play();else{if(e<=d)return false;f=a.soundHash[b][d];(f.loop||f.currentTime!=f.duration&&f.currentTime!=0)&&f.play()}}return true};a.stop=function(b,d){var c,e,f,g;if(b==null)for(g in a.soundHash){e=a.soundHash[g].length;for(c=0;c<e;c++){f=a.soundHash[g][c];try{f.currentTime=0}catch(h){}f.pause()}}else{if(a.soundHash[b]==null)return false;e=a.soundHash[b].length;if(d==null)for(c=0;c<e;c++)f=a.soundHash[b][c],f.currentTime=0,f.pause();else{if(e<=
-d)return false;f=a.soundHash[b][d];f.currentTime=0;f.pause()}}return true};a.isLoaded=function(b){var d=true,c;if(b==null)for(c in a.soundHash){if(d=d&&a.soundHash[c]&&a.soundHash[c][0]&&a.soundHash[c][0].loaded,!d)break}else return a.soundHash[b]&&a.soundHash[b][0]&&a.soundHash[b][0].loaded;return d};a.getNumInstances=function(b){return b==null?instanceCount:a.soundHash[b]?a.soundHash[b].length:-1};a.getMaxInstances=function(){return a.INST_MAX};a.getCurrentLoadProgress=function(){return(a.itemsToLoad-
-a.loadQueue.length-(1-a._currentLoad))/a.itemsToLoad};a.getInstance=function(b,d){return b==null||d<0||!a.soundHash[b]||!a.soundHash[b][d]?null:a.soundHash[b][d]};a.beginPlaying=function(b,d,c,e){var f,g,h,i=false,j=a.soundHash[b];if(!j[0].loaded)throw Error("Audio is not loaded. The source(s) are either not found, or the correct audio formats are not provided.");for(var k=j.length,b=0;b<k;b++){h=j[b];g==null&&d!=a.INTERRUPT_ANY&&d!=a.INTERRUPT_NONE&&(g=h,f=b);if(h.currentTime>=h.duration-a.FT&&!h.loop||
-h.currentTime==0&&h.paused)i=true,k=b;else if(d==a.INTERRUPT_EARLY&&h.currentTime<g.currentTime||d==a.INTERRUPT_LATE&&h.currentTime>g.currentTime)i=true;i&&(g=h,f=b)}d==a.INTERRUPT_ANY&&!g&&(g=j[0],f=0);return g?(g.loop=e,g.storedVolume=c,g.volume=c*a._master,g.currentTime=0,g.paused&&g.play(),f):-1};a.loadNext=function(){if(a.loadQueue.length<=0){if(a.onLoadQueueComplete)a.onLoadQueueComplete()}else{var b=a.loadQueue.shift(),d=b.instances||1,c=b.name,b=b.src,e=a.soundHash[c];if(e==null)e=a.soundHash[c]=
-[];else if(e.length)b=e[0].src;for(var f=e=e.length,d=e+d;f<d;f++){var g=document.createElement("audio");if(f==e)g.timeoutId=setTimeout(function(){a.handleAudioTimeout(g)},a.AUDIO_TIMEOUT),g.addEventListener(a.AUDIO_COMPLETE,a.handleAudioComplete,false),g.addEventListener(a.AUDIO_PROGRESS,a.handleProgress,false),g.addEventListener(a.AUDIO_STALLED,a.handleAudioStall,false),g.addEventListener(a.AUDIO_ERROR,a.handleAudioError,false),g.loaded=false;g.addEventListener(a.AUDIO_ENDED,a.handleEnded,false);
-g.setAttribute("id",c+"_"+f);g.setAttribute("preload","auto");var h;if(b instanceof Array)for(var i=0,j=b.length;i<j;i++){var k=g.appendChild(document.createElement("source"));h=a.getType(b[i]);k.setAttribute("type",h);k.setAttribute("src",b[i])}else h=a.getType(b),g.setAttribute("type",h),g.setAttribute("src",b);g.load();document.body.appendChild(g);a.soundHash[c].push(g);a.instanceCount++}}};a.getType=function(a){switch(a.slice(a.lastIndexOf(".")+1)){case "mp3":return"audio/mpeg";case "ogg":return"audio/ogg";
-case "wav":return"audio/wav";default:throw"'"+a+"' is not a recognized audio file";}};a.handleEnded=function(){if(a.onSoundEnded){var b=this.id.split("_");a.onSoundEnded(this,b[0],b[1])}};a.handleAudioTimeout=function(b){if(a.onSoundTimeout){var d=b.id.split("_");a.onSoundTimeout(b,d[0],d[1])}a.loadNext()};a.handleProgress=function(){try{this.buffered.end()}catch(b){return}a._currentLoad=this.buffered.end()/this.duration;if(a.onProgress)a.onProgress(a.getCurrentLoadProgress())};a.handleAudioError=
-function(){clearTimeout(this.timeoutId);if(a.onSoundLoadError){var b=this.id.split("_");a.onSoundLoadError(this,b[0],b[1])}a.loadNext()};a.handleAudioComplete=function(){var b=this.id.split("_");this.removeEventListener(a.AUDIO_COMPLETE,a.handleAudioComplete,false);clearTimeout(this.timeoutId);this.loaded=true;if(a.onSoundLoadComplete)a.onSoundLoadComplete(this,b[0],b[1]);a.loadNext()};a.handleAudioStall=function(a){setTimeout(function(){testAudioStall(a)},0)};a.testAudioStall=function(){var b=this.id.split("_");
-if(!a.soundHash[b[0]][b[1]].loaded){if(a.onStall)a.onStall(this,b[0],b[1]);a.loadNext()}};m.SoundJS=a;var l=n.prototype;l.add=function(a){this.instances.push(a);this.length=this.instances.length;this.instances.length==1&&a.addEventListener("canplaythrough",function(){a.canplaythrough()})};l.remove=function(a){this.instances.splice(a,1);this.length=this.instances.length};l.canplaythrough=function(){this.loaded=true};m.SoundJSElement=n})(window);
diff --git a/lib/soundjs-0.2.0.min.js b/lib/soundjs-0.2.0.min.js
new file mode 100644
index 00000000..6586bc12
--- /dev/null
+++ b/lib/soundjs-0.2.0.min.js
@@ -0,0 +1,48 @@
+/**
+* SoundJS
+* Visit http://createjs.com/ for documentation, updates and examples.
+*
+* Copyright (c) 2012 Grant Skinner
+* 
+* 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.
+**/
+(function(i){function a(){throw"SoundJS cannot be instantiated";}function g(a,c){this.init(a,c)}a.DELIMITER="|";a.AUDIO_TIMEOUT=8E3;a.INTERRUPT_ANY="any";a.INTERRUPT_EARLY="early";a.INTERRUPT_LATE="late";a.INTERRUPT_NONE="none";a.PLAY_INITED="playInited";a.PLAY_SUCCEEDED="playSucceeded";a.PLAY_INTERRUPTED="playInterrupted";a.PLAY_FINISHED="playFinished";a.PLAY_FAILED="playFailed";a.activePlugin=null;a.pluginsRegistered=false;a.masterVolume=1;a.muted=false;a.instances=[];a.instanceHash={};a.idHash=
+null;a.getPreloadHandlers=function(){return{callback:a.proxy(a.initLoad,a),types:["sound"],extensions:["mp3","ogg","wav"]}};a.registerPlugins=function(b){a.pluginsRegistered=true;for(var c=0,d=b.length;c<d;c++){var e=b[c];if(e!=null&&e.isSupported())return a.activePlugin=new e,true}return false};a.registerPlugin=function(b){a.pluginsRegistered=true;return b.isSupported()?(a.activePlugin=new b,a.log("initialize "+a.activePlugin.toString()),true):false};a.isReady=function(){return a.activePlugin!=null};
+a.getCapabilities=function(){return a.activePlugin?a.activePlugin.capabilities:null};a.getCapability=function(b){return a.activePlugin==null?null:a.activePlugin.capabilities[b]};a.initLoad=function(b,c,d,e){if(!a.checkPlugin(true))return false;b=a.parsePath(b,c,d,e);if(b==null)return false;if(d!=null){if(a.idHash==null)a.idHash={};a.idHash[d]=b.src}g.create(b.src,e);d=a.activePlugin.register(b.src,e);if(d!=null){if(d.tag!=null)b.tag=d.tag;else if(d.src)b.src=d.src;if(d.completeHandler!=null)b.handler=
+d.completeHandler}return b};a.parsePath=function(b,c,d,e){for(var b=b.split(a.DELIMITER),c={type:c||"sound",id:d,data:e,handler:a.handleSoundReady},d=false,e=a.getCapabilities(),f=0,g=b.length;f<g;f++){var h=b[f],j=h.lastIndexOf("."),i=h.substr(j+1).toLowerCase(),j=h.substr(0,j).split("/").pop();switch(i){case "mp3":e.mp3&&(d=true);break;case "ogg":e.ogg&&(d=true);break;case "wav":e.wav&&(d=true)}if(d)return c.name=j,c.src=h,c.extension=i,c}return null};a.play=function(b,c,d,e,f,g,h){if(!a.checkPlugin(true))return null;
+b=a.getSrcFromId(b);b=a.activePlugin.create(b);return a.playInstance(b,c,d,e,f,g,h)};a.playInstance=function(b,c,d,e,f,g,h){c=c||a.INTERRUPT_NONE;d==null&&(d=0);e==null&&(e=0);f==null&&(f=0);g==null&&(g=1);h==null&&(h=0);if(d==0){if(!a.beginPlaying(b,c,e,f,g,h))return null}else setTimeout(function(){a.beginPlaying(b,c,e,f,g,h)},d);this.instances.push(b);return this.instanceHash[b.uniqueId]=b};a.beginPlaying=function(a,c,d,e,f,i){if(!g.add(a,c))return false;return a.beginPlaying(d,e,f,i)==-1?(this.instances.splice(this.instances.indexOf(a),
+1),delete this.instanceHash[a.uniqueId],false):true};a.checkPlugin=function(b){return a.activePlugin==null&&(b&&!a.pluginsRegistered&&a.registerPlugin(a.HTMLAudioPlugin),a.activePlugin==null)?(a.log("*** No Active Plugin Found on SoundJS"),false):true};a.getSrcFromId=function(b){return a.idHash==null||a.idHash[b]==null?b:a.idHash[b]};a.setVolume=function(b,c){if(Number(b)==null)return false;b=Math.max(0,Math.min(1,b));return a.tellAllInstances("setVolume",c,b)};a.getMasterVolume=function(){return a.masterVolume};
+a.setMasterVolume=function(b){a.masterVolume=b;return a.tellAllInstances("setMasterVolume",null,b)};a.setMute=function(b,c){return a.tellAllInstances("mute",c,b)};a.pause=function(b){return a.tellAllInstances("pause",b)};a.resume=function(b){return a.tellAllInstances("resume",b)};a.stop=function(b){return a.tellAllInstances("stop",b)};a.getInstanceById=function(a){return this.instanceHash[a]};a.playFinished=function(a){g.remove(a);this.instances.splice(this.instances.indexOf(a),1)};a.tellAllInstances=
+function(a,c,d){if(this.activePlugin==null)return false;for(var c=this.getSrcFromId(c),e=this.instances.length-1;e>=0;e--){var f=this.instances[e];if(!(c!=null&&f.src!=c))switch(a){case "pause":f.pause();break;case "resume":f.resume();break;case "setVolume":f.setVolume(d);break;case "setMasterVolume":f.setMasterVolume(d);break;case "mute":f.mute(d);break;case "stop":f.stop();break;case "setPan":f.setPan(d)}}return true};a.proxy=function(a,c){return function(){return a.apply(c,arguments)}};a.log=function(){};
+i.SoundJS=a;g.channels={};g.create=function(a,c){var d=g.get(a);d==null?g.channels[a]=new g(a,c):d.max+=c};g.add=function(a,c){var d=g.get(a.src);return d==null?false:d.add(a,c)};g.remove=function(a){var c=g.get(a.src);if(c==null)return false;c.remove(a);return true};g.get=function(a){return g.channels[a]};g.prototype={src:null,max:null,length:0,init:function(a,c){this.src=a;this.max=c||1;this.instances=[]},get:function(a){return this.instances[a]},add:function(a,c){if(!this.getSlot(c,a))return false;
+this.instances.push(a);this.length++;return true},remove:function(a){a=this.instances.indexOf(a);if(a==-1)return false;this.instances.splice(a,1);this.length--;return true},getSlot:function(b){for(var c,d,e=0,f=this.max||100;e<f;e++){c=this.get(e);if(c==null)return true;else if(b==a.INTERRUPT_NONE)continue;if(e==0)d=c;else if(c.playState==a.PLAY_FINISHED||c==a.PLAY_INTERRUPTED||c==a.PLAY_FAILED)d=c;else if(b==a.INTERRUPT_EARLY&&c.getPosition()<d.getPosition()||b==a.INTERRUPT_LATE&&c.getPosition()>
+d.getPosition())d=c}return d!=null?(d.interrupt(),this.remove(d),true):false},toString:function(){return"[SoundJS SoundChannel]"}}})(window);(function(i){function a(){this.init()}function g(a){this.init(a)}function b(a){this.init(a)}a.MAX_INSTANCES=30;a.capabilities=null;a.lastId=0;a.AUDIO_READY="canplaythrough";a.AUDIO_ENDED="ended";a.AUDIO_ERROR="error";a.AUDIO_STALLED="stalled";a.fillChannels=false;a.isSupported=function(){if(BrowserDetect&&BrowserDetect.isIOS)return false;a.generateCapabilities();var c=a.tag;return c==null||c.canPlayType==null?false:true};a.generateCapabilities=function(){if(a.capabilities==null){var c=a.tag=document.createElement("audio");
+a.capabilities={panning:false,volume:true,mp3:c.canPlayType("audio/mp3")!="no"&&c.canPlayType("audio/mp3")!="",ogg:c.canPlayType("audio/ogg")!="no"&&c.canPlayType("audio/ogg")!="",mpeg:c.canPlayType("audio/mpeg")!="no"&&c.canPlayType("audio/mpeg")!="",channels:a.MAX_INSTANCES}}};a.prototype={capabilities:null,FT:0.0010,channels:null,init:function(){this.capabilities=a.capabilities;this.channels={}},register:function(a,d){for(var e=b.get(a),f,g=0,h=d||1;g<h;g++)f=this.createTag(a),e.add(f);return{tag:f}},
+createTag:function(a){var b=document.createElement("audio");b.preload=false;b.src=a;return b},create:function(a){a=new g(a);a.owner=this;return a},toString:function(){return"[HTMLAudioPlugin]"}};i.SoundJS.HTMLAudioPlugin=a;g.prototype={src:null,uniqueId:-1,playState:null,owner:null,loaded:false,paused:false,lastInterrupt:SoundJS.INTERRUPT_NONE,offset:0,delay:0,volume:1,pan:0,muted:false,remainingLoops:0,delayTimeout:-1,tag:null,onComplete:null,onLoop:null,onReady:null,onPlayFailed:null,onPlayInterrupted:null,
+endedHandler:null,readyHandler:null,stalledHandler:null,init:function(c){this.uniqueId=a.lastId++;this.src=c;this.endedHandler=SoundJS.proxy(this.handleSoundComplete,this);this.readyHandler=SoundJS.proxy(this.handleSoundReady,this);this.stalledHandler=SoundJS.proxy(this.handleSoundStalled,this)},cleanUp:function(){var c=this.tag;if(c!=null){c.pause();try{c.currentTime=0}catch(d){}c.removeEventListener(a.AUDIO_ENDED,this.endedHandler,false);c.removeEventListener(a.AUDIO_READY,this.readyHandler,false);
+b.setInstance(this.src,c);this.tag=null}SoundJS.playFinished(this)},interrupt:function(){if(this.tag!=null){this.playState=SoundJS.PLAY_INTERRUPTED;if(this.onPlayInterrupted)this.onPlayInterrupted(this);this.cleanUp();this.paused=false}},play:function(a,b,e,f,g,h){this.cleanUp();SoundJS.playInstance(this,a,b,e,f,g,h)},beginPlaying:function(c,d,e){var f=this.tag=b.getInstance(this.src);if(f==null)return this.playFailed(),-1;f.addEventListener(a.AUDIO_ENDED,this.endedHandler,false);this.offset=c;this.volume=
+e;this.updateVolume();this.remainingLoops=d;f.readyState!==4?(f.addEventListener(a.AUDIO_READY,this.readyHandler,false),f.addEventListener(a.AUDIO_STALLED,this.stalledHandler,false),f.load()):this.handleSoundReady(null);return 1},handleSoundStalled:function(){SoundJS.log("* Audio Stalled");if(this.onPlayFailed!=null)this.onPlayFailed(this);this.cleanUp()},handleSoundReady:function(){this.playState=SoundJS.PLAY_SUCCEEDED;this.tag.removeEventListener(a.AUDIO_READY,this.readyHandler,false);this.offset>=
+this.getDuration()?(SoundJS.log("* Out of range",this.offset,this.tag.currentTime),this.playFailed()):(this.tag.currentTime=this.offset*0.0010,this.tag.play())},pause:function(){this.paused=true;return this.tag!=null?(this.tag.pause(),false):true},resume:function(){this.paused=false;return this.tag!=null?(this.tag.play(),false):true},stop:function(){this.pause();this.playState=SoundJS.PLAY_FINISHED;this.cleanUp();return true},setMasterVolume:function(){this.updateVolume();return true},setVolume:function(a){this.volume=
+a;this.updateVolume();return true},updateVolume:function(){return this.tag!=null?(this.tag.volume=this.muted?0:this.volume*SoundJS.masterVolume,true):false},getVolume:function(){return this.volume},mute:function(a){this.muted=a;this.updateVolume();return true},setPan:function(){return false},getPan:function(){return 0},getPosition:function(){return this.tag==null?0:this.tag.currentTime*1E3},setPosition:function(a){if(this.tag==null)return false;try{this.tag.currentTime=a*0.0010}catch(b){return false}return true},
+getDuration:function(){return this.tag==null?0:this.tag.duration*1E3},handleSoundComplete:function(){if(this.remainingLoops!=0){this.remainingLoops--;try{this.tag.currentTime=0}catch(a){}this.tag.play();if(this.onLoop!=null)this.onLoop(this)}else{this.playState=SoundJS.PLAY_FINISHED;if(this.onComplete!=null)this.onComplete(this);this.cleanUp()}},playFailed:function(){this.playState=SoundJS.PLAY_FAILED;if(this.onPlayFailed!=null)this.onPlayFailed(this);this.cleanUp()},toString:function(){return"[HTMLAudio SoundInstance]"}};
+b.channels={};b.get=function(a){var d=b.channels[a];d==null&&(d=b.channels[a]=new b(a));return d};b.getInstance=function(a){a=b.channels[a];return a==null?null:a.get()};b.setInstance=function(a,d){var e=b.channels[a];return e==null?null:e.set(d)};b.prototype={src:null,length:0,available:0,tags:null,init:function(a){this.src=a;this.tags=[]},add:function(a){this.tags.push(a);this.length++;this.available=this.tags.length},get:function(){if(this.tags.length==0)return null;this.available=this.tags.length;
+var a=this.tags.pop();document.body.appendChild(a);return a},set:function(a){this.tags.indexOf(a)==-1&&this.tags.push(a);document.body.removeChild(a);this.available=this.tags.length},toString:function(){return"[HTMLAudioPlugin TagChannel]"}}})(window);
diff --git a/lib/soundjs.flashplugin-0.2.0.min.js b/lib/soundjs.flashplugin-0.2.0.min.js
new file mode 100644
index 00000000..3362869f
--- /dev/null
+++ b/lib/soundjs.flashplugin-0.2.0.min.js
@@ -0,0 +1,59 @@
+/**
+* SoundJS
+* Visit http://createjs.com/ for documentation, updates and examples.
+*
+* Copyright (c) 2012 Grant Skinner
+* 
+* 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.
+**/
+
+/**
+ * SoundJS FlashPlugin also includes swfobject (http://code.google.com/p/swfobject/)
+ */
+var swfobject=function(){function n(){if(!x){try{var b=e.getElementsByTagName("body")[0].appendChild(e.createElement("span"));b.parentNode.removeChild(b)}catch(c){return}x=!0;for(var b=C.length,k=0;k<b;k++)C[k]()}}function h(b){x?b():C[C.length]=b}function z(b){if(typeof p.addEventListener!=l)p.addEventListener("load",b,!1);else if(typeof e.addEventListener!=l)e.addEventListener("load",b,!1);else if(typeof p.attachEvent!=l)U(p,"onload",b);else if(typeof p.onload=="function"){var c=p.onload;p.onload=
+function(){c();b()}}else p.onload=b}function D(){var b=e.getElementsByTagName("body")[0],c=e.createElement(t);c.setAttribute("type",E);var k=b.appendChild(c);if(k){var q=0;(function(){if(typeof k.GetVariable!=l){var g=k.GetVariable("$version");if(g)g=g.split(" ")[1].split(","),f.pv=[parseInt(g[0],10),parseInt(g[1],10),parseInt(g[2],10)]}else if(q<10){q++;setTimeout(arguments.callee,10);return}b.removeChild(c);k=null;a()})()}else a()}function a(){var b=u.length;if(b>0)for(var c=0;c<b;c++){var k=u[c].id,
+a=u[c].callbackFn,g={success:!1,id:k};if(f.pv[0]>0){var e=o(k);if(e)if(F(u[c].swfVersion)&&!(f.wk&&f.wk<312)){if(y(k,!0),a)g.success=!0,g.ref=d(k),a(g)}else if(u[c].expressInstall&&i()){g={};g.data=u[c].expressInstall;g.width=e.getAttribute("width")||"0";g.height=e.getAttribute("height")||"0";if(e.getAttribute("class"))g.styleclass=e.getAttribute("class");if(e.getAttribute("align"))g.align=e.getAttribute("align");for(var j={},e=e.getElementsByTagName("param"),V=e.length,m=0;m<V;m++)e[m].getAttribute("name").toLowerCase()!=
+"movie"&&(j[e[m].getAttribute("name")]=e[m].getAttribute("value"));J(g,j,k,a)}else v(e),a&&a(g)}else if(y(k,!0),a){if((k=d(k))&&typeof k.SetVariable!=l)g.success=!0,g.ref=k;a(g)}}}function d(b){var c=null;if((b=o(b))&&b.nodeName=="OBJECT")typeof b.SetVariable!=l?c=b:(b=b.getElementsByTagName(t)[0])&&(c=b);return c}function i(){return!G&&F("6.0.65")&&(f.win||f.mac)&&!(f.wk&&f.wk<312)}function J(b,c,k,a){G=!0;K=a||null;N={success:!1,id:k};var g=o(k);if(g){g.nodeName=="OBJECT"?(B=r(g),H=null):(B=g,H=
+k);b.id=O;if(typeof b.width==l||!/%$/.test(b.width)&&parseInt(b.width,10)<310)b.width="310";if(typeof b.height==l||!/%$/.test(b.height)&&parseInt(b.height,10)<137)b.height="137";e.title=e.title.slice(0,47)+" - Flash Player Installation";a=f.ie&&f.win?"ActiveX":"PlugIn";a="MMredirectURL="+encodeURI(window.location).toString().replace(/&/g,"%26")+"&MMplayerType="+a+"&MMdoctitle="+e.title;typeof c.flashvars!=l?c.flashvars+="&"+a:c.flashvars=a;if(f.ie&&f.win&&g.readyState!=4)a=e.createElement("div"),
+k+="SWFObjectNew",a.setAttribute("id",k),g.parentNode.insertBefore(a,g),g.style.display="none",function(){g.readyState==4?g.parentNode.removeChild(g):setTimeout(arguments.callee,10)}();L(b,c,k)}}function v(b){if(f.ie&&f.win&&b.readyState!=4){var c=e.createElement("div");b.parentNode.insertBefore(c,b);c.parentNode.replaceChild(r(b),c);b.style.display="none";(function(){b.readyState==4?b.parentNode.removeChild(b):setTimeout(arguments.callee,10)})()}else b.parentNode.replaceChild(r(b),b)}function r(b){var c=
+e.createElement("div");if(f.win&&f.ie)c.innerHTML=b.innerHTML;else if(b=b.getElementsByTagName(t)[0])if(b=b.childNodes)for(var a=b.length,q=0;q<a;q++)!(b[q].nodeType==1&&b[q].nodeName=="PARAM")&&b[q].nodeType!=8&&c.appendChild(b[q].cloneNode(!0));return c}function L(b,c,a){var q,g=o(a);if(f.wk&&f.wk<312)return q;if(g){if(typeof b.id==l)b.id=a;if(f.ie&&f.win){var d="",j;for(j in b)if(b[j]!=Object.prototype[j])j.toLowerCase()=="data"?c.movie=b[j]:j.toLowerCase()=="styleclass"?d+=' class="'+b[j]+'"':
+j.toLowerCase()!="classid"&&(d+=" "+j+'="'+b[j]+'"');j="";for(var i in c)c[i]!=Object.prototype[i]&&(j+='<param name="'+i+'" value="'+c[i]+'" />');g.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+d+">"+j+"</object>";I[I.length]=b.id;q=o(b.id)}else{i=e.createElement(t);i.setAttribute("type",E);for(var m in b)b[m]!=Object.prototype[m]&&(m.toLowerCase()=="styleclass"?i.setAttribute("class",b[m]):m.toLowerCase()!="classid"&&i.setAttribute(m,b[m]));for(d in c)c[d]!=Object.prototype[d]&&
+d.toLowerCase()!="movie"&&(b=i,j=d,m=c[d],a=e.createElement("param"),a.setAttribute("name",j),a.setAttribute("value",m),b.appendChild(a));g.parentNode.replaceChild(i,g);q=i}}return q}function P(b){var c=o(b);if(c&&c.nodeName=="OBJECT")f.ie&&f.win?(c.style.display="none",function(){if(c.readyState==4){var a=o(b);if(a){for(var e in a)typeof a[e]=="function"&&(a[e]=null);a.parentNode.removeChild(a)}}else setTimeout(arguments.callee,10)}()):c.parentNode.removeChild(c)}function o(b){var c=null;try{c=e.getElementById(b)}catch(a){}return c}
+function U(b,c,a){b.attachEvent(c,a);A[A.length]=[b,c,a]}function F(b){var c=f.pv,b=b.split(".");b[0]=parseInt(b[0],10);b[1]=parseInt(b[1],10)||0;b[2]=parseInt(b[2],10)||0;return c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1}function Q(b,c,a,d){if(!f.ie||!f.mac){var g=e.getElementsByTagName("head")[0];if(g){a=a&&typeof a=="string"?a:"screen";d&&(M=s=null);if(!s||M!=a)d=e.createElement("style"),d.setAttribute("type","text/css"),d.setAttribute("media",a),s=g.appendChild(d),
+f.ie&&f.win&&typeof e.styleSheets!=l&&e.styleSheets.length>0&&(s=e.styleSheets[e.styleSheets.length-1]),M=a;f.ie&&f.win?s&&typeof s.addRule==t&&s.addRule(b,c):s&&typeof e.createTextNode!=l&&s.appendChild(e.createTextNode(b+" {"+c+"}"))}}}function y(b,a){if(R){var e=a?"visible":"hidden";x&&o(b)?o(b).style.visibility=e:Q("#"+b,"visibility:"+e)}}function S(b){return/[\\\"<>\.;]/.exec(b)!=null&&typeof encodeURIComponent!=l?encodeURIComponent(b):b}var l="undefined",t="object",E="application/x-shockwave-flash",
+O="SWFObjectExprInst",p=window,e=document,w=navigator,T=!1,C=[function(){T?D():a()}],u=[],I=[],A=[],B,H,K,N,x=!1,G=!1,s,M,R=!0,f=function(){var b=typeof e.getElementById!=l&&typeof e.getElementsByTagName!=l&&typeof e.createElement!=l,a=w.userAgent.toLowerCase(),k=w.platform.toLowerCase(),f=k?/win/.test(k):/win/.test(a),k=k?/mac/.test(k):/mac/.test(a),a=/webkit/.test(a)?parseFloat(a.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):!1,g=!+"\u000b1",d=[0,0,0],j=null;if(typeof w.plugins!=l&&typeof w.plugins["Shockwave Flash"]==
+t){if((j=w.plugins["Shockwave Flash"].description)&&!(typeof w.mimeTypes!=l&&w.mimeTypes[E]&&!w.mimeTypes[E].enabledPlugin))T=!0,g=!1,j=j.replace(/^.*\s+(\S+\s+\S+$)/,"$1"),d[0]=parseInt(j.replace(/^(.*)\..*$/,"$1"),10),d[1]=parseInt(j.replace(/^.*\.(.*)\s.*$/,"$1"),10),d[2]=/[a-zA-Z]/.test(j)?parseInt(j.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}else if(typeof p.ActiveXObject!=l)try{var i=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");if(i&&(j=i.GetVariable("$version")))g=!0,j=j.split(" ")[1].split(","),
+d=[parseInt(j[0],10),parseInt(j[1],10),parseInt(j[2],10)]}catch(m){}return{w3:b,pv:d,wk:a,ie:g,win:f,mac:k}}();(function(){f.w3&&((typeof e.readyState!=l&&e.readyState=="complete"||typeof e.readyState==l&&(e.getElementsByTagName("body")[0]||e.body))&&n(),x||(typeof e.addEventListener!=l&&e.addEventListener("DOMContentLoaded",n,!1),f.ie&&f.win&&(e.attachEvent("onreadystatechange",function(){e.readyState=="complete"&&(e.detachEvent("onreadystatechange",arguments.callee),n())}),p==top&&function(){if(!x){try{e.documentElement.doScroll("left")}catch(b){setTimeout(arguments.callee,
+0);return}n()}}()),f.wk&&function(){x||(/loaded|complete/.test(e.readyState)?n():setTimeout(arguments.callee,0))}(),z(n)))})();(function(){f.ie&&f.win&&window.attachEvent("onunload",function(){for(var b=A.length,a=0;a<b;a++)A[a][0].detachEvent(A[a][1],A[a][2]);b=I.length;for(a=0;a<b;a++)P(I[a]);for(var e in f)f[e]=null;f=null;for(var d in swfobject)swfobject[d]=null;swfobject=null})})();return{registerObject:function(b,a,e,d){if(f.w3&&b&&a){var g={};g.id=b;g.swfVersion=a;g.expressInstall=e;g.callbackFn=
+d;u[u.length]=g;y(b,!1)}else d&&d({success:!1,id:b})},getObjectById:function(b){if(f.w3)return d(b)},embedSWF:function(b,a,e,d,g,v,j,p,m,o){var r={success:!1,id:a};f.w3&&!(f.wk&&f.wk<312)&&b&&a&&e&&d&&g?(y(a,!1),h(function(){e+="";d+="";var f={};if(m&&typeof m===t)for(var h in m)f[h]=m[h];f.data=b;f.width=e;f.height=d;h={};if(p&&typeof p===t)for(var s in p)h[s]=p[s];if(j&&typeof j===t)for(var n in j)typeof h.flashvars!=l?h.flashvars+="&"+n+"="+j[n]:h.flashvars=n+"="+j[n];if(F(g))s=L(f,h,a),f.id==
+a&&y(a,!0),r.success=!0,r.ref=s;else if(v&&i()){f.data=v;J(f,h,a,o);return}else y(a,!0);o&&o(r)})):o&&o(r)},switchOffAutoHideShow:function(){R=!1},ua:f,getFlashPlayerVersion:function(){return{major:f.pv[0],minor:f.pv[1],release:f.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(a,c,e){if(f.w3)return L(a,c,e)},showExpressInstall:function(a,c,e,d){f.w3&&i()&&J(a,c,e,d)},removeSWF:function(a){f.w3&&P(a)},createCSS:function(a,c,e,d){f.w3&&Q(a,c,e,d)},addDomLoadEvent:h,addLoadEvent:z,getQueryParamValue:function(a){var c=
+e.location.search||e.location.hash;if(c){/\?/.test(c)&&(c=c.split("?")[1]);if(a==null)return S(c);for(var c=c.split("&"),d=0;d<c.length;d++)if(c[d].substring(0,c[d].indexOf("="))==a)return S(c[d].substring(c[d].indexOf("=")+1))}return""},expressInstallCallback:function(){if(G){var a=o(O);if(a&&B){a.parentNode.replaceChild(B,a);if(H&&(y(H,!0),f.ie&&f.win))B.style.display="block";K&&K(N)}G=!1}}}}();(function(n){function h(){this.init()}function z(a,d){this.init(a,d)}function D(a,d){this.init(a,d)}h.capabilities=null;h.BASE_PATH="src/soundjs";h.lastId=0;h.isSupported=function(){if(BrowserDetect&&BrowserDetect.isIOS)return!1;h.generateCapabilities();return swfobject==null?!1:swfobject.hasFlashPlayerVersion("9.0.0")};h.generateCapabilities=function(){if(h.capabilities==null)h.capabilities={panning:!0,volume:!0,mp3:!0,ogg:!1,mpeg:!0,channels:255}};h.prototype={CONTAINER_ID:"flashAudioContainer",
+capabilities:null,container:null,flash:null,flashReady:!1,flashInstances:null,flashPreloadInstances:null,queuedInstances:null,init:function(){this.capabilities=h.capabilities;this.flashInstances={};this.flashPreloadInstances={};this.queuedInstances=[];var a=this.container=document.createElement("div");a.id=this.CONTAINER_ID;a.appendChild(document.createTextNode("Default Content Here"));document.body.appendChild(a);swfobject.embedSWF(h.BASE_PATH+"FlashAudioPlugin.swf",this.CONTAINER_ID,"1","1","9.0.0",
+null,null,null,null,SoundJS.proxy(this.handleSWFReady,this))},handleSWFReady:function(a){this.flash=a.ref;this.loadTimeout=setTimeout(function(){SoundJS.proxy(this.handleTimeout,this)},2E3)},handleFlashReady:function(){this.flashReady=!0;for(var a=0,d=this.queuedInstances.length;a<d;a++)this.flash.register(this.queuedInstances[a]);this.queuedInstances=null;for(var i in this.flashPreloadInstances)this.flashPreloadInstances[i].initialize(this.flash);for(i in this.flashInstances)this.flashInstances[i].initialize(this.flash)},
+handleTimeout:function(){SoundJS.log("Flash Load Error")},register:function(a){this.flashReady?this.flash.register(a):this.queuedInstances.push(a);return{tag:new D(a,this.flash)}},create:function(a){try{var d=new z(a,this.flash);d.owner=this;return d}catch(i){SoundJS.log("Error: Please ensure you have permission to play audio from this location.",i)}return null},registerPreloadInstance:function(a,d){this.flashPreloadInstances[a]=d},unregisterPreloadInstance:function(a){delete this.flashPreloadInstances[a]},
+registerSoundInstance:function(a,d){this.flashInstances[a]=d},unregisterSoundInstance:function(a){delete this.flashInstances[a]},handleSoundEvent:function(a,d){var i=this.flashInstances[a];if(i!=null){for(var h=[],v=2,r=arguments.length;v<r;v++)h.push(arguments[v]);try{if(h.length==0)i[d]();else i[d].apply(i,h)}catch(n){}}},handlePreloadEvent:function(a,d){var i=this.flashPreloadInstances[a];if(i!=null){for(var h=[],n=2,r=arguments.length;n<r;n++)h.push(arguments[n]);try{if(h.length==0)i[d]();else i[d].apply(i,
+h)}catch(z){}}},handleEvent:function(a){switch(a){case "ready":clearTimeout(this.loadTimeout),this.handleFlashReady()}},handleErrorEvent:function(a){SoundJS.log("Handle Error Event",a)},toString:function(){return"[FlashPlugin]"}};n.SoundJS.FlashPlugin=h;z.prototype={src:null,uniqueId:-1,capabilities:null,flash:null,flashId:null,loop:0,volume:1,pan:0,muted:!1,paused:!1,onComplete:null,onLoop:null,onReady:null,onPlayFailed:null,onPlayInterrupted:null,init:function(a,d){this.uniqueId=h.lastId++;this.src=
+a;this.flash=d},initialize:function(a){this.flash=a},interrupt:function(){this.playState=SoundJS.PLAY_INTERRUPTED;if(this.onPlayInterrupted!=null)this.onPlayInterrupted(this);this.flash.interrupt(this.flashId);this.cleanUp()},cleanUp:function(){this.owner.unregisterSoundInstance(this.flashId);SoundJS.playFinished(this)},play:function(a,d,i,h,n,r){SoundJS.playInstance(this,a,d,i,h,n,r)},beginPlaying:function(a,d,i,h){this.loop=d;this.paused=!1;this.flashId=this.flash.playSound(this.src,a,d,i,h);if(this.flashId==
+null){if(this.onPlayFailed!=null)this.onPlayFailed(this);this.cleanUp();return-1}this.playState=SoundJS.PLAY_SUCCEEDED;this.owner.registerSoundInstance(this.flashId,this);return 1},pause:function(){this.paused=!0;return this.flash.pauseSound(this.flashId)},resume:function(){this.paused=!1;return this.flash.resumeSound(this.flashId)},stop:function(){this.playState=SoundJS.PLAY_FINISHED;this.paused=!1;var a=this.flash.stopSound(this.flashId);this.cleanUp();return a},setVolume:function(a){this.volume=
+a;return this.flash.setVolume(this.flashId,a)},getVolume:function(){return this.volume},mute:function(a){return(this.muted=a)?this.flash.muteSound(this.flashId):this.flash.unmuteSound(this.flashId)},getPan:function(){return this.pan},setPan:function(a){this.pan=a;return this.flash.setPan(this.flashId,a)},getPosition:function(){return this.flash.getPosition(this.flashId)},setPosition:function(a){return this.flash.setPosition(this.flashId,a)},getDuration:function(){return this.flash.getDuration(this.flashId)},
+handleSoundFinished:function(){this.playState=SoundJS.PLAY_FINISHED;if(this.onComplete!=null)this.onComplete(this);this.cleanUp()},handleLoop:function(){if(this.onLoop!=null)this.onLoop(this)},toString:function(){return"[FlashPlugin SoundInstance]"}};D.prototype={flash:null,src:null,flashId:null,progress:-1,readyState:0,loading:!1,onloaded:null,onprogress:null,onError:null,init:function(a,d){this.src=a;this.flash=d},initialize:function(a){this.flash=a;this.loading&&this.load(this.src)},load:function(a){if(this.flash==
+null)return loading=!0,!1;this.flashId=this.flash.preload(a);this.owner.registerPreloadInstance(this.flashId,this);return!0},handleProgress:function(a,d){this.progress=a/d;if(this.onprogress!=null)this.onprogress({loaded:a,total:d,progress:this.progress})},handleComplete:function(){this.progress=1;this.readyState=4;if(this.onloaded!=null)this.onloaded()},handleError:function(a){if(this.onerror!=null)this.onerror(a)},toString:function(){return"[FlashPlugin SoundLoader]"}}})(window);
diff --git a/src/soundjs/FlashAudioPlugin.swf b/src/soundjs/FlashAudioPlugin.swf
new file mode 100644
index 00000000..0b13fa84
Binary files /dev/null and b/src/soundjs/FlashAudioPlugin.swf differ
diff --git a/src/soundjs/FlashPlugin.js b/src/soundjs/FlashPlugin.js
new file mode 100644
index 00000000..50cc3c65
--- /dev/null
+++ b/src/soundjs/FlashPlugin.js
@@ -0,0 +1,598 @@
+/* Copyright */
+/**
+ * @module SoundJS
+ */
+(function(window) {
+
+	/**
+	 * Play sounds using a Flash instance. This plugin requires swfObject.as
+	 * as well as the FlashAudioPlugin.swf. Ensure that FlashPlugin.BASE_PATH
+	 * is set when using this plugin, so that the script can find the swf.
+	 * @class FlashPlugin
+	 * @constructor
+	 */
+	function FlashPlugin() {
+		this.init();
+	}
+
+	/**
+	 * The capabilities of the plugin.
+	 * @property capabilities
+	 * @type Object
+	 * @default null
+	 * @static
+	 */
+	FlashPlugin.capabilities = null;
+
+	/**
+	 * The path relative to the HTML page that the FlashAudioPlugin.swf resides.
+	 * If this is not correct, this plugin will not work.
+	 * @property BASE_PATH
+	 * @type String
+	 * @default src/soundjs
+	 * @static
+	 */
+	FlashPlugin.BASE_PATH = "src/soundjs";
+
+	// Protected static
+	FlashPlugin.lastId = 0;
+
+	/**
+	 * Determine if the plugin can be used.
+	 * @method isSupported
+	 * @return {Boolean} If the plugin can be initialized.
+	 * @static
+	 */
+	FlashPlugin.isSupported = function() {
+		if (BrowserDetect && BrowserDetect.isIOS) { return false; }
+		FlashPlugin.generateCapabilities();
+		if (swfobject == null) {
+			return false;
+		}
+		return swfobject.hasFlashPlayerVersion("9.0.0");
+		//TODO: Internal detection instead of SWFObject
+	};
+
+	/**
+	 * Determine the capabilities of the plugin.
+	 * @method generateCapabiities
+	 * @static
+	 */
+	FlashPlugin.generateCapabilities = function() {
+		if (FlashPlugin.capabilities != null) { return; }
+		var c = FlashPlugin.capabilities = {
+			panning: true,
+			volume: true,
+			mp3: true,
+			ogg: false,
+			mpeg: true,
+			channels: 255 //TODO: Determine flash limit
+		};
+		//TODO: Other Props
+    };
+
+
+	var p = FlashPlugin.prototype = {
+
+		CONTAINER_ID: "flashAudioContainer",
+		capabilities: null,
+
+		// FlashPlugin Specifics
+		container: null, // Reference to the DIV containing the Flash Player
+		flash: null, // Reference to the flash player instance
+		flashReady: false,
+		flashInstances: null, // Hash of flashSoundInstances by Flash ID
+		flashPreloadInstances: null, // Hash of preload instances, by Flash ID
+		queuedInstances: null,
+
+		init: function() {
+
+			this.capabilities = FlashPlugin.capabilities;
+
+			this.flashInstances = {};
+			this.flashPreloadInstances = {};
+			this.queuedInstances = [];
+
+			// Create DIV
+			var c = this.container = document.createElement("div");
+			c.id = this.CONTAINER_ID;
+			c.appendChild(document.createTextNode("Default Content Here"));
+			document.body.appendChild(c);
+
+			// Embed SWF
+			var val = swfobject.embedSWF(FlashPlugin.BASE_PATH + "FlashAudioPlugin.swf", this.CONTAINER_ID, "1", "1",//550", "400",
+					"9.0.0",null,null,null,null,
+					SoundJS.proxy(this.handleSWFReady, this)
+			);
+
+			//TODO: Internal detection instead of swfobject
+		},
+
+		handleSWFReady: function(e) {
+			this.flash = e.ref;
+
+			//TODO: Confirm that any instances that are asked to be preloaded before this are queued until Flash is ready.
+			//TODO: Wait for a pre-determined time (2 sec?) and dispatch error, since we aren't loaded.
+			this.loadTimeout = setTimeout(function() {
+				SoundJS.proxy(this.handleTimeout, this);
+			}, 2000);
+		},
+
+		handleFlashReady: function() {
+			this.flashReady = true;
+
+			// Anything that needed to be preloaded, can now do so.
+			for (var i=0, l=this.queuedInstances.length; i<l; i++) {
+				this.flash.register(this.queuedInstances[i]);
+			}
+			this.queuedInstances = null;
+
+			// Associate flash instance with any preloadInstance that already exists.
+			for (var n in this.flashPreloadInstances) {
+				this.flashPreloadInstances[n].initialize(this.flash);
+			}
+
+			// Associate flash instance with any sound instance that has already been played.
+			for (var n in this.flashInstances) {
+				this.flashInstances[n].initialize(this.flash);
+			}
+		},
+
+		handleTimeout: function() {
+			SoundJS.log("Flash Load Error");
+			//TODO: Surface to user?
+			//LM: Maybe SoundJS.handleError(error); ???
+		},
+
+		/**
+		 * Pre-register a sound instance when preloading/setup.
+		 * Note that the FlashPlugin will return a SoundLoader instance for preloading
+		 * since Flash can not access the browser cache consistently.
+		 * @param {String} src The source of the audio
+		 * @param {Number} instances The number of concurrently playing instances to allow for the channel at any time.
+		 * @return {Object} A result object, containing a tag for preloading purposes.
+		 */
+		register: function(src, instances) {
+			if (!this.flashReady) {
+				// Queue
+				this.queuedInstances.push(src);
+			} else {
+				this.flash.register(src);
+			}
+			return {
+				tag: new SoundLoader(src, this.flash)
+			};
+		},
+
+		/**
+		 * Create a sound instance.
+		 * @method create
+		 * @param {String} src The source to use.
+		 * @return {SoundInstance} A sound instance for playback and control.
+		 */
+		create: function(src) {
+            try {
+                var instance = new SoundInstance(src, this.flash);
+			    instance.owner = this;
+                return instance;
+            } catch (err) {
+                SoundJS.log("Error: Please ensure you have permission to play audio from this location.", err);
+            }
+            return null;
+		},
+
+	// Flash Communication
+		registerPreloadInstance: function(flashId, instance) {
+			this.flashPreloadInstances[flashId] = instance;
+		},
+		unregisterPreloadInstance: function(flashId) {
+			delete this.flashPreloadInstances[flashId];
+		},
+
+		registerSoundInstance: function(flashId, instance) {
+			this.flashInstances[flashId] = instance;
+		},
+		unregisterSoundInstance: function(flashId) {
+			delete this.flashInstances[flashId];
+		},
+
+		// Events from Flash pertaining to a specific SoundInstance
+		handleSoundEvent: function(flashId, method) {
+			var instance = this.flashInstances[flashId];
+			if (instance == null) { return; }
+			var args = [];
+			for (var i=2, l=arguments.length; i<l; i++) { args.push(arguments[i]); }
+			try {
+				if (args.length == 0) {
+					instance[method]();
+				} else {
+					instance[method].apply(instance, args);
+				}
+			} catch(error) {}
+		},
+
+		// Events for Flash pertaining to a specific SoundLoader
+		handlePreloadEvent: function(flashId, method) {
+			var instance = this.flashPreloadInstances[flashId];
+			if (instance == null) { return; }
+			var args = [];
+			for (var i=2, l=arguments.length; i<l; i++) { args.push(arguments[i]); }
+			try {
+				if (args.length == 0) {
+					instance[method]();
+				} else {
+					instance[method].apply(instance, args);
+				}
+			} catch(error) {}
+		},
+
+		// Events from Flash pertaining to general functions
+		handleEvent: function(method) {
+			//SoundJS.log("Handle Event", method);
+			switch (method) {
+				case "ready":
+					clearTimeout(this.loadTimeout);
+					this.handleFlashReady();
+					break;
+			}
+		},
+
+		// Events from Flash when an error occurs.
+        handleErrorEvent: function(error) {
+            SoundJS.log("Handle Error Event", error);
+        },
+
+		toString: function() {
+			return "[FlashPlugin]";
+		}
+
+	}
+
+	window.SoundJS.FlashPlugin = FlashPlugin;
+
+
+	/**
+	 * Flash Sound Instance
+	 * Instances are created by the FlashPlugin, and returned to the user.
+	 * The user can control the audio directly.
+	 * Note that audio control is shuttled to a flash player instance via the flash reference.
+	 * @param {String} src The path to the sound source
+	 * @param {Object} flash A reference to the Flash Player instance that controls the audio.
+	 * @private
+	 */
+	function SoundInstance(src, flash) {
+		this.init(src, flash);
+	}
+
+	var p = SoundInstance.prototype = {
+
+		/**
+		 * The source of the sound.
+		 * @private
+		 */
+		src: null,
+
+		/**
+		 * The unique ID of the instance
+		 * @private
+		 */
+		uniqueId: -1,
+
+		capabilities: null,
+		flash: null,
+		flashId: null, // To communicate with Flash
+
+		loop:0,
+		volume:1,
+		pan:0,
+		muted:false,
+		paused:false,
+
+		/**
+		 * The callback that is fired when a sound has completed playback
+		 * @private
+		 */
+		onComplete: null,
+
+		/**
+		 * The callback that is fired when a sound has completed playback, but has loops remaining.
+		 * @private
+		 */
+		onLoop: null,
+
+		/**
+		 * The callback that is fired when a sound is ready to play.
+		 * @private
+		 */
+		onReady: null,
+
+		/**
+		 * The callback that is fired when a sound has failed to start.
+		 * @private
+		 */
+		onPlayFailed: null,
+
+		/**
+		 * The callback that is fired when a sound has been interrupted.
+		 * @private
+		 */
+		onPlayInterrupted: null,
+
+		init: function(src, flash) {
+			this.uniqueId = FlashPlugin.lastId++;
+			this.src = src;
+			this.flash = flash;
+		},
+
+		initialize: function(flash) {
+			this.flash = flash;
+		},
+
+	// Public API
+
+		interrupt: function() {
+			this.playState = SoundJS.PLAY_INTERRUPTED;
+			if (this.onPlayInterrupted != null) { this.onPlayInterrupted(this); }
+			this.flash.interrupt(this.flashId);
+			this.cleanUp();
+		},
+
+		cleanUp: function() {
+			this.owner.unregisterSoundInstance(this.flashId);
+			SoundJS.playFinished(this);
+		},
+
+		/**
+		 * Play an instance. This API is only used to play an instance after it has been stopped
+		 * or interrupted.
+		 * @private
+		 */
+		play: function(interrupt, delay, offset, loop, volume, pan) {
+			SoundJS.playInstance(this, interrupt, delay, offset, loop, volume, pan);
+		},
+
+		beginPlaying: function(offset, loop, volume, pan) {
+			this.loop = loop;
+			this.paused = false;
+
+            this.flashId = this.flash.playSound(this.src, offset, loop, volume, pan);
+			if (this.flashId == null) {
+				if (this.onPlayFailed != null) { this.onPlayFailed(this); }
+				this.cleanUp();
+				return -1;
+			}
+			this.playState = SoundJS.PLAY_SUCCEEDED;
+			this.owner.registerSoundInstance(this.flashId, this);
+			return 1;
+		},
+
+		/**
+		 * Pause the instance.
+		 * @private
+		 */
+		pause: function() {
+			this.paused = true;
+			return this.flash.pauseSound(this.flashId);
+		},
+
+		/**
+		 * Resume a sound instance that has been paused.
+		 * @private
+		 */
+		resume: function() {
+			this.paused = false;
+			return this.flash.resumeSound(this.flashId);
+		},
+
+		/**
+		 * Stop a sound instance.
+		 * @private
+		 */
+		stop: function() {
+			this.playState = SoundJS.PLAY_FINISHED;
+			this.paused = false;
+			var ok = this.flash.stopSound(this.flashId);
+			this.cleanUp();
+			return ok;
+		},
+
+		/**
+		 * Set the volume of the sound instance.
+		 * @private
+		 */
+		setVolume: function(value) {
+			this.volume = value;
+			return this.flash.setVolume(this.flashId, value)
+		},
+
+		/**
+		 * Get the volume of the sound, not including how the master volume has affected it.
+		 * @private
+		 */
+		getVolume: function() {
+			return this.volume;
+		},
+
+		/**
+		 * Mute the sound.
+		 * @private
+		 */
+		mute: function(value) {
+			this.muted = value;
+			return value ? this.flash.muteSound(this.flashId) : this.flash.unmuteSound(this.flashId);
+		},
+
+		/**
+		 * Get the pan of a sound instance.
+		 * @private
+		 */
+		getPan: function() {
+			return this.pan;
+		},
+
+		/**
+		 * Set the pan of a sound instance.
+		 * @private
+		 */
+		setPan: function(value) {
+			this.pan = value;
+			return this.flash.setPan(this.flashId, value);
+		},
+
+		/**
+		 * Get the position of the playhead in the sound instance.
+		 * @private
+		 */
+		getPosition: function() {
+			return this.flash.getPosition(this.flashId);
+		},
+
+		/**
+		 * Set the position of the playhead in the sound instance.
+		 * @private
+		 */
+		setPosition: function(value) {
+			return this.flash.setPosition(this.flashId, value);
+		},
+
+		/**
+		 * Set the position of the playhead in the sound instance.
+		 * @private
+		 */
+		getDuration: function() {
+			return this.flash.getDuration(this.flashId);
+		},
+
+	// Flash callbacks
+		handleSoundFinished: function() {
+			this.playState = SoundJS.PLAY_FINISHED;
+			if (this.onComplete != null) { this.onComplete(this); }
+			this.cleanUp();
+		},
+
+		handleLoop: function() {
+			if (this.onLoop != null) { this.onLoop(this); }
+		},
+
+		toString: function() {
+			return "[FlashPlugin SoundInstance]"
+		}
+
+	}
+
+	// Do NOT add SoundInstance to window.
+
+
+	/**
+	 * SoundLoader provides a mechanism to preload Flash content via PreloadJS.
+	 * Instances are returned to the preloader, and the load method is called when
+	 * the asset needs to be requested.
+	 *
+	 * SoundLoader has the same APIs as an <audio> tag.
+	 * The instance calls the onloaded, onprogress, and onerror callbacks when necessary.
+	 * @class SoundLoader
+	 * @param {String} src The path to the sound
+	 * @param {Object} flash The flash instance that will do the preloading.
+	 * @private
+	 */
+	function SoundLoader(src, flash) {
+		this.init(src, flash);
+	}
+
+	var p = SoundLoader.prototype = {
+
+		flash:null,
+		src: null,
+
+		flashId: null,
+		progress: -1,
+		readyState: 0,
+		loading: false,
+
+		// Calbacks
+		/**
+		 * The callback that fires when the load completes. This follows HTML tag naming.
+		 * @property onloaded
+		 * @type Function
+		 * @default null
+		 * @private
+		 */
+		onloaded: null,
+
+		/**
+		 * The callback that fires as the load progresses. This follows HTML tag naming.
+		 * @property onprogress
+		 * @type Function
+		 * @default null
+		 * @private
+		 */
+		onprogress: null,
+
+		/**
+		 * The callback that fires if the load hits an error.
+		 * @property onerror
+		 * @type Function
+		 * @default null
+		 * @private
+		 */
+		onError: null,
+
+		// The loader has been created.
+		init: function(src, flash) {
+			this.src = src;
+			this.flash = flash;
+		},
+
+		// Flash has been initialized. If a load call was made before this, call it now.
+		initialize: function(flash) {
+			this.flash = flash;
+			if (this.loading) {
+				this.load(this.src);
+			}
+		},
+
+		/**
+		 * Start loading.
+		 * @param {String} src The path to the sound.
+		 * @return {Boolean} If the load was started. If Flash has not been initialized, the load will fail.
+		 * @private
+		 */
+		load: function(src) {
+			if (this.flash == null) {
+				loading = true;
+				return false;
+			}
+
+			//LM: Consider checking the result of the preload call.
+			this.flashId = this.flash.preload(src);
+			// Associate this preload instance with the FlashID, so callbacks can route here.
+			this.owner.registerPreloadInstance(this.flashId, this);
+			return true;
+		},
+
+		handleProgress: function(loaded, total) {
+			this.progress = loaded / total;
+			if (this.onprogress == null) { return; }
+			this.onprogress({loaded:loaded, total:total, progress:this.progress});
+		},
+
+		handleComplete: function() {
+			this.progress = 1;
+			this.readyState = 4;
+			if (this.onloaded == null) { return; }
+			this.onloaded();
+		},
+
+		handleError: function(error) {
+			if (this.onerror == null) { return; }
+			this.onerror(error);
+		},
+
+		toString: function() {
+			return "[FlashPlugin SoundLoader]";
+		}
+
+
+	}
+
+}(window))
\ No newline at end of file
diff --git a/src/soundjs/HTMLAudioPlugin.js b/src/soundjs/HTMLAudioPlugin.js
new file mode 100644
index 00000000..ab5ffe43
--- /dev/null
+++ b/src/soundjs/HTMLAudioPlugin.js
@@ -0,0 +1,593 @@
+/* Copyright */
+/**
+ * @module SoundJS
+ */
+(function(window) {
+
+	/**
+	 * Play sounds using HTML <audio> tags in the browser.
+	 * @class HTMLAudioPlugin
+	 * @constructor
+	 */
+	function HTMLAudioPlugin() {
+		this.init();
+	}
+
+	/**
+	 * The maximum number of instances that can be played. This is a browser limitation.
+	 * @property MAX_INSTANCES
+	 * @type Number
+	 * @default 30
+	 * @static
+	 */
+	HTMLAudioPlugin.MAX_INSTANCES = 30;
+
+	/**
+	 * The capabilities of the plugin.
+	 * @property capabilities
+	 * @type Object
+	 * @default null
+	 * @static
+	 */
+	HTMLAudioPlugin.capabilities = null;
+
+	HTMLAudioPlugin.lastId = 0;
+
+	// Event constants
+	HTMLAudioPlugin.AUDIO_READY = "canplaythrough";
+	HTMLAudioPlugin.AUDIO_ENDED = "ended";
+	HTMLAudioPlugin.AUDIO_ERROR = "error"; //TODO: Handle error cases
+	HTMLAudioPlugin.AUDIO_STALLED = "stalled";
+
+	//TODO: Not used. Chrome can not do this when loading audio from a server.
+	HTMLAudioPlugin.fillChannels = false;
+
+	/**
+	 * Determine if the plugin can be used.
+	 * @method isSupported
+	 * @return {Boolean} If the plugin can be initialized.
+	 * @static
+	 */
+	HTMLAudioPlugin.isSupported = function() {
+		if (BrowserDetect && BrowserDetect.isIOS) { return false; }
+		HTMLAudioPlugin.generateCapabilities();
+		var t = HTMLAudioPlugin.tag;
+		if (t == null || t.canPlayType == null) { return false; }
+		return true;
+	};
+
+	/**
+	 * Determine the capabilities of the plugin.
+	 * @method generateCapabiities
+	 * @static
+	 */
+	HTMLAudioPlugin.generateCapabilities = function() {
+		if (HTMLAudioPlugin.capabilities != null) { return; }
+		var t = HTMLAudioPlugin.tag = document.createElement("audio");
+		var c = HTMLAudioPlugin.capabilities = {
+			panning: false,
+			volume: true,
+			mp3: t.canPlayType("audio/mp3") != "no" && t.canPlayType("audio/mp3") != "",
+			ogg: t.canPlayType("audio/ogg") != "no" && t.canPlayType("audio/ogg") != "",
+			mpeg: t.canPlayType("audio/mpeg") != "no" && t.canPlayType("audio/mpeg") != "",
+			channels: HTMLAudioPlugin.MAX_INSTANCES
+		};
+		// TODO: Other props?
+	}
+
+	var p = HTMLAudioPlugin.prototype = {
+
+		capabilities: null,
+		FT: 0.001,
+		channels: null,
+
+		init: function() {
+			this.capabilities = HTMLAudioPlugin.capabilities;
+			this.channels = {};
+		},
+
+		/**
+		 * Pre-register a sound instance when preloading/setup.
+		 * @method register
+		 * @param {String} src The source of the audio
+		 * @param {Number} instances The number of concurrently playing instances to allow for the channel at any time.
+		 * @return {Object} A result object, containing a tag for preloading purposes.
+		 */
+		register: function(src, instances) {
+			var channel = TagChannel.get(src);
+			var tag;
+			for (var i=0, l=instances||1; i<l; i++) {
+				tag = this.createTag(src);
+				channel.add(tag);
+			}
+			return {
+				tag: tag // Return one instance for preloading purposes
+			};
+		},
+
+		createTag: function(src) {
+			var tag = document.createElement("audio");
+			tag.preload = false;
+			tag.src = src;
+			//tag.type = "audio/ogg"; //LM: Need to set properly
+			return tag;
+		},
+
+		/**
+		 * Create a sound instance.
+		 * @method create
+		 * @param {String} src The source to use.
+		 * @return {SoundInstance} A sound instance for playback and control.
+		 */
+		create: function(src) {
+			var instance = new SoundInstance(src);
+			instance.owner = this;
+			return instance;
+		},
+
+		toString: function() {
+			return "[HTMLAudioPlugin]";
+		}
+
+	}
+
+	window.SoundJS.HTMLAudioPlugin = HTMLAudioPlugin;
+
+
+
+	/**
+	 * Sound Instances are created when any calls to SoundJS.play() are made.
+	 * The instances are returned by the active plugin for control by the user.
+	 * Users can control audio directly through the instance.
+	 * @class SoundInstance
+	 * @param {String} src The path to the sound
+	 * @constructor
+	 */
+	function SoundInstance(src) {
+		this.init(src);
+	}
+
+	var p = SoundInstance.prototype = {
+
+		//TODO: Fading out when paused/stopped?
+
+		/**
+		 * The source of the sound.
+		 * @property src
+		 * @type String
+		 * @default null
+		 */
+		src: null,
+
+		/**
+		 * The unique ID of the instance
+		 * @property uniqueId
+		 * @type String | Number
+		 * @default -1
+		 */
+		uniqueId:-1,
+
+		/**
+		 * The play state of the sound. Play states are defined as constants on SoundJS
+		 * @property playState
+		 * @type String
+		 * @default null
+		 */
+		playState: null,
+
+		/**
+		 * The plugin that created the instance
+		 * @property owner
+		 * @type HTMLAudioPlugin
+		 * @default null
+		 */
+		owner: null,
+
+		loaded: false,
+		paused: false,
+		lastInterrupt: SoundJS.INTERRUPT_NONE,
+		offset: 0,
+		delay: 0,
+		volume: 1,
+		pan: 0,
+		muted: false,
+
+		remainingLoops: 0,
+		delayTimeout: -1,
+		tag: null,
+
+		/**
+		 * The callback that is fired when a sound has completed playback
+		 * @property onComplete
+		 * @type Function
+		 * @default null
+		 */
+		onComplete: null,
+
+		/**
+		 * The callback that is fired when a sound has completed playback, but has loops remaining.
+		 * @property onLoop
+		 * @type Function
+		 * @default null
+		 */
+		onLoop: null,
+
+		/**
+		 * The callback that is fired when a sound is ready to play.
+		 * @property onReady
+		 * @type Function
+		 * @default null
+		 */
+		onReady: null,
+
+		/**
+		 * The callback that is fired when a sound has failed to start.
+		 * @property onPlayFailed
+		 * @type Function
+		 * @default null
+		 */
+		onPlayFailed: null,
+
+		/**
+		 * The callback that is fired when a sound has been interrupted.
+		 * @property onPlayInterrupted
+		 * @type Function
+		 * @default null
+		 */
+		onPlayInterrupted: null,
+
+		// Proxies, make removing listeners easier.
+		endedHandler: null,
+		readyHandler: null,
+		stalledHandler:null,
+
+		// Constructor
+		init: function(src) {
+			this.uniqueId = HTMLAudioPlugin.lastId++;
+			this.src = src;
+			this.endedHandler = SoundJS.proxy(this.handleSoundComplete, this);
+			this.readyHandler = SoundJS.proxy(this.handleSoundReady, this);
+			this.stalledHandler = SoundJS.proxy(this.handleSoundStalled, this);
+		},
+
+		cleanUp: function() {
+			var tag = this.tag;
+			if (tag != null) {
+				tag.pause();
+				try { tag.currentTime = 0; } catch (e) {} // Reset Position
+				tag.removeEventListener(HTMLAudioPlugin.AUDIO_ENDED, this.endedHandler, false);
+				tag.removeEventListener(HTMLAudioPlugin.AUDIO_READY, this.readyHandler, false);
+				TagChannel.setInstance(this.src, tag);
+				this.tag = null;
+			}
+			SoundJS.playFinished(this);
+		},
+
+		interrupt: function () {
+			if (this.tag == null) { return; }
+			this.playState = SoundJS.PLAY_INTERRUPTED;
+			if (this.onPlayInterrupted) { this.onPlayInterrupted(this); }
+			this.cleanUp();
+			this.paused = false;
+		},
+
+	// Public API
+		/**
+		 * Play an instance. This API is only used to play an instance after it has been stopped
+		 * or interrupted.`
+		 * @method play
+		 * @param {String} interrupt How this sound interrupts other instances with the same source. Interrupt values are defined as constants on SoundJS.
+		 * @param {Number} delay The delay in milliseconds before the sound starts
+		 * @param {Number} offset How far into the sound to begin playback.
+		 * @param {Number} loop The number of times to loop the audio. Use -1 for infinite loops.
+		 * @param {Number} volume The volume of the sound between 0 and 1.
+		 * @param {Number} pan The pan of the sound between -1 and 1. Note that pan does not work for HTML Audio.
+		 */
+		play: function(interrupt, delay, offset, loop, volume, pan) {
+			this.cleanUp();
+			SoundJS.playInstance(this, interrupt, delay, offset, loop, volume, pan);
+		},
+
+		// Called by SoundJS when ready
+		beginPlaying: function(offset, loop, volume, pan) {
+			var tag = this.tag = TagChannel.getInstance(this.src);
+			if (tag == null) { this.playFailed(); return -1; }
+
+			tag.addEventListener(HTMLAudioPlugin.AUDIO_ENDED, this.endedHandler, false);
+
+			this.offset = offset;
+			this.volume = volume;
+			this.updateVolume();
+			this.remainingLoops = loop;
+
+			if (tag.readyState !== 4) {
+				tag.addEventListener(HTMLAudioPlugin.AUDIO_READY, this.readyHandler, false);
+				tag.addEventListener(HTMLAudioPlugin.AUDIO_STALLED, this.stalledHandler, false);
+				tag.load();
+			} else {
+				this.handleSoundReady(null);
+			}
+
+			return 1;
+		},
+
+		handleSoundStalled: function(event) {
+			SoundJS.log("* Audio Stalled")
+			if (this.onPlayFailed != null) { this.onPlayFailed(this); }
+			this.cleanUp();
+		},
+
+		handleSoundReady: function(event) {
+			this.playState = SoundJS.PLAY_SUCCEEDED;
+			this.tag.removeEventListener(HTMLAudioPlugin.AUDIO_READY, this.readyHandler, false);
+
+			if(this.offset >= this.getDuration()) {
+				SoundJS.log("* Out of range", this.offset, this.tag.currentTime);
+				this.playFailed();
+				return;
+			}
+
+			this.tag.currentTime = this.offset * 0.001;
+			this.tag.play();
+		},
+
+		/**
+		 * Pause the instance.
+		 * @method pause
+		 * @return {Boolean} If the pause call succeeds.
+		 */
+		pause: function() {
+			this.paused = true;
+			// Note: when paused by user, we hold a reference to our tag. We do not release it until stopped.
+			if (this.tag != null) {
+				this.tag.pause();
+				return false;
+			}
+			return true;
+		},
+
+		/**
+		 * Resume a sound instance that has been paused.
+		 * @method resume
+		 * @return {Boolean} If the resume call succeeds.
+		 */
+		resume: function() {
+			this.paused = false;
+			if (this.tag != null) {
+				this.tag.play();
+				return false;
+			}
+			return true;
+		},
+
+		/**
+		 * Stop a sound instance.
+		 * @method stop
+		 * @return {Boolean} If the stop call succeeds.
+		 */
+		stop: function() {
+			this.pause();
+			this.playState = SoundJS.PLAY_FINISHED;
+			this.cleanUp();
+			return true;
+		},
+
+		// Called by SoundJS
+		setMasterVolume: function(value) {
+			this.updateVolume();
+			return true;
+		},
+
+		/**
+		 * Set the volume of the sound instance.
+		 * @method setVolume
+		 * @param value
+		 * @return {Boolean} If the setVolume call succeeds.
+		 */
+		setVolume: function(value) {
+			this.volume = value;
+			this.updateVolume();
+			return true;
+		},
+
+		updateVolume: function() {
+			if (this.tag != null) {
+				this.tag.volume = this.muted ? 0 : this.volume * SoundJS.masterVolume;
+				return true;
+			} else {
+				return false;
+			}
+		},
+
+		/**
+		 * Get the volume of the sound, not including how the master volume has affected it.
+		 * @method getVolume
+		 * @param value
+		 * @return The volume of the sound.
+		 */
+		getVolume: function(value) {
+			return this.volume;
+		},
+
+		/**
+		 * Mute the sound.
+		 * @method mute
+		 * @param {Boolean} isMuted If the sound should be muted or not.
+		 * @return {Boolean} If the mute call succeeds.
+		 */
+		mute: function(isMuted) {
+			this.muted = isMuted;
+			this.updateVolume();
+			return true;
+		},
+
+		/**
+		 * Set the pan of a sound instance. Note that this does not work in HTML audio.
+		 * @method setPan
+		 * @param {Number} value The pan value between -1 (left) and 1 (right).
+		 * @return {Number} If the setPan call succeeds.
+		 */
+		setPan: function(value) { return false; }, // Can not set pan in HTML
+
+		/**
+		 * Get the pan of a sound instance. Note that this does not work in HTML audio.
+		 * @method getPan
+		 * @return {Number} The value of the pan between -1 (left) and 1 (right).
+		 */
+		getPan: function() { return 0; },
+
+		/**
+		 * Get the position of the playhead in the sound instance.
+		 * @method getPosition
+		 * @return {Number} The position of the playhead in milliseconds.
+		 */
+		getPosition: function() {
+			if (this.tag == null) { return 0; }
+			return this.tag.currentTime * 1000;
+		},
+
+		/**
+		 * Set the position of the playhead in the sound instance.
+		 * @method setPosition
+		 * @param {Number} value The position of the playhead in milliseconds.
+		 */
+		setPosition: function(value) {
+			if (this.tag == null) { return false; }
+			try {
+				this.tag.currentTime = value * 0.001;
+			} catch(error) { // Out of range
+				return false;
+			}
+			return true;
+		},
+
+		/**
+		 * Get the duration of the sound instance.
+		 * @method getDuration
+		 * @return {Number} The duration of the sound instance in milliseconds.
+		 */
+        getDuration: function() {
+            if (this.tag == null) { return 0; }
+            return this.tag.duration * 1000;
+        },
+
+		handleSoundComplete: function(event) {
+			if (this.remainingLoops != 0) {
+				this.remainingLoops--;
+				try { this.tag.currentTime = 0; } catch(error) {}
+				this.tag.play();
+				if (this.onLoop != null) { this.onLoop(this); }
+				return;
+			}
+
+			this.playState = SoundJS.PLAY_FINISHED;
+			if (this.onComplete != null) { this.onComplete(this); }
+			this.cleanUp();
+		},
+
+		// Play has failed
+		playFailed: function() {
+			this.playState = SoundJS.PLAY_FAILED;
+			if (this.onPlayFailed != null) { this.onPlayFailed(this); }
+			this.cleanUp();
+		},
+
+		toString: function() {
+			return "[HTMLAudio SoundInstance]";
+		}
+
+	}
+
+	// Do not add to window.
+
+
+	/**
+	 * The TagChannel is an object pool for HTML tag instances.
+	 * In Chrome, we have to pre-create the number of tag instances that we are going to play
+	 * before we load the data, otherwise the audio stalls. LM: Pretty sure this is a bug.
+	 * @param src The source of the channel.
+	 * @private
+	 */
+	function TagChannel(src) {
+		this.init(src);
+	}
+
+	/**
+	 * Contains each sound channel, indexed by src.
+	 * @private
+	 */
+	TagChannel.channels = {};
+	/** Get a tag channel.
+	 * @private
+	 */
+	TagChannel.get = function(src) {
+		var channel = TagChannel.channels[src];
+		if (channel == null) {
+			channel = TagChannel.channels[src] = new TagChannel(src);
+		}
+		return channel;
+	}
+
+	/** Get a tag instance. This is a shortcut method.
+	 * @private
+	 */
+	TagChannel.getInstance = function(src) {
+		var channel = TagChannel.channels[src];
+		if (channel == null) { return null; }
+		return channel.get();
+	}
+
+	/** Return a tag instance. This is a shortcut method.
+	 * @private
+	 */
+	TagChannel.setInstance = function(src, tag) {
+		var channel = TagChannel.channels[src];
+		if (channel == null) { return null; }
+		return channel.set(tag);
+	}
+
+	TagChannel.prototype = {
+
+		src: null,
+		length: 0,
+		available: 0,
+		tags: null,
+
+		init: function(src) {
+			this.src = src;
+			this.tags = [];
+		},
+
+		add: function(tag) {
+			this.tags.push(tag);
+			this.length++;
+			this.available = this.tags.length;
+		},
+
+		get: function() {
+			if (this.tags.length == 0) { return null; }
+			this.available = this.tags.length;
+			var tag = this.tags.pop();
+			document.body.appendChild(tag);
+			return tag;
+		},
+
+		set: function(tag) {
+			var index = this.tags.indexOf(tag);
+			if (index == -1) {
+				this.tags.push(tag);
+			}
+
+				document.body.removeChild(tag);
+
+			this.available = this.tags.length;
+		},
+
+		toString: function() {
+			return "[HTMLAudioPlugin TagChannel]";
+		}
+	}
+
+
+
+}(window));
\ No newline at end of file
diff --git a/src/soundjs/SoundJS.js b/src/soundjs/SoundJS.js
index 75a56df9..f7870a24 100644
--- a/src/soundjs/SoundJS.js
+++ b/src/soundjs/SoundJS.js
@@ -1,1182 +1,778 @@
-/*
-* SoundJS by Grant Skinner. May 25, 2011
-* Visit http://www.gskinner.com/ for documentation, updates and examples.
-*
-*
-* Copyright (c) 2011 Grant Skinner
-* 
-* 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.
-*/
-
-/**
-* SoundJS is a utility for managing HTML5 audio elements.
-* The SoundJS class uses a static API and can't be instantiated directly.
-* @module SoundJS
-* 
-*/
-(function(window) {
-	
-	/**
-	 * @class SoundJS
-	 * @static
-	 */
-	function SoundJS() {
-		throw "SoundJS cannot be instantiated"; 
-	}
-	
-	/**
-	 * The duration in milliseconds to wait before declaring a timeout when loading a sound.
-	 * 
-	 * @property AUDIO_TIMEOUT
-	 *  
-	 * @static
-	 * @default 8000
-	 * @type Number
-	 */
-	SoundJS.AUDIO_TIMEOUT = 8000;
-	
-	/**
-	 * The interrupt mode to use when all instances are in use. Interrupt the the first instance.
-	 * 
-	 * @property INTERRUPT_ANY
-	 * 
-	 * @static
-	 * @default 1
-	 * @type Number
-	 * 
-	 */
-	SoundJS.INTERRUPT_ANY = 1;
-	
-	/**
-	 * The interrupt mode to use when all instances are in use. Interrupt the sound that is at the earliest position.
-	 * 
-	 * @property INTERRUPT_EARLY
-	 *
-	 * @static
-	 * @default 2
-	 * @type Number
-	 */
-	SoundJS.INTERRUPT_EARLY = 2;
-	
-	/**
-	 * The interrupt mode to use when all instances are in use. Interrupt the sound that is at the latest position.
-	 *  
-	 * @property INTERRUPT_LATE
-	 * 
-	 * @static
-	 * @default 3
-	 * @type Number
-	 * 
-	 */
-	SoundJS.INTERRUPT_LATE = 3;
-	
-	/**
-	 * The interrupt mode to use when all instances are in use. Do not interrupt any sounds.
-	 * 
-	 * @property INTERRUPT_NONE
-	 * 
-	 * @static
-	 * @default 4
-	 * @type Number
-	 */
-	SoundJS.INTERRUPT_NONE = 4;
-	
-	/**
-	 * The function to call whenever progress changes.
-	 * 
-	 * @static
-	 * @type Function
-	 */
-	SoundJS.onProgress = null;
-	
-	/**
-	 * The function to call when a loading sound times out. The timeout duration is determined by the AUDIO_TIMEOUT parameter.
-	 * 
-	 * @static 
-	 * @type Function
-	 */
-	SoundJS.onSoundTimeout = null;
-	
-	/**
-	 * The function to call when an error occurs loading a sound file.
-	 * 
-	 * @static
-	 * @type Function
-	 */
-	SoundJS.onSoundLoadError = null;
-	
-	/**
-	 * The function to call when a sound has finished loading.
-	 * 
-	 * @static
-	 * @type Function
-	 */
-	SoundJS.onSoundLoadComplete = null;
-	
-	/**
-	 * The function to call when all sounds in the preload queue have finished loading.
-	 * 
-	 * @static
-	 * @type Function
-	 */
-	SoundJS.onLoadQueueComplete = null;
-	
-	/**
-	 * The function to call when a sound finishes playing.
-	 *
-	 * @static
-	 * @type Function
-	 */
-	SoundJS.onSoundComplete = null;
-	
-	
-	/**
-	 * An array containing all of the sound objects created by this manager.
-	 * 
-	 * @property soundHash
-	 * @type Array
-	 * @protected
-	 *
-	 */
-	SoundJS.soundHash = [];
-	
-	/**
-	 * An array containing all of the sounds waiting to be loaded.
-	 * 
-	 * @property loadQueue
-	 * @type Array
-	 * @protected
-	 * 
-	 */
-	SoundJS.loadQueue = [];
-	
-	/**
-	 * The number of items left in loading queue.
-	 * 
-	 * @property itemsToLoad
-	 * @type Number
-	 * @private
-	 * 
-	 */
-	SoundJS.itemsToLoad = 0;
-	
-	/**
-	 * The number of currently playing instances.
-	 * 
-	 * @property instanceCount
-	 * @type Number
-	 * @private
-	 * 
-	 */
-	SoundJS.instanceCount = 0;
-	
-	/**
-	 * The assumed maximum number of sounds, based on some of the browser limits we have encountered. Currently, this can not be determined via code or APIs.
-	 * 
-	 * @private
-	 * @static
-	 * 
-	 */
-	SoundJS.INST_MAX = 35;
-	
-	/**
-	 * Float error tolerance.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.FT = 0.001;
-	
-	/**
-	 * The name of the JavaScript event dispatched by an audio tag when an error occurs.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.AUDIO_ERROR = "error";
-	
-	/**
-	 * The name of the JavaScript event dispatched by an audio tag when loading progress changes.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.AUDIO_PROGRESS = "progress";
-	
-	/**
-	 * The name of the JavaScript event dispatched by an audio tag when an a sound has finished loading.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.AUDIO_COMPLETE = "canplaythrough";
-	
-	/**
-	 * The name of the JavaScript event dispatched by an audio tag when an a sound has finished playing.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.AUDIO_ENDED = "ended";
-	
-	/**
-	 * The name of the JavaScript event dispatched by an audio tag when an a sound has stalled
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.AUDIO_STALLED = "stalled";
-	
-	/**
-	 * Master volume value.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS._master = 1;
-	
-	/**
-	 * Current Load progress.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS._currentLoad = 0;
-	
-	/**
-	 * Manage, load, and perform DOM injection of a sound. If the load queue is empty, it will trigger an immediate load,
-	 * otherwise it will be added to the end of the loading queue and loaded in sequence. If instances of a sound by that 
-	 * name already exist, the number of instances is increased and the element 'src' is ignored.
-	 * 
-	 * @method add
-	 * 
-	 * @param {String} name : The reference to this sound effect
-	 * @param {String} src : The filepath to load from
-	 * @param {Number} instances : The number of simultaneous versions of this sound you wish to play (max sounds limited by Browser and Computer).
-	 * 
-	 */
-	SoundJS.add = function(name, src, instances) {
-		SoundJS.loadQueue.push({name:name, src:src, instances:instances});
-		
-		// start loading if the queue is empty
-		if (SoundJS.loadQueue.length == 1) {
-			SoundJS.itemsToLoad = 1;
-			SoundJS.loadNext();
-		} else {
-			SoundJS.itemsToLoad++;
-		}
-	};
-	
-	/**
-	 * Manage, load, and perform DOM injections of a sound, or set of sounds.
-	 * This method is identical to the SoundJS.add() method, except:
-	 * 	1) An array of objects representing the parameters for each add call is required.
-	 * 	   [{name:'soundName', src:'sound.mp3', instances:1}, {name:'soundName', src:'sound.ogg', instances:4}]
-	 * 
-	 *  2) It waits until all items are added to the queue before beginning the load operation, which can 
-	 *	   even out erroneous finished loading calls in high speed environments such as local environments 
-	 *	   or with cached sounds.
-	 * 
-	 * @method addBatch
-	 * 
-	 * @param {Array} params : Array of 'name:, src:, instances:' objects.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.addBatch = function(params) {
-		var l = params.length;
-		while(params.length) {
-			SoundJS.loadQueue.push(params.shift());
-		}
-		
-		// start loading the queue is empty
-		if (SoundJS.loadQueue.length == l) {
-			SoundJS.loadNext();
-			SoundJS.itemsToLoad = l;
-		} else {
-			SoundJS.itemsToLoad++;
-		}
-	};
-	
-	/**
-	 * Play the a sound file with the defined properties.
-	 *
-	 * The function returns one of three things; 
-	 *	1) The instance number played if sound was played successfully
-	 *	2) 'NaN' if an erroneous parameter is passed, or the interrupt method forbids playing the sound
-	 * 	3) -1 on a delayed call, as the instance being played cannot be determined till the delay is over
-	 *
-	 * If the instance is needed on a delayed call, the best practice is to delay the call like so:
-	 * 	e.g. setTimeout(function(){ myVar = SoundJS.play("sound")}, 3000);
-	 * 	Note: this closure is needed for full functionality cross browsers.
-	 * 
-	 * @method play
-	 * 
-	 * @param {String} name : Specifies the url to the sound file to play (as defined in the add functions).
-	 * @param {Number} interrupt = SoundJS.INTERRUPT_NONE: (optional) Defines the interrupt behavior if all instances are currently used.
-	 * @param {Number} volume = 1: (optional) Specifies to volume at which to play that sound instance.
-	 * @param {Boolean} loop = false: (optional) Sets the loop parameter on the sound instance.
-	 * @param {Number} delay = 0: (optional) Specifies how long to wait before looking for a sound instance to play the sound.
-	 * 
-	 * @return {Number} The index of the sound played, NaN, or -1.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.play = function(name, interrupt, volume, loop, delay) {
-		// deal with illegal input		
-		if (name == null || SoundJS.soundHash[name] == null || SoundJS.soundHash[name].length == 0 ||
-			(interrupt != SoundJS.INTERRUPT_ANY && interrupt != SoundJS.INTERRUPT_EARLY && interrupt != SoundJS.INTERRUPT_LATE
-			&& interrupt != SoundJS.INTERRUPT_NONE && interrupt != null)) { return NaN; }
-		
-		// assign default values if null and correct inputs
-		if (interrupt == null) { interrupt = SoundJS.INTERRUPT_NONE; }
-		if (loop == null) { loop = false; }
-		if (!delay) { delay = 0; }
-		if (volume == null || volume > 1) { volume = 1; }
-		else if (volume < 0) { volume = 0; }
-		
-		// move onto playing
-		if (delay > 0) {
-			setTimeout(function(){SoundJS.beginPlaying(name, interrupt, volume, loop);}, delay); // closure to fix issues in IE9
-		} else {
-			return SoundJS.beginPlaying(name, interrupt, volume, loop);
-		}
-		
-		return -1;
-	};
-	
-	/**
-	 * Get the current master volume level
-	 * 
-	 * @method getMasterVolume
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.getMasterVolume = function() { return SoundJS._master; }
-	
-	
-	/**
-	 * Change the master volume level
-	 * 
-	 * @method setMasterVolume
-	 * 
-	 * @param {Number} value = null: (optional) New master volume.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.setMasterVolume = function(value) {
-		// don't deal with no volume
-		if (Number(value) == null) { return; }
-		
-		// fix out of range
-		if (value < 0) { value = 0; }
-		else if (value > 1) { value = 1; }
-		
-		var i, l, o, old, sound;
-		
-		old = SoundJS._master;
-		SoundJS._master = value;
-		
-		if (SoundJS._master != old) {
-			// adjust all
-			for(sound in SoundJS.soundHash) {
-				o = SoundJS.soundHash[sound];
-				l = o.length;
-				for(i = 0; i < l; i++) {
-					o[i].volume = o[i].storedVolume * SoundJS._master;
-				}
-			}
-		}
-	};
-	
-	/**
-	 * Remove the specified number of sound instances from the DOM. WARNING: remove ignores interrupt 
-	 * modes and current actions, and will remove the last instances regardless of their status.
-	 * 
-	 * @method remove
-	 * 
-	 * @param {String} name = null: (optional) Note that the function removes all sounds if it is null.
-	 * @param {Number} count = null: (optional) Note that the function removes all instances if it is null.
-	 * 
-	 * @return {Boolean} Success of operation.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.remove = function(name, count) {
-		var i, l, o, sound;
-		
-		// global remove
-		if (name == null){
-			for(sound in SoundJS.soundHash) {
-				o = SoundJS.soundHash[sound];
-				l = o.length;
-				do {
-					SoundJS.stop(sound, l-1);
-					o[l-1].currentSrc = "";
-					document.body.removeChild(o[l-1]);
-					o.pop();
-					l = o.length;
-					SoundJS.instanceCount--;
-				} while(l);
-			}
-		} else {
-			o = SoundJS.soundHash[name];
-			if (o == null) { return false; }
-			l = o.length;
-			
-			// sound remove
-			if (count == null) {
-				do {
-					SoundJS.stop(name, l-1);
-					o[l-1].currentSrc = "";
-					document.body.removeChild(o[l-1]);
-					o.pop();
-					l = o.length;
-					SoundJS.instanceCount--;
-				} while(l);
-			// count remove
-			} else {
-				if (count <= 0 || l <= 0) { return false; }
-				l--;
-				
-				for(i = 0; i <= l && i < count; i++) {
-					SoundJS.stop(name, l-i);
-					o[l-i].currentSrc = "";
-					document.body.removeChild(o[l-i]);
-					o.pop();
-					SoundJS.instanceCount--;
-				}
-			}
-		}
-		
-		return true;
-	};
-	
-	/**
-	 * Adjust the volume of specified instance(s) of this sound.
-	 * 
-	 * @method setVolume
-	 * 
-	 * @param {String} value : The volume to set the target to.
-	 * @param {String} name = null: (optional) If null the function adjusts all sounds.
-	 * @param {Number} instance = null: (optional) If null the function adjusts all instances.
-	 * 
-	 * @return {Boolean} Success of operation.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.setVolume = function(value, name, instance) {
-		var i, l, o, sound, stored;
-		
-		// don't deal with no volume
-		if (value == null) { return false; }
-		stored = value;
-		value = value * SoundJS._master;
-		
-		// global volume adjust
-		if (name == null){
-			for(sound in SoundJS.soundHash) {
-				o = SoundJS.soundHash[sound];
-				l = o.length;
-				for(i = 0; i < l; i++) {
-					o[i].storedVolume = value;
-					o[i].volume = value;
-				}
-			}
-		} else {
-			o = SoundJS.soundHash[name];
-			if (o == null) { return false; }
-			l = o.length;
-				
-			// sound volume adjust
-			if (instance == null) {
-				for(i = 0; i < l; i++) {
-					o[i].storedVolume = value;
-					o[i].volume = value;
-				}
-			// instance volume adjust
-			} else {
-				if (l <= instance) { return false; }
-				o[instance].storedVolume = value;
-				o[instance].volume = value;
-			}
-		}
-		
-		return true;
-	};
-	
-	/**
-	 * Get the volume of a sound instance. If no instance is provided the volume of the first instance will be returned.
-	 *
-	 * @method getVolume
-	 *
-	 * @param {String} name = null: (optional) If null the function adjusts all sounds.
-	 * @param {Number} instance = null: (optional) If null the function gets the first instance.
-	 *
-	 * @return {Number} the volume of the specified instance or -1 if the instance does not exist.
-	 *
-	 * @static
-	 */
-	SoundJS.getVolume = function(name, instance) {
-		var o = SoundJS.soundHash[name];
-		if (o == null || o.length == 0) { return -1; }
-		if (instance == null) {
-			return o[1].storedVolume;
-		} else {
-			if (o.length < instance) { return -1; }
-			return o[instance].storedVolume;
-		}
-	}
-	
-	/**
-	 * Specify the mute value of specified instance(s) of this sound.
-	 * 
-	 * @method setMute
-	 * 
-	 * @param {String} isMuted : Whether or not the target is muted.
-	 * @param {String} name = null: (optional) Note: The function adjusts all sounds if the value is null.
-	 * @param {Array} instance = null: (optional) Note: The function adjusts all instances if the value is null.
-	 * 
-	 * @return {Boolean} Success of operation.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.setMute = function(isMuted, name, instance) {
-		var i, l, o, sound;
-		
-		// don't deal with no volume
-		if (isMuted == null) { return false; }
-		
-		// global volume adjust
-		if (name == null){
-			for(sound in SoundJS.soundHash) {
-				o = SoundJS.soundHash[sound];
-				l = o.length;
-				for(i = 0; i < l; i++) {
-					o[i].muted = isMuted;
-				}
-			}
-		} else {
-			o = SoundJS.soundHash[name];
-			if (o == null) { return false; }
-			l = o.length;
-				
-			// sound volume adjust
-			if (instance == null) {
-				for (i = 0; i < l; i++) {
-					o[i].muted = isMuted;
-				}
-			// instance volume adjust
-			} else {
-				if (l <= instance) { return false; }
-				o[instance].muted = isMuted;
-			}
-		}
-		
-		return true;
-	};
-	
-	/**
-	 * Pause specified instance(s) of this sound.
-	 * 
-	 * @method pause
-	 * 
-	 * @param {String} name = null: (optional) If null the function adjusts all sounds.
-	 * @param {Number} instance = null: (optional) If null the function adjusts all instances.
-	 * 
-	 * @return {Boolean} Success of operation.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.pause = function(name, instance) {
-		var i, l, o, sound;
-		
-		// global pause
-		if (name == null){
-			for(sound in SoundJS.soundHash) {
-				o = SoundJS.soundHash[sound];
-				l = o.length;
-				for(i = 0; i < l; i++) {
-					o[i].pause();
-				}
-			}
-		} else {
-			o = SoundJS.soundHash[name];
-			if (o == null) { return false; }
-			l = o.length;
-			
-			// sound pause
-			if (instance == null) {
-				for(i = 0; i < l; i++) {
-					o[i].pause();
-				}
-			// instance pause
-			} else {
-				if (l <= instance) { return false; }
-				o[instance].pause();
-			}
-		}
-		
-		return true;
-	};
-	
-	/**
-	 * Resume specified instance(s) of this sound.
-	 * 
-	 * @method resume
-	 * 
-	 * @param {String} name = null: (optional) If null the function adjusts all sounds.
-	 * @param {String} instance = null: (optional) If null the function adjusts all instances.
-	 * 
-	 * @return {Boolean} Success of operation.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.resume = function(name, instance) {
-		var i, l, o, sound;
-		
-		// global resume
-		if (name == null){
-			for(sound in SoundJS.soundHash) {
-				l = SoundJS.soundHash[sound].length;
-				for(i = 0; i < l; i++) {
-					o = SoundJS.soundHash[sound][i];
-					if (o.loop || (o.currentTime != o.duration && o.currentTime != 0)){
-						o.play();
-					}
-				}
-			}
-		} else {
-			if (SoundJS.soundHash[name] == null) { return false; }
-			l = SoundJS.soundHash[name].length;
-			
-			// sound resume
-			if (instance == null) {
-				for(i = 0; i < l; i++) {
-					o = SoundJS.soundHash[name][i];
-					if (o.loop || (o.currentTime != o.duration && o.currentTime != 0)){
-						o.play();
-					}
-				}
-			// instance resume
-			} else {
-				if (l <= instance) { return false; }
-				o = SoundJS.soundHash[name][instance];
-				if (o.loop || (o.currentTime != o.duration && o.currentTime != 0)){
-					o.play();
-				}
-			}
-		}
-		
-		return true;
-	};
-	
-	/**
-	 * Stop specified instance(s) of this sound.
-	 * 
-	 * @method stop
-	 * 
-	 * @param {String} name = null: (optional) If null the function adjusts all sounds.
-	 * @param {String} instance = null: (optional) If null the function adjusts all instances.
-	 * 
-	 * @return {Boolean} Success of operation.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.stop = function(name, instance) {
-		var i, l, o, sound;
-		
-		// global stop
-		if (name == null){
-			for(sound in SoundJS.soundHash) {
-				l = SoundJS.soundHash[sound].length;
-				for(i = 0; i < l; i++) {
-					o = SoundJS.soundHash[sound][i];
-					try { o.currentTime = 0; } catch(e) {} // Firefox chokes on this for stopped sounds.
-					o.pause();
-				}
-			}
-		} else {
-			if (SoundJS.soundHash[name] == null) { return false; }
-			l = SoundJS.soundHash[name].length;
-			
-			// sound stop
-			if (instance == null) {
-				for(i = 0; i < l; i++) {
-					o = SoundJS.soundHash[name][i];
-					o.currentTime = 0;
-					o.pause();
-				}
-			// instance stop
-			} else {
-				if (l <= instance) { return false; }
-				o = SoundJS.soundHash[name][instance];
-				o.currentTime = 0;
-				o.pause();
-			}
-		}
-		
-		return true;
-	};
-	
-	/**
-	 * Check to see if specified sound is loaded/valid.
-	 * If the value of the name is null, check all sounds are loaded.
-	 *
-	 * @method isLoaded
-	 *
-	 * @param {String} name = null: (optional) The sound to check.
-	 * 
-	 * @return {Boolean} Indicating if the specified sound is valid & loaded 
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.isLoaded = function(name) {
-		var result = true;
-		var sound;
-			
-		if (name == null) {
-			// global isLoaded
-			for(sound in SoundJS.soundHash) {
-				result = result && SoundJS.soundHash[sound] && SoundJS.soundHash[sound][0] && SoundJS.soundHash[sound][0].loaded;
-				if (!result) { return result; }
-			}
-		} else {
-			// sound isLoaded
-			return SoundJS.soundHash[name] && SoundJS.soundHash[name][0] && SoundJS.soundHash[name][0].loaded;
-		}
-		
-		return result;
-	};
-	
-	/**
-	 * List the number of instances used by a specific sound. 
-	 * If the value of the name is null, check the entire system
-	 *
-	 * @method getNumInstances
-	 * 
-	 * @param {String} name = null: (optional) Name of the sound to lookup.
-	 * 
-	 * @return {Number} The number of instances currently instantiated or -1 if an invalid name is passed in.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.getNumInstances = function(name) {
-		var sound;
-		
-		if (name == null) {
-			return instanceCount;
-		} else if (SoundJS.soundHash[name]){
-			return SoundJS.soundHash[name].length;
-		} else {
-			return -1;
-		}
-	};
-	
-	/**
-	 * Get the maximum number of instances the browser can run.
-	 *
-	 * @method getMaxInstances
-	 * 
-	 * @return {Number} Assumption of maximum instances the browser can run,
-	 * the actual number varies from browser to browser and machine to machine, and
-	 * is largely based on the sound card.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.getMaxInstances = function() {
-		return SoundJS.INST_MAX;
-	};
-	
-	/**
-	 * Get the current load progress for the sound queue.
-	 *
-	 * @method getCurrentLoadProgress
-	 * 
-	 * @return {Number} A number 0-1 indicating percentage loaded of the current loading queue.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.getCurrentLoadProgress = function() {
-		//return (SoundJS.itemsToLoad - SoundJS.loadQueue.length - SoundJS._currentLoad) / SoundJS.itemsToLoad;
-		//TD: Fix
-		return (SoundJS.itemsToLoad - SoundJS.loadQueue.length - (1 - SoundJS._currentLoad)) / SoundJS.itemsToLoad; 
-	};
-	
-	/**
-	 * Get a reference to the DOM sound object by name and instance.
-	 *
-	 * @method getInstance
-	 *
-	 * @param {String} name : The sound name to find the instance in.
-	 * @param {String} instance : The specific instance to grab.
-	 * 
-	 * @return {Sound object} The Sound Element specified by name and instance or null.
-	 * 
-	 * @static
-	 * 
-	 */
-	SoundJS.getInstance = function(name, instance) {
-		if (name == null || instance < 0 || !SoundJS.soundHash[name] || !SoundJS.soundHash[name][instance]) { return null; }
-		
-		return SoundJS.soundHash[name][instance];
-	};
-	
-	/**
-	 * Internal function to actual begin playing a sound.
-	 * Use .play() instead for type checking and default paramters, calling this directly may crash.
-	 *
-	 * @private
-	 * 
-	 */
-	SoundJS.beginPlaying = function(name, interrupt, volume, loop) {
-		// find correct instance
-		var i, result, target, examine;
-		var shouldReplace = false;
-		var instances = SoundJS.soundHash[name];
-		
-		// TODO: Determine if the audio is not loaded, or IO errors.
-		if (!instances[0].loaded) {
-			throw(new Error("Audio is not loaded. The source(s) are either not found, or the correct audio formats are not provided."));
-		}
-		
-		var l = instances.length;
-		
-		for(i = 0; i < l; i++) {
-			// init
-			examine = instances[i];
-			if (target == null && interrupt != SoundJS.INTERRUPT_ANY && interrupt != SoundJS.INTERRUPT_NONE) {
-				target = examine;
-				result = i;
-			}
-			
-			// check interrupt types
-			if ((examine.currentTime >= (examine.duration - SoundJS.FT) && !examine.loop) ||
-				(examine.currentTime == 0 && examine.paused)) {
-				// unused
-				shouldReplace = true;
-				l = i;
-			} else {
-				// compare
-				if ((interrupt == SoundJS.INTERRUPT_EARLY && examine.currentTime < target.currentTime) ||
-					(interrupt == SoundJS.INTERRUPT_LATE && examine.currentTime > target.currentTime)){
-					shouldReplace = true;
-				}
-			}
-			
-			// use marked item instead
-			if (shouldReplace) {
-				target = examine;
-				result = i;
-			}
-		}
-		
-		// if nothing is found replace the first one in the list
-		if (interrupt == SoundJS.INTERRUPT_ANY && !target){
-			target = instances[0];
-			result = 0;
-		}
-		
-		
-		
-		if (target) {
-			// play sound instance
-			target.loop = loop;
-			target.storedVolume = volume;
-			target.volume = volume * SoundJS._master;
-			target.currentTime = 0;
-			if (target.paused){ target.play(); }
-			
-			return result;
-		}
-		
-		// indicate no available instance
-		return -1;
-	};
-	
-	/** 
-	 * Advances the loading queue. Do not call manually, as it assumes the previous item has loaded succesfully
-	 * and may corrupt the loading procedure. Call .add() or .addBatch() instead.
-	 *
-	 * @private
-	 * 
-	 */
-	SoundJS.loadNext = function() {
-		if (SoundJS.loadQueue.length <= 0) {
-			if (SoundJS.onLoadQueueComplete) { SoundJS.onLoadQueueComplete(); }
-			return;
-		}
-		
-		// load next item in the queue.
-		var o = SoundJS.loadQueue.shift();
-		var instances = o.instances || 1;
-		var name = o.name;
-		var src = o.src;
-		
-		// build hash, and extend already existing names
-		var hash = SoundJS.soundHash[name];
-		if (hash == null) { hash = SoundJS.soundHash[name] = []; }
-		else if (hash.length) { src = hash[0].src; }
-		var init = hash.length;
-		
-		for(var i=init, l=init+instances; i<l; i++){
-			var audio = document.createElement("audio");
-			// only fire events on the first instance of a sound.
-			if (i == init) {
-				audio.timeoutId = setTimeout(function(){ SoundJS.handleAudioTimeout(audio);}, SoundJS.AUDIO_TIMEOUT);
-				audio.addEventListener(SoundJS.AUDIO_COMPLETE, SoundJS.handleAudioComplete, false);
-				audio.addEventListener(SoundJS.AUDIO_PROGRESS, SoundJS.handleProgress, false);
-				audio.addEventListener(SoundJS.AUDIO_STALLED, SoundJS.handleAudioStall, false); // Occasionally we get a stalled event instead of complete - but it still works.
-				audio.addEventListener(SoundJS.AUDIO_ERROR, SoundJS.handleAudioError, false);
-								
-				//var mediaEvents = ["abort", "canplay", "canplaythrough", "duratichange", "emptied", "ended", "error", "loadeddata", "loadedmetadata", "loadstart", "pause", "play", "playing", "progress", "ratechange", "seeked", "seeking", "stalled", "suspend", "timeupdate", "volumechange", "waiting"];
-				
-				// TODO: Retry.
-				audio.loaded = false;
-			}
-			
-			//TODO: Consider only making additional channels once the audio loads.
-			
-			audio.addEventListener(SoundJS.AUDIO_ENDED, SoundJS.handleEnded, false);
-			
-			// set correct id for lookup, loading method and data types
-			audio.setAttribute("id", name + "_" + i);
-			audio.setAttribute("preload", "auto");			
-			
-			// figure out sound specific data
-			var type;
-			if (src instanceof Array) {
-				for (var j=0, l2=src.length; j<l2; j++) {
-					var source = audio.appendChild(document.createElement("source"));
-					type = SoundJS.getType(src[j]);
-					source.setAttribute("type", type);
-					source.setAttribute("src", src[j]);
-				}
-				
-			} else {
-				type = SoundJS.getType(src);
-				audio.setAttribute("type", type);
-				audio.setAttribute("src", src);
-			}
-			
-			audio.load(); // iOS fix
-			
-			// include into list and document
-			document.body.appendChild(audio);
-			SoundJS.soundHash[name].push(audio);
-			SoundJS.instanceCount++;
-		}
-	};
-	
-	/**
-	 * Determine the type of a file.
-	 *
-	 * @private
-	 *
-	 */
-	SoundJS.getType = function(src) {
-		var type = src.slice(src.lastIndexOf(".")+1);
-		switch(type){
-			case "mp3" : return "audio/mpeg";
-			case "ogg" : return "audio/ogg";
-			case "wav" : return "audio/wav";
-			default : throw("'" + src + "' is not a recognized audio file"); //LM: Throw seems excessive. Maybe we should dispatch error and move one?
-		}
-		return null;
-	}
-	
-	
-	/**
-	 * The audio has finished playing. This happens only on non-looping audio.
-	 *
-	 * @private
-	 *
-	 */
-	SoundJS.handleEnded = function(event) {
-		if (SoundJS.onSoundEnded) {
-			var parts = this.id.split("_");
-			SoundJS.onSoundEnded(this, parts[0], parts[1]);	
-		}
-	}
-	
-	/**
-	 * Checks if callback exists and calls it with the name of sound having problems.
-	 * Do not call directly as this is an event listener.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.handleAudioTimeout = function(audio) {
-		// audio object that timed out
-		if (SoundJS.onSoundTimeout) { 
-			var parts = audio.id.split("_");
-			SoundJS.onSoundTimeout(audio, parts[0], parts[1]);
-		}
-		//TODO: Indicate to the audio that it is done, but timed out. Maybe remove event listeners.
-		SoundJS.loadNext();
-	};
-	
-	
-	/** 
-	 * Checks if callback exists and calls it with updated progress.
-	 * Do not call directly as this is an event listener.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.handleProgress = function(event) {
-		// This occasionally throws errors (???). Just skip it, since progress isn't super important.
-		try {
-			var e = this.buffered.end();
-		} catch (error) {
-			return;	
-		}
-		SoundJS._currentLoad = this.buffered.end()/this.duration;
-		if (SoundJS.onProgress) { SoundJS.onProgress(SoundJS.getCurrentLoadProgress()); }
-	};
-	
-	/** 
-	 * Checks if callback exists and calls it with the name of sound having problems.
-	 * Do not call directly as this is an event listener.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.handleAudioError = function(event) {
-		clearTimeout(this.timeoutId);
-		
-		// do something about the error
-		if (SoundJS.onSoundLoadError) { 
-			var parts = this.id.split("_");
-			SoundJS.onSoundLoadError(this, parts[0], parts[1]);
-		}
-		SoundJS.loadNext();
-		
-		//TODO: Indicate that the sound failed.
-	};
-	
-	/**
-	 * Checks if callback exists and calls it with the name of sound finished.
-	 * Do not call directly as this is an event listener.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.handleAudioComplete = function(event) {
-		var parts = this.id.split("_");
-		
-		// clean up refiring
-		this.removeEventListener(SoundJS.AUDIO_COMPLETE, SoundJS.handleAudioComplete, false);
-		clearTimeout(this.timeoutId);
-		
-		// set properties
-		this.loaded = true;
-		
-		// advance progress and/or fire events
-		if (SoundJS.onSoundLoadComplete) { SoundJS.onSoundLoadComplete(this, parts[0], parts[1]); }
-		SoundJS.loadNext();
-	};
-	
-	
-	/**
-	 * Recognizes a stall; however, delays it in case of event duplication with a load&stall firing
-	 * Do not call directly as this is an event listener.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.handleAudioStall = function(event) {
-		var element = this;
-		setTimeout(function(){ SoundJS.testAudioStall(element, event) }, 0);
-	}
-	
-	
-	/**
-	 * Checks if callback exists and calls it with the name of sound stalling.
-	 * Do not call directly as this is handled similar to an event listener.
-	 *
-	 * Note that this is called on a delay by the above method, and as such
-	 * has be descoped to belong to SoundJS instead of the audio window which
-	 * why it requires a target element to be passed in.
-	 * 
-	 * @private
-	 * 
-	 */
-	SoundJS.testAudioStall = function(target, event) {
-		var parts = target.id.split("_");
-		
-		if(SoundJS.soundHash[parts[0]][parts[1]].loaded){
-			return;
-		}
-		
-		if (SoundJS.onStall) { 
-			SoundJS.onStall(target, parts[0], parts[1]);
-		}
-		
-		SoundJS.loadNext();
-	}
-
-window.SoundJS = SoundJS;
-
-/* //TODO: Change structure to use pattern like this.
-	function SoundJSElement(name, src) {
-		this.instances = [];	
-		this.name = name;
-		this.src = src;
-		this.canPlay = false;
-		this.loaded = false;
-		this.length = 0;
-	}
-	var p = SoundJSElement.prototype;
-	p.add = function(instance) {
-		this.instances.push(instance);	
-		this.length = this.instances.length;
-		
-		if (this.instances.length == 1) {
-			instance.addEventListener("canplaythrough", function(target) { instance.canplaythrough(); });
-		}
-	}
-	p.remove = function(instance) {
-		this.instances.splice(instance, 1);
-		this.length = this.instances.length;
-	}
-	p.canplaythrough = function() {
-		this.loaded = true;	
-	}
-	
-window.SoundJSElement = SoundJSElement;*/
-
-}(window));
+/* Copyright */
+/**
+ * The SoundJS library manages the playback of audio in HTML, via plugins which
+ * abstract the actual implementation, and allow multiple playback modes depending
+ * on the environment.
+ *
+ * For example, a developer could specify:
+ *   [WebAudioPlugin, HTML5AudioPlugin, FlashAudioPlugin]
+ * In the latest browsers with webaudio support, a WebAudio plugin would be used,
+ * other modern browsers could use HTML5 audio, and older browsers with no HTML5
+ * audio support would use the Flash Plugin.
+ *
+ * Note that there is not currently a supported WebAudio plugin.
+ *
+ * @module SoundJS
+ */
+(function(window) {
+
+	//TODO: Interface to validate plugins and throw warnings
+	//TODO: Determine if methods exist on a plugin before calling
+	//TODO: Interface to validate instances and throw warnings
+	//TODO: Surface errors on audio from all plugins
+
+	//TODO: Timeouts
+	//TODO: Put Plugins on SoundJS.lib?
+
+	//TODO: Track number of booked channels. Needs discussion. We could do pre-booked channels
+		// TODO: Or available NOW channels. LM: Recommend former.
+
+	/**
+	 * The public API for creating sounds, and controlling the overall sound levels,
+	 * and affecting multiple sounds at once. All SoundJS APIs are static.
+	 *
+	 * SoundJS can also be used as a PreloadJS plugin to help preload audio properly.
+	 * @class SoundJS
+	 * @constructor
+	 */
+	function SoundJS() {
+		throw "SoundJS cannot be instantiated";
+	}
+
+	/**
+	 * Determine how audio is split, when multiple paths are specified in a source.
+	 * @property DELIMITER
+	 * @type String
+	 * @default |
+	 * @static
+	 */
+	SoundJS.DELIMITER = "|";
+
+	/**
+	 * The duration in milliseconds to determine a timeout.
+	 * @property AUDIO_TIMEOUT
+	 * @static
+	 * @type Number
+	 * @default 8000
+	 */
+	SoundJS.AUDIO_TIMEOUT = 8000; //TODO: Not implemented
+
+	/**
+	 * The interrupt value to use to interrupt any currently playing instance with the same source.
+	 * @property INTERRUPT_ANY
+	 * @type String
+	 * @default any
+	 * @static
+	 */
+	SoundJS.INTERRUPT_ANY = "any";
+
+	/**
+	 * The interrupt value to use to interrupt the earliest currently playing instance with the same source.
+	 * @property INTERRUPT_EARLY
+	 * @type String
+	 * @default early
+	 * @static
+	 */
+	SoundJS.INTERRUPT_EARLY = "early";
+
+	/**
+	 * The interrupt value to use to interrupt the latest currently playing instance with the same source.
+	 * @property INTERRUPT_LATE
+	 * @type String
+	 * @default late
+	 * @static
+	 */
+	SoundJS.INTERRUPT_LATE = "late";
+
+	/**
+	 * The interrupt value to use to interrupt no currently playing instances with the same source.
+	 * @property INTERRUPT_NONE
+	 * @type String
+	 * @default none
+	 * @static
+	 */
+	SoundJS.INTERRUPT_NONE = "none";
+
+	// Important, implement playState in plugins with these values.
+
+	/**
+	 * Defines the playState of an instance that is still initializing.
+	 * @property PLAY_INITED
+	 * @type String
+	 * @default playInited
+	 * @static
+	 */
+	SoundJS.PLAY_INITED = "playInited";
+
+	/**
+	 * Defines the playState of an instance that is currently playing or paused.
+	 * @property PLAY_SUCCEEDED
+	 * @type String
+	 * @default playSucceeded
+	 * @static
+	 */
+	SoundJS.PLAY_SUCCEEDED = "playSucceeded";
+
+	/**
+	 * Defines the playState of an instance that was interrupted by another instance.
+	 * @property PLAY_INTERRUPTED
+	 * @type String
+	 * @default playInterrupted
+	 * @static
+	 */
+	SoundJS.PLAY_INTERRUPTED = "playInterrupted";
+
+	/**
+	 * Defines the playState of an instance that completed playback.
+	 * @property PLAY_FINISHED
+	 * @type String
+	 * @default playFinished
+	 * @static
+	 */
+	SoundJS.PLAY_FINISHED = "playFinished";
+
+	/**
+	 * Defines the playState of an instance that failed to play. This is usually caused by a lack of available channels
+	 * when the interrupt mode was "INTERRUPT_NONE", the playback stalled, or the sound could not be found.
+	 * @property PLAY_FAILED
+	 * @type String
+	 * @default playFailed
+	 * @static
+	 */
+	SoundJS.PLAY_FAILED = "playFailed";
+
+	/**
+	 * The currently active plugin. If this is null, then no plugin could be initialized.
+	 * If no plugin was specified, only the HTMLAudioPlugin is tested.
+	 * @property activePlugin
+	 * @type Object
+	 * @default null
+	 * @static
+	 */
+	SoundJS.activePlugin = null;
+
+// Private
+	SoundJS.pluginsRegistered = false;
+	SoundJS.masterVolume = 1;
+	SoundJS.muted = false;
+	SoundJS.instances = [];
+	SoundJS.instanceHash = {};
+	SoundJS.idHash = null;
+
+	/**
+	 * Get the preload rules to be used by PreloadJS. This function should not be called, except by PreloadJS.
+	 * @return {Object} The callback, file types, and file extensions to use for preloading.
+	 * @static
+	 * @private
+	 */
+	SoundJS.getPreloadHandlers = function() {
+		return {
+			callback: SoundJS.proxy(SoundJS.initLoad, SoundJS),
+			types: ["sound"],
+			extensions: ["mp3", "ogg", "wav"]
+		}
+	}
+
+	/**
+	 * Register a list of plugins, in order of precedence.
+	 * @method registerPlugins
+	 * @param {Array} plugins An array of plugins to install.
+	 * @return {Boolean} Whether a plugin was successfully initialized.
+	 * @static
+	 */
+	SoundJS.registerPlugins = function(plugins) {
+		SoundJS.pluginsRegistered = true;
+		for (var i=0, l=plugins.length; i<l; i++) {
+			var plugin = plugins[i];
+			if (plugin == null) { continue; } // In case a plugin is not defined.
+			// Note: Each plugin is passed in as a class reference, but we store the activePlugin as an instances
+			if (plugin.isSupported()) {
+				SoundJS.activePlugin = new plugin();
+				//TODO: Check error on initialization?
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Register a SoundJS plugin. Plugins handle the actual playing
+	 * of audio. By default the HTMLAudio plugin will be installed if
+	 * no other plugins are present when the user starts playback.
+	 * @method registerPlugin
+	 * @param {Object} plugin The plugin class to install.
+	 * @return {Boolean} Whether the plugin was successfully initialized.
+	 * @static
+	 */
+	SoundJS.registerPlugin = function(plugin) {
+		SoundJS.pluginsRegistered = true;
+		if (plugin.isSupported()) {
+			SoundJS.activePlugin = new plugin();
+			SoundJS.log("initialize " + SoundJS.activePlugin.toString());
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Determines if SoundJS has been initialized, and a plugin has been activated.
+	 * @method isReady
+	 * @return {Boolean} If SoundJS has initialized a plugin.
+	 * @static
+	 */
+	SoundJS.isReady = function() {
+		return (SoundJS.activePlugin != null);
+	}
+
+	/**
+	 * Get the active plugin's capabilities.
+	 * @method getCapabilities
+	 * @return {Object} An object containing the capabilities of the active plugin.
+	 * @static
+	 */
+	SoundJS.getCapabilities = function() {
+		return SoundJS.activePlugin ? SoundJS.activePlugin.capabilities : null;
+	}
+
+	/**
+	 * Get a specific capability of the active plugin
+	 * @method getCapability
+	 * @param {String} key The capability to retrieve
+	 * @return {String | Number | Boolean} The capability value.
+	 * @static
+	 */
+	SoundJS.getCapability = function(key) {
+		if (SoundJS.activePlugin == null) { return null; }
+		return SoundJS.activePlugin.capabilities[key];
+	}
+
+	/**
+	 * Process manifest items from PreloadJS.
+	 * @method initLoad
+	 * @param {String | Object} value The src or object to load
+	 * @param {String} type The optional type of object. Will likely be "sound".
+	 * @param {String} id An optional id
+	 * @param {Number | String | Boolean | Object} data Optional data associated with the item
+	 * @return {Object} An object with the modified values that were passed in.
+	 * @private
+	 */
+	SoundJS.initLoad = function(src, type, id, data) {
+		if (!SoundJS.checkPlugin(true)) { return false; }
+
+		var details = SoundJS.parsePath(src, type, id, data);
+		if (details == null) { return false; }
+
+		if (id != null) {
+			if (SoundJS.idHash == null) { SoundJS.idHash = {}; }
+			SoundJS.idHash[id] = details.src;
+		}
+
+		var ok = SoundChannel.create(details.src, data);
+		var instance = SoundJS.activePlugin.register(details.src, data);
+		if (instance != null) {
+			// If the instance returns a tag, return it instead for preloading.
+			if (instance.tag != null) { details.tag = instance.tag; }
+			else if (instance.src) { details.src = instance.src; }
+			// If the instance returns a complete handler, pass it on to the prelaoder.
+			if (instance.completeHandler != null) { details.handler = instance.completeHandler; }
+		}
+		return details;
+	}
+
+	/**
+	 * Parse the path of a manifest item
+	 * @method parsePath
+	 * @param {String | Object} value
+	 * @param {String} type
+	 * @param {String} id
+	 * @param {Number | String | Boolean | Object} data
+	 * @return {Object} A formatted object to load.
+	 * @private
+	 */
+	SoundJS.parsePath = function(value, type, id, data) {
+		// Assume value is string.
+		var sounds = value.split(SoundJS.DELIMITER);
+		var ret = {type:type||"sound", id:id, data:data, handler:SoundJS.handleSoundReady};
+		var found = false;
+		var c = SoundJS.getCapabilities();
+		for (var i=0, l=sounds.length; i<l; i++) {
+			var sound = sounds[i];
+			var point = sound.lastIndexOf(".");
+			var ext = sound.substr(point+1).toLowerCase();
+			var name = sound.substr(0, point).split("/").pop();
+			switch (ext) {
+				case "mp3":
+					if (c.mp3) { found = true; }
+					break;
+				case "ogg":
+					if (c.ogg) { found = true }
+					break;
+				case "wav":
+					if (c.wav) { found = true; }
+					break;
+				// TODO: Other cases.
+			}
+
+			if (found) {
+				ret.name = name;
+				ret.src = sound;
+				ret.extension = ext;
+				return ret;
+			}
+		}
+		return null;
+	}
+
+
+	/* ---------------
+	 Static API.
+	--------------- */
+	/**
+	 * Play a sound, receive an instance to control
+	 * @method play
+	 * @param {String} value The src or ID of the audio.
+	 * @param {String} interrupt How to interrupt other instances of audio. Values are defined as constants on SoundJS.
+	 * @param {Number} delay The amount of time to delay the start of the audio. Delay is in milliseconds.
+	 * @param {Number} offset The point to start the audio. Offset is in milliseconds.
+	 * @param {Number} loop Determines how many times the audio loops when it reaches the end of a sound. Default is 0 (no loops). Set to -1 for infinite.
+	 * @param {Number} volume The volume of the sound, between 0 and 1
+	 * @param {Number} pan The left-right pan of the sound (if supported), between -1 (left) and 1 (right)
+	 * @return {SoundInstance} A SoundInstance that can be controlled after it is created.
+	 * @static
+	 */
+	SoundJS.play = function (src, interrupt, delay, offset, loop, volume, pan) {
+		if (!SoundJS.checkPlugin(true)) { return null; }
+		src = SoundJS.getSrcFromId(src);
+		var instance = SoundJS.activePlugin.create(src);
+		return SoundJS.playInstance(instance, interrupt, delay, offset, loop, volume, pan);
+	}
+
+	/**
+	 * Play an instance. This is called by the static API, as well as from plugins.
+	 * @private
+	 */
+	SoundJS.playInstance = function(instance, interrupt, delay, offset, loop, volume, pan) {
+		interrupt = interrupt || SoundJS.INTERRUPT_NONE;
+		if (delay == null) { delay = 0; }
+		if (offset == null) { offset = 0; }
+		if (loop == null) { loop = 0; }
+		if (volume == null) { volume = 1; }
+		if (pan == null) { pan = 0; }
+
+		if (delay == 0) {
+			var ok = SoundJS.beginPlaying(instance, interrupt, offset, loop, volume, pan);
+			if (!ok) { return null; }
+		} else {
+			//Note that we can't pass arguments to proxy OR setTimeout (IE), so just wrap the function call.
+			setTimeout(function() {
+					SoundJS.beginPlaying(instance, interrupt, offset, loop, volume, pan);
+				}, delay); //LM: Can not stop before timeout elapses. Maybe add timeout interval to instance?
+		}
+
+		this.instances.push(instance);
+		this.instanceHash[instance.uniqueId] = instance;
+
+		return instance;
+	}
+
+	/**
+	 * Begin playback. This is called immediately, or after delay by SoundJS.beginPlaying
+	 * @private
+	 */
+	SoundJS.beginPlaying = function(instance, interrupt, offset, loop, volume, pan) {
+		if (!SoundChannel.add(instance, interrupt)) { return false; }
+		var result = instance.beginPlaying(offset, loop, volume, pan);
+		if (result == -1) {
+			this.instances.splice(this.instances.indexOf(instance), 1);
+			delete this.instanceHash[instance.uniqueId];
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Determine if a plugin has been initialized. Optionally initialize a default plugin.
+	 * @returns If a plugin is initialized.
+	 * @private
+	 */
+	SoundJS.checkPlugin = function(initializeDefault) {
+		if (SoundJS.activePlugin == null) {
+			if (initializeDefault && !SoundJS.pluginsRegistered) {
+				SoundJS.registerPlugin(SoundJS.HTMLAudioPlugin);
+			}
+			if (SoundJS.activePlugin == null) {
+				SoundJS.log("*** No Active Plugin Found on SoundJS");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Get the source of a sound via the ID passed in with the manifest. If no ID is found
+	 * the value is passed back.
+	 * @method getSrcFromId
+	 * @param value The name or src of a sound.
+	 * @return {String} The source of the sound.
+	 * @static
+	 */
+	SoundJS.getSrcFromId = function(value) {
+		if (SoundJS.idHash == null || SoundJS.idHash[value] == null) { return value; }
+		return SoundJS.idHash[value];
+	}
+
+
+/* ---------------
+ Global controls
+--------------- */
+	/**
+	 * Set the volume of all sounds. This sets the volume value of all audio, and
+	 * is not a "master volume". Use setMasterVolume() instead.
+	 * @method setVolume
+	 * @param {Number} The volume to set on all sounds. The acceptable range is 0-1.
+	 * @param {String} id Optional, the specific sound ID to target.
+	 * @return {Boolean} If the volume was set.
+	 * @static
+	 */
+	SoundJS.setVolume = function(value, id) {
+		// don't deal with null volume
+		if (Number(value) == null) { return false; }
+		value = Math.max(0, Math.min(1, value));
+
+		return SoundJS.tellAllInstances("setVolume", id, value);
+		/*SoundJS.activePlugin.setVolume(value, SoundJS.getSrcFromId(id));*/
+		//return true;
+	}
+
+	/**
+	 * Get the master volume. All sounds multiply their current volume against the master volume.
+	 * @method getMasterVolume
+	 * @return {Number} The master volume
+	 * @static
+	 */
+	SoundJS.getMasterVolume = function() { return SoundJS.masterVolume; }
+	/**
+	 * To set the volume of all instances at once, use the setVolume() method.
+	 * @method setMasterVolume
+	 * @param {Number} value The master volume to set.
+	 * @return {Boolean} If the master volume was set.
+	 * @static
+	 */
+	SoundJS.setMasterVolume = function(value) {
+		SoundJS.masterVolume = value;
+		return SoundJS.tellAllInstances("setMasterVolume", null, value);
+	}
+
+	/**
+	 * Mute/Unmute all audio. Note that muted audio still plays at 0 volume, and that
+	 * this method just sets the mute value of each instance, and not a "global mute".
+	 * @method setMute
+	 * @param {Boolean} isMuted Whether the audio should be muted or not.
+	 * @param {String} id The specific sound ID (set) to target.
+	 * @return {Boolean} If the mute was set.
+	 * @static
+	 */
+	SoundJS.setMute = function(isMuted, id) {
+		return SoundJS.tellAllInstances("mute", id, isMuted);
+		//LM: Note that there is no "global" mute. Mute just handles all instances.
+	}
+
+	/**
+	 * Pause all instances.
+	 * @method pause
+	 * @param id The specific sound ID (set) to target.
+	 * @return If the audio was paused or not.
+	 * @static
+	 */
+	SoundJS.pause = function(id) {
+		return SoundJS.tellAllInstances("pause", id);
+	}
+
+	/**
+	 * Resume all instances. Note that the pause/resume methods do not work independantly
+	 * of each instance's paused state. If one instance is already paused when the SoundJS.pause
+	 * method is called, then it will resume when this method is called.
+	 * @method resume
+	 * @param id The specific sound ID (set) to target.
+	 * @return If the audio was resumed or not
+	 * @static
+	 */
+	SoundJS.resume = function(id) {
+		return SoundJS.tellAllInstances("resume", id);
+	}
+
+	/**
+	 * Stop all audio (Global stop).
+	 * @method stop
+	 * @param id The specific sound ID (set) to target.
+	 * @return If the audio was stopped or not.
+	 * @static
+	 */
+	SoundJS.stop = function(id) {
+		return SoundJS.tellAllInstances("stop", id);
+	}
+
+	/**
+	 * Get a SoundInstance by a unique id. It is often useful to store audio
+	 * instances by id (in form elements for example), so this method provides
+	 * a useful way to access the instances via their IDs.
+	 * @method getInstanceById
+	 * @param uniqueId The id to use as lookup.
+	 * @return {SoundInstance} The sound instance with the specified ID.
+	 * @static
+	 */
+	SoundJS.getInstanceById = function(uniqueId) {
+		return this.instanceHash[uniqueId];
+	}
+
+	/**
+	 * A sound has completed playback, been interrupted, failed, or been stopped.
+	 * Remove instance management. It will be added again, if the sound re-plays.
+	 * Note that this method is called from the instances.
+	 * @method playFinished
+	 * @param {SoundInstance} instance The instance that finished playback.
+	 * @private
+	 */
+	SoundJS.playFinished = function(instance) {
+		SoundChannel.remove(instance);
+		this.instances.splice(this.instances.indexOf(instance), 1);
+		// Note: Keep in instance hash.
+	}
+
+	/**
+	 * Call a method on all instances. Passing an optional ID will filter the event
+	 * to only sounds matching that id (or source).
+	 * @private
+	 */
+	SoundJS.tellAllInstances = function(command, id, value) {
+		if (this.activePlugin == null) { return false; }
+		var src = this.getSrcFromId(id);
+		for (var i=this.instances.length-1; i>=0; i--) {
+			var instance = this.instances[i];
+			if (src != null && instance.src != src) { continue; }
+			switch (command) {
+				case "pause":
+					instance.pause(); break;
+				case "resume":
+					instance.resume(); break;
+				case "setVolume":
+					instance.setVolume(value); break;
+				case "setMasterVolume":
+					instance.setMasterVolume(value); break;
+				case "mute":
+					instance.mute(value); break;
+				case "stop":
+					instance.stop(); break;
+				case "setPan":
+					instance.setPan(value); break;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Public proxy for SoundJS methods.
+	 * @method proxy
+	 * @param {Function} method The method name to call.
+	 * @param {Object} scope The scope to call the method name on.
+	 * @return {Function} a wrapper function that calls the specified method on the specified scope.
+	 * @static
+	 */
+	SoundJS.proxy = function(method, scope) {
+		return function() {
+			return method.apply(scope, arguments);
+		}
+	}
+
+	/**
+	 * Debug function wraps console to prevent issues.
+	 * @method log
+	 * @static
+	 */
+	SoundJS.log = function() {
+        //var log = Function.prototype.bind.call(console.log, console);
+        //log.apply(console, arguments);
+	}
+
+
+	// Put SoundJS on window for Global Access
+	window.SoundJS = SoundJS;
+
+
+
+
+
+	/**
+	 * SoundChannel manages the number of active instances
+	 * @class SoundChannel
+	 * @param src The source of the instances
+	 * @param max The number of instances allowed
+	 * @private
+	 */
+	function SoundChannel(src, max) {
+		this.init(src, max);
+	}
+
+/* ------------
+   Static API
+------------ */
+	/**
+	 * A hash of channel instances by src.
+	 * @private
+	 */
+	SoundChannel.channels = {};
+	/** Create a sound channel.
+	 * @private
+	 */
+	SoundChannel.create = function(src, max) {
+		var channel = SoundChannel.get(src);
+		if (channel == null) {
+			SoundChannel.channels[src] = new SoundChannel(src, max);
+		} else {
+			channel.max += max;
+		}
+	}
+	/** Add an instance to a sound channel.
+	 * @private
+	 */
+	SoundChannel.add = function(instance, interrupt) {
+		var channel = SoundChannel.get(instance.src);
+		if (channel == null) { return false; }
+		return channel.add(instance, interrupt);
+	}
+	/** Remove an instace from its channel.
+	 * @private
+	 */
+	SoundChannel.remove = function(instance) {
+		var channel = SoundChannel.get(instance.src);
+		if (channel == null) { return false; }
+		channel.remove(instance);
+		return true;
+	}
+	/** Get a channel instance by its src.
+	 * @private
+	 */
+	SoundChannel.get = function(src) {
+		return SoundChannel.channels[src];
+	}
+
+	var p = SoundChannel.prototype = {
+
+		/** The src of the channel
+		 * @private
+		 */
+		src: null,
+		/** The maximum number of instances in this channel
+		 * @private
+		 */
+		max: null,
+		/** The current number of active instances.
+		 * @private
+		 */
+		length: 0,
+
+		/**
+		 * Initialize the channel
+		 * @param src The source of the channel
+		 * @param max The maximum number of instances in the channel
+		 * @private
+		 */
+		init: function(src, max) {
+			this.src = src;
+			this.max = max || 1;
+			this.instances = [];
+		},
+
+		/**
+		 * Get an instance by index
+		 * @param index The index to return.
+		 * @private
+		 */
+		get: function(index) {
+			return this.instances[index];
+		},
+
+		/**
+		 * Add a new instance
+		 * @param instance The instance to add.
+		 * @private
+		 */
+		add: function(instance, interrupt) {
+			if (!this.getSlot(interrupt, instance)) {
+				return false;
+			};
+			this.instances.push(instance);
+			this.length++;
+			return true;
+		},
+
+		/**
+		 * Remove an instance
+		 * @param instance The instance to remove
+		 * @private
+		 */
+		remove: function(instance) {
+			var index = this.instances.indexOf(instance);
+			if (index == -1) { return false; }
+			this.instances.splice(index, 1);
+			this.length--;
+			return true;
+		},
+
+		/**
+		 * Get an available slot
+		 * @param interrupt
+		 * @private
+		 */
+		getSlot: function(interrupt, instance) {
+			var target, replacement;
+
+			var margin = SoundJS.activePlugin.FT || 0;
+
+			for (var i=0, l=this.max||100; i<l; i++) {
+				target = this.get(i);
+
+				// Available Space
+				if (target == null) {
+					return true;
+				} else if (interrupt == SoundJS.INTERRUPT_NONE) {
+					continue;
+				}
+
+				// First replacement candidate
+				if (i == 0) {
+					replacement = target;
+					continue;
+				}
+
+				// Audio is complete or not playing
+				if (target.playState == SoundJS.PLAY_FINISHED ||
+						target == SoundJS.PLAY_INTERRUPTED ||
+						target == SoundJS.PLAY_FAILED) {
+					replacement = target;
+
+				// Audio is a better candidate than the current target, according to playhead
+				} else if (
+						(interrupt == SoundJS.INTERRUPT_EARLY && target.getPosition() < replacement.getPosition()) ||
+						(interrupt == SoundJS.INTERRUPT_LATE && target.getPosition() > replacement.getPosition())) {
+					replacement = target;
+				}
+			}
+
+			if (replacement != null) {
+				replacement.interrupt();
+				this.remove(replacement);
+				return true;
+			}
+			return false;
+		},
+
+		toString: function() {
+			return "[SoundJS SoundChannel]";
+		}
+
+	}
+
+	// The SoundChannel is not added to Window
+
+}(window));
\ No newline at end of file
diff --git a/src/swfobject.js b/src/swfobject.js
new file mode 100755
index 00000000..bf35c07c
--- /dev/null
+++ b/src/swfobject.js
@@ -0,0 +1,777 @@
+/*!	SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+
+var swfobject = function() {
+	
+	var UNDEF = "undefined",
+		OBJECT = "object",
+		SHOCKWAVE_FLASH = "Shockwave Flash",
+		SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash",
+		FLASH_MIME_TYPE = "application/x-shockwave-flash",
+		EXPRESS_INSTALL_ID = "SWFObjectExprInst",
+		ON_READY_STATE_CHANGE = "onreadystatechange",
+		
+		win = window,
+		doc = document,
+		nav = navigator,
+		
+		plugin = false,
+		domLoadFnArr = [main],
+		regObjArr = [],
+		objIdArr = [],
+		listenersArr = [],
+		storedAltContent,
+		storedAltContentId,
+		storedCallbackFn,
+		storedCallbackObj,
+		isDomLoaded = false,
+		isExpressInstallActive = false,
+		dynamicStylesheet,
+		dynamicStylesheetMedia,
+		autoHideShow = true,
+	
+	/* Centralized function for browser feature detection
+		- User agent string detection is only used when no good alternative is possible
+		- Is executed directly for optimal performance
+	*/	
+	ua = function() {
+		var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF,
+			u = nav.userAgent.toLowerCase(),
+			p = nav.platform.toLowerCase(),
+			windows = p ? /win/.test(p) : /win/.test(u),
+			mac = p ? /mac/.test(p) : /mac/.test(u),
+			webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit
+			ie = !+"\v1", // feature detection based on Andrea Giammarchi's solution: http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html
+			playerVersion = [0,0,0],
+			d = null;
+		if (typeof nav.plugins != UNDEF && typeof nav.plugins[SHOCKWAVE_FLASH] == OBJECT) {
+			d = nav.plugins[SHOCKWAVE_FLASH].description;
+			if (d && !(typeof nav.mimeTypes != UNDEF && nav.mimeTypes[FLASH_MIME_TYPE] && !nav.mimeTypes[FLASH_MIME_TYPE].enabledPlugin)) { // navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin indicates whether plug-ins are enabled or disabled in Safari 3+
+				plugin = true;
+				ie = false; // cascaded feature detection for Internet Explorer
+				d = d.replace(/^.*\s+(\S+\s+\S+$)/, "$1");
+				playerVersion[0] = parseInt(d.replace(/^(.*)\..*$/, "$1"), 10);
+				playerVersion[1] = parseInt(d.replace(/^.*\.(.*)\s.*$/, "$1"), 10);
+				playerVersion[2] = /[a-zA-Z]/.test(d) ? parseInt(d.replace(/^.*[a-zA-Z]+(.*)$/, "$1"), 10) : 0;
+			}
+		}
+		else if (typeof win.ActiveXObject != UNDEF) {
+			try {
+				var a = new ActiveXObject(SHOCKWAVE_FLASH_AX);
+				if (a) { // a will return null when ActiveX is disabled
+					d = a.GetVariable("$version");
+					if (d) {
+						ie = true; // cascaded feature detection for Internet Explorer
+						d = d.split(" ")[1].split(",");
+						playerVersion = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
+					}
+				}
+			}
+			catch(e) {}
+		}
+		return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac };
+	}(),
+	
+	/* Cross-browser onDomLoad
+		- Will fire an event as soon as the DOM of a web page is loaded
+		- Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/
+		- Regular onload serves as fallback
+	*/ 
+	onDomLoad = function() {
+		if (!ua.w3) { return; }
+		if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically 
+			callDomLoadFunctions();
+		}
+		if (!isDomLoaded) {
+			if (typeof doc.addEventListener != UNDEF) {
+				doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false);
+			}		
+			if (ua.ie && ua.win) {
+				doc.attachEvent(ON_READY_STATE_CHANGE, function() {
+					if (doc.readyState == "complete") {
+						doc.detachEvent(ON_READY_STATE_CHANGE, arguments.callee);
+						callDomLoadFunctions();
+					}
+				});
+				if (win == top) { // if not inside an iframe
+					(function(){
+						if (isDomLoaded) { return; }
+						try {
+							doc.documentElement.doScroll("left");
+						}
+						catch(e) {
+							setTimeout(arguments.callee, 0);
+							return;
+						}
+						callDomLoadFunctions();
+					})();
+				}
+			}
+			if (ua.wk) {
+				(function(){
+					if (isDomLoaded) { return; }
+					if (!/loaded|complete/.test(doc.readyState)) {
+						setTimeout(arguments.callee, 0);
+						return;
+					}
+					callDomLoadFunctions();
+				})();
+			}
+			addLoadEvent(callDomLoadFunctions);
+		}
+	}();
+	
+	function callDomLoadFunctions() {
+		if (isDomLoaded) { return; }
+		try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early
+			var t = doc.getElementsByTagName("body")[0].appendChild(createElement("span"));
+			t.parentNode.removeChild(t);
+		}
+		catch (e) { return; }
+		isDomLoaded = true;
+		var dl = domLoadFnArr.length;
+		for (var i = 0; i < dl; i++) {
+			domLoadFnArr[i]();
+		}
+	}
+	
+	function addDomLoadEvent(fn) {
+		if (isDomLoaded) {
+			fn();
+		}
+		else { 
+			domLoadFnArr[domLoadFnArr.length] = fn; // Array.push() is only available in IE5.5+
+		}
+	}
+	
+	/* Cross-browser onload
+		- Based on James Edwards' solution: http://brothercake.com/site/resources/scripts/onload/
+		- Will fire an event as soon as a web page including all of its assets are loaded 
+	 */
+	function addLoadEvent(fn) {
+		if (typeof win.addEventListener != UNDEF) {
+			win.addEventListener("load", fn, false);
+		}
+		else if (typeof doc.addEventListener != UNDEF) {
+			doc.addEventListener("load", fn, false);
+		}
+		else if (typeof win.attachEvent != UNDEF) {
+			addListener(win, "onload", fn);
+		}
+		else if (typeof win.onload == "function") {
+			var fnOld = win.onload;
+			win.onload = function() {
+				fnOld();
+				fn();
+			};
+		}
+		else {
+			win.onload = fn;
+		}
+	}
+	
+	/* Main function
+		- Will preferably execute onDomLoad, otherwise onload (as a fallback)
+	*/
+	function main() { 
+		if (plugin) {
+			testPlayerVersion();
+		}
+		else {
+			matchVersions();
+		}
+	}
+	
+	/* Detect the Flash Player version for non-Internet Explorer browsers
+		- Detecting the plug-in version via the object element is more precise than using the plugins collection item's description:
+		  a. Both release and build numbers can be detected
+		  b. Avoid wrong descriptions by corrupt installers provided by Adobe
+		  c. Avoid wrong descriptions by multiple Flash Player entries in the plugin Array, caused by incorrect browser imports
+		- Disadvantage of this method is that it depends on the availability of the DOM, while the plugins collection is immediately available
+	*/
+	function testPlayerVersion() {
+		var b = doc.getElementsByTagName("body")[0];
+		var o = createElement(OBJECT);
+		o.setAttribute("type", FLASH_MIME_TYPE);
+		var t = b.appendChild(o);
+		if (t) {
+			var counter = 0;
+			(function(){
+				if (typeof t.GetVariable != UNDEF) {
+					var d = t.GetVariable("$version");
+					if (d) {
+						d = d.split(" ")[1].split(",");
+						ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
+					}
+				}
+				else if (counter < 10) {
+					counter++;
+					setTimeout(arguments.callee, 10);
+					return;
+				}
+				b.removeChild(o);
+				t = null;
+				matchVersions();
+			})();
+		}
+		else {
+			matchVersions();
+		}
+	}
+	
+	/* Perform Flash Player and SWF version matching; static publishing only
+	*/
+	function matchVersions() {
+		var rl = regObjArr.length;
+		if (rl > 0) {
+			for (var i = 0; i < rl; i++) { // for each registered object element
+				var id = regObjArr[i].id;
+				var cb = regObjArr[i].callbackFn;
+				var cbObj = {success:false, id:id};
+				if (ua.pv[0] > 0) {
+					var obj = getElementById(id);
+					if (obj) {
+						if (hasPlayerVersion(regObjArr[i].swfVersion) && !(ua.wk && ua.wk < 312)) { // Flash Player version >= published SWF version: Houston, we have a match!
+							setVisibility(id, true);
+							if (cb) {
+								cbObj.success = true;
+								cbObj.ref = getObjectById(id);
+								cb(cbObj);
+							}
+						}
+						else if (regObjArr[i].expressInstall && canExpressInstall()) { // show the Adobe Express Install dialog if set by the web page author and if supported
+							var att = {};
+							att.data = regObjArr[i].expressInstall;
+							att.width = obj.getAttribute("width") || "0";
+							att.height = obj.getAttribute("height") || "0";
+							if (obj.getAttribute("class")) { att.styleclass = obj.getAttribute("class"); }
+							if (obj.getAttribute("align")) { att.align = obj.getAttribute("align"); }
+							// parse HTML object param element's name-value pairs
+							var par = {};
+							var p = obj.getElementsByTagName("param");
+							var pl = p.length;
+							for (var j = 0; j < pl; j++) {
+								if (p[j].getAttribute("name").toLowerCase() != "movie") {
+									par[p[j].getAttribute("name")] = p[j].getAttribute("value");
+								}
+							}
+							showExpressInstall(att, par, id, cb);
+						}
+						else { // Flash Player and SWF version mismatch or an older Webkit engine that ignores the HTML object element's nested param elements: display alternative content instead of SWF
+							displayAltContent(obj);
+							if (cb) { cb(cbObj); }
+						}
+					}
+				}
+				else {	// if no Flash Player is installed or the fp version cannot be detected we let the HTML object element do its job (either show a SWF or alternative content)
+					setVisibility(id, true);
+					if (cb) {
+						var o = getObjectById(id); // test whether there is an HTML object element or not
+						if (o && typeof o.SetVariable != UNDEF) { 
+							cbObj.success = true;
+							cbObj.ref = o;
+						}
+						cb(cbObj);
+					}
+				}
+			}
+		}
+	}
+	
+	function getObjectById(objectIdStr) {
+		var r = null;
+		var o = getElementById(objectIdStr);
+		if (o && o.nodeName == "OBJECT") {
+			if (typeof o.SetVariable != UNDEF) {
+				r = o;
+			}
+			else {
+				var n = o.getElementsByTagName(OBJECT)[0];
+				if (n) {
+					r = n;
+				}
+			}
+		}
+		return r;
+	}
+	
+	/* Requirements for Adobe Express Install
+		- only one instance can be active at a time
+		- fp 6.0.65 or higher
+		- Win/Mac OS only
+		- no Webkit engines older than version 312
+	*/
+	function canExpressInstall() {
+		return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312);
+	}
+	
+	/* Show the Adobe Express Install dialog
+		- Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75
+	*/
+	function showExpressInstall(att, par, replaceElemIdStr, callbackFn) {
+		isExpressInstallActive = true;
+		storedCallbackFn = callbackFn || null;
+		storedCallbackObj = {success:false, id:replaceElemIdStr};
+		var obj = getElementById(replaceElemIdStr);
+		if (obj) {
+			if (obj.nodeName == "OBJECT") { // static publishing
+				storedAltContent = abstractAltContent(obj);
+				storedAltContentId = null;
+			}
+			else { // dynamic publishing
+				storedAltContent = obj;
+				storedAltContentId = replaceElemIdStr;
+			}
+			att.id = EXPRESS_INSTALL_ID;
+			if (typeof att.width == UNDEF || (!/%$/.test(att.width) && parseInt(att.width, 10) < 310)) { att.width = "310"; }
+			if (typeof att.height == UNDEF || (!/%$/.test(att.height) && parseInt(att.height, 10) < 137)) { att.height = "137"; }
+			doc.title = doc.title.slice(0, 47) + " - Flash Player Installation";
+			var pt = ua.ie && ua.win ? "ActiveX" : "PlugIn",
+				fv = "MMredirectURL=" + encodeURI(window.location).toString().replace(/&/g,"%26") + "&MMplayerType=" + pt + "&MMdoctitle=" + doc.title;
+			if (typeof par.flashvars != UNDEF) {
+				par.flashvars += "&" + fv;
+			}
+			else {
+				par.flashvars = fv;
+			}
+			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
+			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
+			if (ua.ie && ua.win && obj.readyState != 4) {
+				var newObj = createElement("div");
+				replaceElemIdStr += "SWFObjectNew";
+				newObj.setAttribute("id", replaceElemIdStr);
+				obj.parentNode.insertBefore(newObj, obj); // insert placeholder div that will be replaced by the object element that loads expressinstall.swf
+				obj.style.display = "none";
+				(function(){
+					if (obj.readyState == 4) {
+						obj.parentNode.removeChild(obj);
+					}
+					else {
+						setTimeout(arguments.callee, 10);
+					}
+				})();
+			}
+			createSWF(att, par, replaceElemIdStr);
+		}
+	}
+	
+	/* Functions to abstract and display alternative content
+	*/
+	function displayAltContent(obj) {
+		if (ua.ie && ua.win && obj.readyState != 4) {
+			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
+			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
+			var el = createElement("div");
+			obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content
+			el.parentNode.replaceChild(abstractAltContent(obj), el);
+			obj.style.display = "none";
+			(function(){
+				if (obj.readyState == 4) {
+					obj.parentNode.removeChild(obj);
+				}
+				else {
+					setTimeout(arguments.callee, 10);
+				}
+			})();
+		}
+		else {
+			obj.parentNode.replaceChild(abstractAltContent(obj), obj);
+		}
+	} 
+
+	function abstractAltContent(obj) {
+		var ac = createElement("div");
+		if (ua.win && ua.ie) {
+			ac.innerHTML = obj.innerHTML;
+		}
+		else {
+			var nestedObj = obj.getElementsByTagName(OBJECT)[0];
+			if (nestedObj) {
+				var c = nestedObj.childNodes;
+				if (c) {
+					var cl = c.length;
+					for (var i = 0; i < cl; i++) {
+						if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) {
+							ac.appendChild(c[i].cloneNode(true));
+						}
+					}
+				}
+			}
+		}
+		return ac;
+	}
+	
+	/* Cross-browser dynamic SWF creation
+	*/
+	function createSWF(attObj, parObj, id) {
+		var r, el = getElementById(id);
+		if (ua.wk && ua.wk < 312) { return r; }
+		if (el) {
+			if (typeof attObj.id == UNDEF) { // if no 'id' is defined for the object element, it will inherit the 'id' from the alternative content
+				attObj.id = id;
+			}
+			if (ua.ie && ua.win) { // Internet Explorer + the HTML object element + W3C DOM methods do not combine: fall back to outerHTML
+				var att = "";
+				for (var i in attObj) {
+					if (attObj[i] != Object.prototype[i]) { // filter out prototype additions from other potential libraries
+						if (i.toLowerCase() == "data") {
+							parObj.movie = attObj[i];
+						}
+						else if (i.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
+							att += ' class="' + attObj[i] + '"';
+						}
+						else if (i.toLowerCase() != "classid") {
+							att += ' ' + i + '="' + attObj[i] + '"';
+						}
+					}
+				}
+				var par = "";
+				for (var j in parObj) {
+					if (parObj[j] != Object.prototype[j]) { // filter out prototype additions from other potential libraries
+						par += '<param name="' + j + '" value="' + parObj[j] + '" />';
+					}
+				}
+				el.outerHTML = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"' + att + '>' + par + '</object>';
+				objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only)
+				r = getElementById(attObj.id);	
+			}
+			else { // well-behaving browsers
+				var o = createElement(OBJECT);
+				o.setAttribute("type", FLASH_MIME_TYPE);
+				for (var m in attObj) {
+					if (attObj[m] != Object.prototype[m]) { // filter out prototype additions from other potential libraries
+						if (m.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword
+							o.setAttribute("class", attObj[m]);
+						}
+						else if (m.toLowerCase() != "classid") { // filter out IE specific attribute
+							o.setAttribute(m, attObj[m]);
+						}
+					}
+				}
+				for (var n in parObj) {
+					if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // filter out prototype additions from other potential libraries and IE specific param element
+						createObjParam(o, n, parObj[n]);
+					}
+				}
+				el.parentNode.replaceChild(o, el);
+				r = o;
+			}
+		}
+		return r;
+	}
+	
+	function createObjParam(el, pName, pValue) {
+		var p = createElement("param");
+		p.setAttribute("name", pName);	
+		p.setAttribute("value", pValue);
+		el.appendChild(p);
+	}
+	
+	/* Cross-browser SWF removal
+		- Especially needed to safely and completely remove a SWF in Internet Explorer
+	*/
+	function removeSWF(id) {
+		var obj = getElementById(id);
+		if (obj && obj.nodeName == "OBJECT") {
+			if (ua.ie && ua.win) {
+				obj.style.display = "none";
+				(function(){
+					if (obj.readyState == 4) {
+						removeObjectInIE(id);
+					}
+					else {
+						setTimeout(arguments.callee, 10);
+					}
+				})();
+			}
+			else {
+				obj.parentNode.removeChild(obj);
+			}
+		}
+	}
+	
+	function removeObjectInIE(id) {
+		var obj = getElementById(id);
+		if (obj) {
+			for (var i in obj) {
+				if (typeof obj[i] == "function") {
+					obj[i] = null;
+				}
+			}
+			obj.parentNode.removeChild(obj);
+		}
+	}
+	
+	/* Functions to optimize JavaScript compression
+	*/
+	function getElementById(id) {
+		var el = null;
+		try {
+			el = doc.getElementById(id);
+		}
+		catch (e) {}
+		return el;
+	}
+	
+	function createElement(el) {
+		return doc.createElement(el);
+	}
+	
+	/* Updated attachEvent function for Internet Explorer
+		- Stores attachEvent information in an Array, so on unload the detachEvent functions can be called to avoid memory leaks
+	*/	
+	function addListener(target, eventType, fn) {
+		target.attachEvent(eventType, fn);
+		listenersArr[listenersArr.length] = [target, eventType, fn];
+	}
+	
+	/* Flash Player and SWF content version matching
+	*/
+	function hasPlayerVersion(rv) {
+		var pv = ua.pv, v = rv.split(".");
+		v[0] = parseInt(v[0], 10);
+		v[1] = parseInt(v[1], 10) || 0; // supports short notation, e.g. "9" instead of "9.0.0"
+		v[2] = parseInt(v[2], 10) || 0;
+		return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false;
+	}
+	
+	/* Cross-browser dynamic CSS creation
+		- Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php
+	*/	
+	function createCSS(sel, decl, media, newStyle) {
+		if (ua.ie && ua.mac) { return; }
+		var h = doc.getElementsByTagName("head")[0];
+		if (!h) { return; } // to also support badly authored HTML pages that lack a head element
+		var m = (media && typeof media == "string") ? media : "screen";
+		if (newStyle) {
+			dynamicStylesheet = null;
+			dynamicStylesheetMedia = null;
+		}
+		if (!dynamicStylesheet || dynamicStylesheetMedia != m) { 
+			// create dynamic stylesheet + get a global reference to it
+			var s = createElement("style");
+			s.setAttribute("type", "text/css");
+			s.setAttribute("media", m);
+			dynamicStylesheet = h.appendChild(s);
+			if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) {
+				dynamicStylesheet = doc.styleSheets[doc.styleSheets.length - 1];
+			}
+			dynamicStylesheetMedia = m;
+		}
+		// add style rule
+		if (ua.ie && ua.win) {
+			if (dynamicStylesheet && typeof dynamicStylesheet.addRule == OBJECT) {
+				dynamicStylesheet.addRule(sel, decl);
+			}
+		}
+		else {
+			if (dynamicStylesheet && typeof doc.createTextNode != UNDEF) {
+				dynamicStylesheet.appendChild(doc.createTextNode(sel + " {" + decl + "}"));
+			}
+		}
+	}
+	
+	function setVisibility(id, isVisible) {
+		if (!autoHideShow) { return; }
+		var v = isVisible ? "visible" : "hidden";
+		if (isDomLoaded && getElementById(id)) {
+			getElementById(id).style.visibility = v;
+		}
+		else {
+			createCSS("#" + id, "visibility:" + v);
+		}
+	}
+
+	/* Filter to avoid XSS attacks
+	*/
+	function urlEncodeIfNecessary(s) {
+		var regex = /[\\\"<>\.;]/;
+		var hasBadChars = regex.exec(s) != null;
+		return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s;
+	}
+	
+	/* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only)
+	*/
+	var cleanup = function() {
+		if (ua.ie && ua.win) {
+			window.attachEvent("onunload", function() {
+				// remove listeners to avoid memory leaks
+				var ll = listenersArr.length;
+				for (var i = 0; i < ll; i++) {
+					listenersArr[i][0].detachEvent(listenersArr[i][1], listenersArr[i][2]);
+				}
+				// cleanup dynamically embedded objects to fix audio/video threads and force open sockets and NetConnections to disconnect
+				var il = objIdArr.length;
+				for (var j = 0; j < il; j++) {
+					removeSWF(objIdArr[j]);
+				}
+				// cleanup library's main closures to avoid memory leaks
+				for (var k in ua) {
+					ua[k] = null;
+				}
+				ua = null;
+				for (var l in swfobject) {
+					swfobject[l] = null;
+				}
+				swfobject = null;
+			});
+		}
+	}();
+	
+	return {
+		/* Public API
+			- Reference: http://code.google.com/p/swfobject/wiki/documentation
+		*/ 
+		registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) {
+			if (ua.w3 && objectIdStr && swfVersionStr) {
+				var regObj = {};
+				regObj.id = objectIdStr;
+				regObj.swfVersion = swfVersionStr;
+				regObj.expressInstall = xiSwfUrlStr;
+				regObj.callbackFn = callbackFn;
+				regObjArr[regObjArr.length] = regObj;
+				setVisibility(objectIdStr, false);
+			}
+			else if (callbackFn) {
+				callbackFn({success:false, id:objectIdStr});
+			}
+		},
+		
+		getObjectById: function(objectIdStr) {
+			if (ua.w3) {
+				return getObjectById(objectIdStr);
+			}
+		},
+		
+		embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) {
+			var callbackObj = {success:false, id:replaceElemIdStr};
+			if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) {
+				setVisibility(replaceElemIdStr, false);
+				addDomLoadEvent(function() {
+					widthStr += ""; // auto-convert to string
+					heightStr += "";
+					var att = {};
+					if (attObj && typeof attObj === OBJECT) {
+						for (var i in attObj) { // copy object to avoid the use of references, because web authors often reuse attObj for multiple SWFs
+							att[i] = attObj[i];
+						}
+					}
+					att.data = swfUrlStr;
+					att.width = widthStr;
+					att.height = heightStr;
+					var par = {}; 
+					if (parObj && typeof parObj === OBJECT) {
+						for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs
+							par[j] = parObj[j];
+						}
+					}
+					if (flashvarsObj && typeof flashvarsObj === OBJECT) {
+						for (var k in flashvarsObj) { // copy object to avoid the use of references, because web authors often reuse flashvarsObj for multiple SWFs
+							if (typeof par.flashvars != UNDEF) {
+								par.flashvars += "&" + k + "=" + flashvarsObj[k];
+							}
+							else {
+								par.flashvars = k + "=" + flashvarsObj[k];
+							}
+						}
+					}
+					if (hasPlayerVersion(swfVersionStr)) { // create SWF
+						var obj = createSWF(att, par, replaceElemIdStr);
+						if (att.id == replaceElemIdStr) {
+							setVisibility(replaceElemIdStr, true);
+						}
+						callbackObj.success = true;
+						callbackObj.ref = obj;
+					}
+					else if (xiSwfUrlStr && canExpressInstall()) { // show Adobe Express Install
+						att.data = xiSwfUrlStr;
+						showExpressInstall(att, par, replaceElemIdStr, callbackFn);
+						return;
+					}
+					else { // show alternative content
+						setVisibility(replaceElemIdStr, true);
+					}
+					if (callbackFn) { callbackFn(callbackObj); }
+				});
+			}
+			else if (callbackFn) { callbackFn(callbackObj);	}
+		},
+		
+		switchOffAutoHideShow: function() {
+			autoHideShow = false;
+		},
+		
+		ua: ua,
+		
+		getFlashPlayerVersion: function() {
+			return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] };
+		},
+		
+		hasFlashPlayerVersion: hasPlayerVersion,
+		
+		createSWF: function(attObj, parObj, replaceElemIdStr) {
+			if (ua.w3) {
+				return createSWF(attObj, parObj, replaceElemIdStr);
+			}
+			else {
+				return undefined;
+			}
+		},
+		
+		showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) {
+			if (ua.w3 && canExpressInstall()) {
+				showExpressInstall(att, par, replaceElemIdStr, callbackFn);
+			}
+		},
+		
+		removeSWF: function(objElemIdStr) {
+			if (ua.w3) {
+				removeSWF(objElemIdStr);
+			}
+		},
+		
+		createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) {
+			if (ua.w3) {
+				createCSS(selStr, declStr, mediaStr, newStyleBoolean);
+			}
+		},
+		
+		addDomLoadEvent: addDomLoadEvent,
+		
+		addLoadEvent: addLoadEvent,
+		
+		getQueryParamValue: function(param) {
+			var q = doc.location.search || doc.location.hash;
+			if (q) {
+				if (/\?/.test(q)) { q = q.split("?")[1]; } // strip question mark
+				if (param == null) {
+					return urlEncodeIfNecessary(q);
+				}
+				var pairs = q.split("&");
+				for (var i = 0; i < pairs.length; i++) {
+					if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) {
+						return urlEncodeIfNecessary(pairs[i].substring((pairs[i].indexOf("=") + 1)));
+					}
+				}
+			}
+			return "";
+		},
+		
+		// For internal usage only
+		expressInstallCallback: function() {
+			if (isExpressInstallActive) {
+				var obj = getElementById(EXPRESS_INSTALL_ID);
+				if (obj && storedAltContent) {
+					obj.parentNode.replaceChild(storedAltContent, obj);
+					if (storedAltContentId) {
+						setVisibility(storedAltContentId, true);
+						if (ua.ie && ua.win) { storedAltContent.style.display = "block"; }
+					}
+					if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); }
+				}
+				isExpressInstallActive = false;
+			} 
+		}
+	};
+}();
diff --git a/styles.css b/styles.css
deleted file mode 100644
index 857cef04..00000000
--- a/styles.css
+++ /dev/null
@@ -1,89 +0,0 @@
-body {
-	font-family: "Times New Roman", Times, serif;
-	font-size: 14px;
-	background-attachment: fixed;
-	background-image: url(img/bg.gif);
-	background-repeat: repeat;
-	text-align: center;
-}
-.content {
-	background-color: #FFF;
-	border: 12px solid #111;
-	margin-top: 50px;
-	width: 640px;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 50px;
-	-webkit-box-shadow: 0px 3px 32px rgba(0,0,0,0.6);
-	-moz-box-shadow: 0px 3px 32px rgba(0,0,0,0.6);
-	box-shadow: 0px 3px 32px rgba(0,0,0,0.6);
-	padding: 50px;
-}
-.callout {
-	background-image: url(img/callout_bg.gif);
-	background-repeat: repeat;
-	padding: 8px;
-	border: solid 1px #EEE;
-	color: #000;
-}
-
-.news {
-	border: solid 1px #BBB;
-	padding: 16px;
-	-webkit-box-shadow: 1px 1px 4px #DDD;
-	-moz-box-shadow: 1px 1px 4px #DDD;
-	box-shadow: 1px 1px 4px #DDD;
-	margin-bottom: 1.8em;
-	background-color: #F0F7FE;
-}
-
-.newstitle {
-	font-size: 125%;
-	line-height: 1.5;
-}
-
-a {
-	color: #17B;
-}
-a:hover {
-	color: #000;
-}
-p, ul {
-	color: #333;
-	text-align: justify;
-	line-height: 1.25;
-}
-ul {
-	padding-left: 25px;
-}
-h1 {
-	font-size: 24px;
-	font-weight: normal;
-	margin-top: 10px;
-}
-h3 {
-	text-align: left;
-	margin-bottom: -1em;
-	font-size: 14px;
-	color: #000;
-}
-footer p {
-	text-align:center;
-	margin-bottom:0px;
-	font-size: 11px;
-	color: #777;
-	font-family: Arial, Helvetica, sans-serif;
-}
-
-strong {
-	color: #000;
-	font-size: 115%;
-}
-
-pre {
-	padding: 6px;
-	border: solid 1px #FFF0EE;
-	text-align: left;
-	background-color: #FFFAEA;
-	color: #000;
-}