diff --git a/LICENSE b/LICENSE
index 7a4a3ea2..6092a574 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,4 +199,228 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+   limitations under the License.
+
+   SUBCOMPONENTS
+
+   Apache Callback includes software components under different license terms.
+   Your use of these subcomponents is subject to the terms and conditions of
+   the following licenses.
+
+   For the framework/libs/junit-4.10.jar component:
+
+   Common Public License - v 1.0
+
+   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+   LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+   CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+   1. DEFINITIONS
+
+   "Contribution" means:
+
+         a) in the case of the initial Contributor, the initial code and
+            documentation distributed under this Agreement, and
+         b) in the case of each subsequent Contributor:
+
+         i) changes to the Program, and
+
+         ii) additions to the Program;
+
+         where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program. 
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+   2. GRANT OF RIGHTS
+
+         a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
+
+         b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder. 
+
+         c) Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are provided by
+any Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program.
+
+         d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement. 
+
+   3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+         a) it complies with the terms and conditions of this Agreement; and
+
+         b) its license agreement:
+
+         i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; 
+
+         ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits; 
+
+         iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
+
+         iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+         a) it must be made available under this Agreement; and 
+
+         b) a copy of this Agreement must be included with each copy of the
+Program. 
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement, including but not limited to the risks and
+costs of program errors, compliance with applicable laws, damage to or loss of
+data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such
+Recipient under this Agreement shall terminate as of the date such litigation
+is filed. In addition, if Recipient institutes patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient's patent(s), then such Recipient's rights
+granted under Section 2(b) shall terminate as of the date such litigation is
+filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation. 
diff --git a/VERSION b/VERSION
index 9c6d6293..d88d8e71 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.1
+1.7.0rc1
diff --git a/changelog b/changelog
index 0eafa220..68f6e488 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,16 @@
 ChangeLog
 ios
-Shazron Abdullah (12):
+Ben Birch (2):
+      ios camera targetWidth/Height don't match the documentation Fixes CB-183 and CB-54
+      iOS camera targetWidth/Height don't match the documentation - changes per shazron
+
+Fil Maj (1):
+      [CB-511] Changed deviceproperties version to "cordova" property
+
+Shazron Abdullah (29):
+      Updated js for iOS only parameter cropToTargetSize (Camera.getPicture)
+      Fixed CB-483 - FileTransfer - unknown property attribute 'atomic' when building from source (Xcode 3 only)
+      Updated to cordova-js 1.6.1
       Fixed CB-496 - Camera.getPicture - will always return FILE_URI even though DATA_URL specified
       Fixed CB-497 - online and offline events are not being fired in 1.6.0
       Fixed CB-501 - orientationchange event is not being fired in 1.6.0
@@ -13,37 +23,64 @@ Shazron Abdullah (12):
       Added 1.6.1 availability constants
       Fixed pause and resume event firing to use cordova channels onPause and onResume
       Re-fix CB-347 - don't apply .plist fix if the key does not exist
+      Implemented CB-536 - Add new selector to CDVViewController to create a new CDVCordovaView, so subclasses can override it
+      Removed cropToSize option, defaults to NO always (like the other platforms) re: CB-54, CB-183
+      Removing verbose logging that is confusing devs.
+      Workaround for CB-509 - geolocation.clearWatch doesn't shut the GPS down under iOS
+      Fixed CB-537 - media.seekTo fails with NSRangeException
+      Fixed CB-544 - iOS Geolocation fails if Cordova.plist EnableLocation = YES
+      Fixed CB-543 - FileTransfer.upload WebKit discarded an uncaught exception
+      Fixed CB-391 - camera.getPicture crash
+      Update to CB-391 - remove 10 sec purge check, leaving it up to the iOS watchdog to re-send memory warning again
+      Fixed CB-535 - Add a way to log JavaScript exceptions, parse errors, and get JS stack frame events (with line numbers, etc)
+      Added doc for CB-535 - JavaScript Exception Logging
+      Fixed CB-494 - Move Cordova.plist section from "How to use Cordova as a Component Guide" to its own doc
+      Added cordova-js 1.7.0rc1
+      Updated VERSION to 1.7.0rc1,  updated Makefile to include new guides.
 
 blackberry
 Fil Maj (1):
-      version 1.6.1
+      bumping version to 1.7.0rc1
 
 android
-Joe Bowser (4):
-      Copying new XML into the templates for 1.6.1.  Turns out tags are broken
-      Getting setup to tag 1.6.1
-      CB-489 - Adding .js to the example, thought it was removed for a reason
-      Adding fix for CB-482
+Fil Maj (3):
+      [CB-164] Changed network plugin to sync from async and removed setKeepCallback(true) on plugin result in there. Fixes location.reload() not firing deviceready due to network plugin being unresponsive
+      Proper fix for CB-164. Online/offline events now propagated to webview properly
+      [CB-473] run ant clean before ant debug install
+
+Joe Bowser (5):
+      CB-480 work, back button and history issues are preventing this from being tested properly
+      Fixed back button behaviour.  WIN
+      Reverting the back button change that I made, for some reason certain methods aren't inherited when you extend DroidGap
+      Fix for CB-549
+      Incrementing project to 1.7.0rc1
 
 macdonst (2):
-      Remove duplicate files from repository
-      Automatically update index.html in templates directory on version change
+      CB-539: FileTransfer.download fails when target starts with 'file://'
+      Removing un-needed logs
 
 windows
-Jesse MacFadyen (3):
-      cleanup console logging, toLower on OverrideBackButton
-      updated for 1.6.1
-      updated template, permissions, and js
+Jesse MacFadyen (11):
+      added hint to debug output when device ready cannot fire because the dev did not include the tag in their page.
+      release was private, and therefore uncallable from js
+      changed test project to use updated tests + jasmine
+      remove method added, dispatches not supported error
+      debug output for exception in ProcessCommand
+      remove unused
+      added mouse support
+      fancy animation on load, ala metro style
+      splash image is animated away on load
+      update JS from cordova-js, update version file
+      rebuild of lib + template gen
+
+Takashi Okamoto (1):
+      Fixed filetransfer boundary without parameter.
 
 webos
 hermwong (1):
-      update to 1.6.1
+      update version to 1.7.0
 
 bada
-Anis Kadri (5):
-      updating bada project parameters
-      adding artwork and removing old phonegap references
-      CB-4 adding Apache Source Headers
-      fixing network problem
-      updating version to 1.6.1
+Anis Kadri (1):
+      updating version to 1.7.0rc1
 
diff --git a/doc/_index.html b/doc/_index.html
index 529e058a..dc74057f 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_accelerometer_accelerometer.md.html b/doc/cordova_accelerometer_accelerometer.md.html
index 9f5b35a8..124f0667 100644
--- a/doc/cordova_accelerometer_accelerometer.md.html
+++ b/doc/cordova_accelerometer_accelerometer.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_camera_camera.md.html b/doc/cordova_camera_camera.md.html
index 1773c827..9aba3494 100644
--- a/doc/cordova_camera_camera.md.html
+++ b/doc/cordova_camera_camera.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
@@ -139,7 +140,7 @@ <h2>
 <li>Save the data locally (<code>LocalStorage</code>, <a class="external" href="http://brianleroux.github.com/lawnchair/">Lawnchair</a>, etc)</li>
 <li>Post the data to a remote server</li>
 </ul>
-<p>Note: The image quality of pictures taken using the camera on newer devices is quite good.  <em>Encoding such images using Base64 has caused memory issues on some of these devices (iPhone 4, BlackBerry Torch 9800).</em>  Therefore, using FILE_URI as the '<a href="cordova_camera_camera.md.html#Camera">Camera</a>.destinationType' is highly recommended.</p>
+<p>Note: The image quality of pictures taken using the camera on newer devices is quite good, and images from the Photo Album will not be downscaled to a lower quality, even if a quality parameter is specified.  <em>Encoding such images using Base64 has caused memory issues on some of these devices (iPhone 4, BlackBerry Torch 9800).</em>  Therefore, using FILE_URI as the '<a href="cordova_camera_camera.md.html#Camera">Camera</a>.destinationType' is highly recommended.</p>
 
 <h2>
 <a name="camera.getPicture_supported_platforms">Supported Platforms</a>
diff --git a/doc/cordova_compass_compass.md.html b/doc/cordova_compass_compass.md.html
index 4f5e6d2d..8e3dfede 100644
--- a/doc/cordova_compass_compass.md.html
+++ b/doc/cordova_compass_compass.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_connection_connection.md.html b/doc/cordova_connection_connection.md.html
index e4f04bca..5c261fbe 100644
--- a/doc/cordova_connection_connection.md.html
+++ b/doc/cordova_connection_connection.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_contacts_contacts.md.html b/doc/cordova_contacts_contacts.md.html
index 704cae6e..801bb34e 100644
--- a/doc/cordova_contacts_contacts.md.html
+++ b/doc/cordova_contacts_contacts.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_device_device.md.html b/doc/cordova_device_device.md.html
index b71d5535..82f3061c 100644
--- a/doc/cordova_device_device.md.html
+++ b/doc/cordova_device_device.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_events_events.md.html b/doc/cordova_events_events.md.html
index bd407ca3..27bb667d 100644
--- a/doc/cordova_events_events.md.html
+++ b/doc/cordova_events_events.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_file_file.md.html b/doc/cordova_file_file.md.html
index 83bc5bee..21599ed1 100644
--- a/doc/cordova_file_file.md.html
+++ b/doc/cordova_file_file.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
@@ -524,13 +525,13 @@ <h2>
 <li>
 <strong>truncate</strong>: Shortens the file to the length specified.</li>
 <li>
-<strong>write</strong>: Writes data to the file.</li>
+<strong>write</strong>: Writes data to the file with a UTF-8 encoding.</li>
 </ul>
 <h2>
 <a name="FileWriter_details">Details</a>
 </h2>
 
-<p>The <code><a href="cordova_file_file.md.html#FileWriter">FileWriter</a></code> object is a way to write files from the devices file system.  Users register their own event listeners to receive the writestart, progress, write, writeend, error and abort events.</p>
+<p>The <code><a href="cordova_file_file.md.html#FileWriter">FileWriter</a></code> object is a way to write files to the device file system (UTF-8 encoded).  Users register their own event listeners to receive the writestart, progress, write, writeend, error and abort events.</p>
 
 <p>A <a href="cordova_file_file.md.html#FileWriter">FileWriter</a> is created for a single file. You can use it to write to a file multiple times. The <a href="cordova_file_file.md.html#FileWriter">FileWriter</a> maintains the file's position and length attributes, so you can seek and write anywhere in the file. By default, the <a href="cordova_file_file.md.html#FileWriter">FileWriter</a> writes to the beginning of the file (will overwrite existing data). Set the optional append boolean to true in the <a href="cordova_file_file.md.html#FileWriter">FileWriter</a>'s constructor to begin writing to the end of the file.</p>
 
diff --git a/doc/cordova_geolocation_geolocation.md.html b/doc/cordova_geolocation_geolocation.md.html
index e7735d7c..3a1bdb8d 100644
--- a/doc/cordova_geolocation_geolocation.md.html
+++ b/doc/cordova_geolocation_geolocation.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_media_capture_capture.md.html b/doc/cordova_media_capture_capture.md.html
index 0e46d7aa..b476cdb0 100644
--- a/doc/cordova_media_capture_capture.md.html
+++ b/doc/cordova_media_capture_capture.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_media_media.md.html b/doc/cordova_media_media.md.html
index 70574b3c..d1ab7842 100644
--- a/doc/cordova_media_media.md.html
+++ b/doc/cordova_media_media.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_notification_notification.md.html b/doc/cordova_notification_notification.md.html
index c333bb9d..2589e3aa 100644
--- a/doc/cordova_notification_notification.md.html
+++ b/doc/cordova_notification_notification.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/cordova_storage_storage.md.html b/doc/cordova_storage_storage.md.html
index f32cb0b1..e03a1524 100644
--- a/doc/cordova_storage_storage.md.html
+++ b/doc/cordova_storage_storage.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/guide_getting-started_android_index.md.html b/doc/guide_getting-started_android_index.md.html
index ec918352..eaa31ba3 100644
--- a/doc/guide_getting-started_android_index.md.html
+++ b/doc/guide_getting-started_android_index.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/guide_getting-started_blackberry_index.md.html b/doc/guide_getting-started_blackberry_index.md.html
index 08f27159..f13f0896 100644
--- a/doc/guide_getting-started_blackberry_index.md.html
+++ b/doc/guide_getting-started_blackberry_index.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/guide_getting-started_index.md.html b/doc/guide_getting-started_index.md.html
index 8b464c53..e4fccf39 100644
--- a/doc/guide_getting-started_index.md.html
+++ b/doc/guide_getting-started_index.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/guide_getting-started_ios_index.md.html b/doc/guide_getting-started_ios_index.md.html
index e7e7ccc0..8a9872fb 100644
--- a/doc/guide_getting-started_ios_index.md.html
+++ b/doc/guide_getting-started_ios_index.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/guide_getting-started_symbian_index.md.html b/doc/guide_getting-started_symbian_index.md.html
index 610845ab..5021a5ad 100644
--- a/doc/guide_getting-started_symbian_index.md.html
+++ b/doc/guide_getting-started_symbian_index.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/guide_getting-started_webos_index.md.html b/doc/guide_getting-started_webos_index.md.html
index cb745ba0..36ba1b18 100644
--- a/doc/guide_getting-started_webos_index.md.html
+++ b/doc/guide_getting-started_webos_index.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/guide_getting-started_windows-phone_index.md.html b/doc/guide_getting-started_windows-phone_index.md.html
index 5d9a04cf..092cb115 100644
--- a/doc/guide_getting-started_windows-phone_index.md.html
+++ b/doc/guide_getting-started_windows-phone_index.md.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/doc/index.html b/doc/index.html
index 74d115ab..05966664 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -15,7 +15,8 @@ <h1><a href="index.html"><strong>Cordova</strong> Documentation</a></h1>
             <small>
                 <select><optgroup label="English" value="en">
 <option value="edge">edge</option>
-<option selected value="1.6.1">1.6.1</option>
+<option selected value="1.7.0rc1">1.7.0rc1</option>
+<option value="1.6.1">1.6.1</option>
 <option value="1.6.0rc1">1.6.0rc1</option>
 <option value="1.6.0">1.6.0</option>
 <option value="1.5.0rc1">1.5.0rc1</option>
diff --git a/lib/android/VERSION b/lib/android/VERSION
index 9c6d6293..d88d8e71 100644
--- a/lib/android/VERSION
+++ b/lib/android/VERSION
@@ -1 +1 @@
-1.6.1
+1.7.0rc1
diff --git a/lib/android/cordova-1.6.1.jar b/lib/android/cordova-1.7.0rc1.jar
similarity index 74%
rename from lib/android/cordova-1.6.1.jar
rename to lib/android/cordova-1.7.0rc1.jar
index 75b7e058..bfa27ab8 100644
Binary files a/lib/android/cordova-1.6.1.jar and b/lib/android/cordova-1.7.0rc1.jar differ
diff --git a/lib/android/example/assets/www/cordova-1.6.1.js b/lib/android/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/android/example/assets/www/cordova-1.6.1.js
rename to lib/android/cordova-1.7.0rc1.js
index 1b879160..cf56912e 100644
--- a/lib/android/example/assets/www/cordova-1.6.1.js
+++ b/lib/android/cordova-1.7.0rc1.js
@@ -1,6 +1,6 @@
-// commit b2de4baa76a94ecb916619a536339ffee9ef6843
+// commit 017a948047e355ae0c2cdc8c4188ae57b115528a
 
-// File generated at :: Tue Apr 17 2012 12:19:35 GMT-0700 (PDT)
+// File generated at :: Mon Apr 23 2012 11:36:23 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -67,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -115,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -149,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -292,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -304,7 +319,7 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
@@ -326,6 +341,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -502,10 +519,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -542,7 +559,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -587,7 +604,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -601,7 +618,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -656,7 +673,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -841,7 +857,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/android/exec.js
@@ -873,7 +888,8 @@ module.exports = function(success, fail, service, action, args) {
 
     // If a result was returned
     if (r.length > 0) {
-        eval("var v="+r+";");
+        var v;
+        eval("v="+r+";");
 
         // If status is OK, then return value back to caller
         if (v.status === cordova.callbackStatus.OK) {
@@ -1003,7 +1019,7 @@ module.exports = {
                 var db = null;
                 try {
                     db = originalOpenDatabase(name, version, desc, size);
-                } 
+                }
                 catch (ex) {
                     if (ex.code === 18) {
                         db = null;
@@ -1018,7 +1034,7 @@ module.exports = {
                 else {
                     return db;
                 }
-              
+
             };
         }
 
@@ -1077,7 +1093,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -1090,7 +1105,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1172,35 +1186,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1225,7 +1238,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1234,16 +1246,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1255,7 +1266,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1267,7 +1278,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1276,14 +1286,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1292,16 +1301,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1319,7 +1327,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1332,7 +1339,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1341,18 +1347,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1361,15 +1366,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1390,7 +1394,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1399,7 +1403,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1414,7 +1418,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1533,7 +1537,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1545,13 +1549,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1581,7 +1584,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1607,7 +1609,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1628,7 +1629,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1646,7 +1646,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1671,7 +1670,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1699,7 +1697,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1747,7 +1744,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1755,6 +1751,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1837,7 +1834,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1858,10 +1856,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -2086,7 +2084,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -2101,15 +2098,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2177,7 +2173,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2207,7 +2202,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2461,7 +2455,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2483,7 +2476,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2542,16 +2534,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2575,7 +2567,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2596,7 +2587,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2612,13 +2602,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2777,7 +2766,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2877,7 +2866,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2890,7 +2879,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2908,7 +2896,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -3090,7 +3077,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -3100,7 +3087,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -3121,7 +3107,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -3147,16 +3132,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3182,7 +3167,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3197,22 +3181,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3220,7 +3203,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3228,12 +3210,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3255,7 +3236,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3306,7 +3286,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3406,7 +3385,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/android/plugin/android/app.js
@@ -3469,7 +3447,7 @@ module.exports = {
    * Note: The user should not have to call this method.  Instead, when the user
    *       registers for the "backbutton" event, this is automatically done.
    *
-   * @param override		T=override, F=cancel override
+   * @param override        T=override, F=cancel override
    */
   overrideBackbutton:function(override) {
     exec(null, null, "App", "overrideBackbutton", [override]);
@@ -3480,9 +3458,8 @@ module.exports = {
    */
   exitApp:function() {
     return exec(null, null, "App", "exitApp", []);
-  } 
+  }
 };
-
 });
 
 // file: lib/android/plugin/android/callback.js
@@ -3572,7 +3549,6 @@ var port = null,
 };
 
 module.exports = callback;
-
 });
 
 // file: lib/android/plugin/android/device.js
@@ -3643,8 +3619,8 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
  * You must explicitly override the back button.
  */
 Device.prototype.overrideBackButton = function() {
-	console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
-	navigator.app.overrideBackbutton(true);
+    console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
+    navigator.app.overrideBackbutton(true);
 };
 
 /*
@@ -3654,8 +3630,8 @@ Device.prototype.overrideBackButton = function() {
  * This resets the back button to the default behaviour
  */
 Device.prototype.resetBackButton = function() {
-	console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
-	navigator.app.overrideBackbutton(false);
+    console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
+    navigator.app.overrideBackbutton(false);
 };
 
 /*
@@ -3665,12 +3641,11 @@ Device.prototype.resetBackButton = function() {
  * This terminates the activity!
  */
 Device.prototype.exitApp = function() {
-	console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
-	navigator.app.exitApp();
+    console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
+    navigator.app.exitApp();
 };
 
 module.exports = new Device();
-
 });
 
 // file: lib/android/plugin/android/notification.js
@@ -3726,7 +3701,7 @@ module.exports = {
      */
     progressValue : function(value) {
         exec(null, null, 'Notification', 'progressValue', [ value ]);
-    },
+    }
 };
 });
 
@@ -3765,13 +3740,12 @@ var cordova = require('cordova'),
 };
 
 module.exports = polling;
-
 });
 
 // file: lib/android/plugin/android/storage.js
 define("cordova/plugin/android/storage", function(require, exports, module) {
 var utils = require('cordova/utils'),
-    exec = require('cordova/exec');
+    exec = require('cordova/exec'),
     channel = require('cordova/channel');
 
 var queryQueue = {};
@@ -4077,7 +4051,7 @@ var CupcakeLocalStorage = function() {
           transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
           transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
             for(var i = 0; i < result.rows.length; i++) {
-              storage[result.rows.item(i)['id']] =  result.rows.item(i)['body'];
+              storage[result.rows.item(i).id] =  result.rows.item(i).body;
             }
             setLength(result.rows.length);
             channel.initializationComplete("cupcakeStorage");
@@ -4160,7 +4134,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -4203,30 +4177,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -4239,7 +4213,6 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/common/plugin/capture.js
@@ -4250,7 +4223,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -4276,9 +4249,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -4331,7 +4304,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -4355,8 +4328,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -4365,7 +4338,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -4389,17 +4362,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -4410,19 +4383,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -4484,7 +4456,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -4548,7 +4519,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -4583,7 +4554,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -4648,7 +4618,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -4709,7 +4678,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/common/plugin/requestFileSystem.js
@@ -4754,13 +4722,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -4822,12 +4790,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -4835,15 +4803,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -4886,7 +4854,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -4909,7 +4877,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -4920,20 +4887,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -4966,11 +4919,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -4983,5 +4936,4 @@ window.cordova = require('cordova');
 
 }(window));
 
-
 })();
\ No newline at end of file
diff --git a/lib/android/example/libs/cordova-1.6.1.jar b/lib/android/example/.cordova/android/cordova-1.7.0rc1.jar
similarity index 74%
rename from lib/android/example/libs/cordova-1.6.1.jar
rename to lib/android/example/.cordova/android/cordova-1.7.0rc1.jar
index 75b7e058..bfa27ab8 100644
Binary files a/lib/android/example/libs/cordova-1.6.1.jar and b/lib/android/example/.cordova/android/cordova-1.7.0rc1.jar differ
diff --git a/lib/android/cordova-1.6.1.js b/lib/android/example/.cordova/android/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/android/cordova-1.6.1.js
rename to lib/android/example/.cordova/android/cordova-1.7.0rc1.js
index 1b879160..cf56912e 100644
--- a/lib/android/cordova-1.6.1.js
+++ b/lib/android/example/.cordova/android/cordova-1.7.0rc1.js
@@ -1,6 +1,6 @@
-// commit b2de4baa76a94ecb916619a536339ffee9ef6843
+// commit 017a948047e355ae0c2cdc8c4188ae57b115528a
 
-// File generated at :: Tue Apr 17 2012 12:19:35 GMT-0700 (PDT)
+// File generated at :: Mon Apr 23 2012 11:36:23 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -67,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -115,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -149,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -292,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -304,7 +319,7 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
@@ -326,6 +341,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -502,10 +519,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -542,7 +559,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -587,7 +604,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -601,7 +618,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -656,7 +673,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -841,7 +857,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/android/exec.js
@@ -873,7 +888,8 @@ module.exports = function(success, fail, service, action, args) {
 
     // If a result was returned
     if (r.length > 0) {
-        eval("var v="+r+";");
+        var v;
+        eval("v="+r+";");
 
         // If status is OK, then return value back to caller
         if (v.status === cordova.callbackStatus.OK) {
@@ -1003,7 +1019,7 @@ module.exports = {
                 var db = null;
                 try {
                     db = originalOpenDatabase(name, version, desc, size);
-                } 
+                }
                 catch (ex) {
                     if (ex.code === 18) {
                         db = null;
@@ -1018,7 +1034,7 @@ module.exports = {
                 else {
                     return db;
                 }
-              
+
             };
         }
 
@@ -1077,7 +1093,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -1090,7 +1105,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1172,35 +1186,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1225,7 +1238,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1234,16 +1246,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1255,7 +1266,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1267,7 +1278,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1276,14 +1286,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1292,16 +1301,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1319,7 +1327,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1332,7 +1339,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1341,18 +1347,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1361,15 +1366,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1390,7 +1394,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1399,7 +1403,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1414,7 +1418,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1533,7 +1537,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1545,13 +1549,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1581,7 +1584,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1607,7 +1609,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1628,7 +1629,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1646,7 +1646,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1671,7 +1670,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1699,7 +1697,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1747,7 +1744,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1755,6 +1751,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1837,7 +1834,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1858,10 +1856,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -2086,7 +2084,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -2101,15 +2098,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2177,7 +2173,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2207,7 +2202,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2461,7 +2455,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2483,7 +2476,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2542,16 +2534,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2575,7 +2567,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2596,7 +2587,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2612,13 +2602,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2777,7 +2766,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2877,7 +2866,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2890,7 +2879,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2908,7 +2896,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -3090,7 +3077,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -3100,7 +3087,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -3121,7 +3107,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -3147,16 +3132,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3182,7 +3167,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3197,22 +3181,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3220,7 +3203,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3228,12 +3210,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3255,7 +3236,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3306,7 +3286,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3406,7 +3385,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/android/plugin/android/app.js
@@ -3469,7 +3447,7 @@ module.exports = {
    * Note: The user should not have to call this method.  Instead, when the user
    *       registers for the "backbutton" event, this is automatically done.
    *
-   * @param override		T=override, F=cancel override
+   * @param override        T=override, F=cancel override
    */
   overrideBackbutton:function(override) {
     exec(null, null, "App", "overrideBackbutton", [override]);
@@ -3480,9 +3458,8 @@ module.exports = {
    */
   exitApp:function() {
     return exec(null, null, "App", "exitApp", []);
-  } 
+  }
 };
-
 });
 
 // file: lib/android/plugin/android/callback.js
@@ -3572,7 +3549,6 @@ var port = null,
 };
 
 module.exports = callback;
-
 });
 
 // file: lib/android/plugin/android/device.js
@@ -3643,8 +3619,8 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
  * You must explicitly override the back button.
  */
 Device.prototype.overrideBackButton = function() {
-	console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
-	navigator.app.overrideBackbutton(true);
+    console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
+    navigator.app.overrideBackbutton(true);
 };
 
 /*
@@ -3654,8 +3630,8 @@ Device.prototype.overrideBackButton = function() {
  * This resets the back button to the default behaviour
  */
 Device.prototype.resetBackButton = function() {
-	console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
-	navigator.app.overrideBackbutton(false);
+    console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
+    navigator.app.overrideBackbutton(false);
 };
 
 /*
@@ -3665,12 +3641,11 @@ Device.prototype.resetBackButton = function() {
  * This terminates the activity!
  */
 Device.prototype.exitApp = function() {
-	console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
-	navigator.app.exitApp();
+    console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
+    navigator.app.exitApp();
 };
 
 module.exports = new Device();
-
 });
 
 // file: lib/android/plugin/android/notification.js
@@ -3726,7 +3701,7 @@ module.exports = {
      */
     progressValue : function(value) {
         exec(null, null, 'Notification', 'progressValue', [ value ]);
-    },
+    }
 };
 });
 
@@ -3765,13 +3740,12 @@ var cordova = require('cordova'),
 };
 
 module.exports = polling;
-
 });
 
 // file: lib/android/plugin/android/storage.js
 define("cordova/plugin/android/storage", function(require, exports, module) {
 var utils = require('cordova/utils'),
-    exec = require('cordova/exec');
+    exec = require('cordova/exec'),
     channel = require('cordova/channel');
 
 var queryQueue = {};
@@ -4077,7 +4051,7 @@ var CupcakeLocalStorage = function() {
           transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
           transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
             for(var i = 0; i < result.rows.length; i++) {
-              storage[result.rows.item(i)['id']] =  result.rows.item(i)['body'];
+              storage[result.rows.item(i).id] =  result.rows.item(i).body;
             }
             setLength(result.rows.length);
             channel.initializationComplete("cupcakeStorage");
@@ -4160,7 +4134,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -4203,30 +4177,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -4239,7 +4213,6 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/common/plugin/capture.js
@@ -4250,7 +4223,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -4276,9 +4249,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -4331,7 +4304,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -4355,8 +4328,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -4365,7 +4338,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -4389,17 +4362,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -4410,19 +4383,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -4484,7 +4456,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -4548,7 +4519,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -4583,7 +4554,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -4648,7 +4618,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -4709,7 +4678,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/common/plugin/requestFileSystem.js
@@ -4754,13 +4722,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -4822,12 +4790,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -4835,15 +4803,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -4886,7 +4854,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -4909,7 +4877,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -4920,20 +4887,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -4966,11 +4919,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -4983,5 +4936,4 @@ window.cordova = require('cordova');
 
 }(window));
 
-
 })();
\ No newline at end of file
diff --git a/lib/android/example/.cordova/config b/lib/android/example/.cordova/config
index 85ef6878..15f1f59c 100644
--- a/lib/android/example/.cordova/config
+++ b/lib/android/example/.cordova/config
@@ -1,4 +1,4 @@
-VERSION=1.6.1
+VERSION=1.7.0rc1
 PROJECT_PATH=./example
 PACKAGE=org.apache.cordova.example
 ACTIVITY=cordovaExample
diff --git a/lib/android/example/.cordova/android/cordova-1.6.1.js b/lib/android/example/assets/www/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/android/example/.cordova/android/cordova-1.6.1.js
rename to lib/android/example/assets/www/cordova-1.7.0rc1.js
index 1b879160..cf56912e 100644
--- a/lib/android/example/.cordova/android/cordova-1.6.1.js
+++ b/lib/android/example/assets/www/cordova-1.7.0rc1.js
@@ -1,6 +1,6 @@
-// commit b2de4baa76a94ecb916619a536339ffee9ef6843
+// commit 017a948047e355ae0c2cdc8c4188ae57b115528a
 
-// File generated at :: Tue Apr 17 2012 12:19:35 GMT-0700 (PDT)
+// File generated at :: Mon Apr 23 2012 11:36:23 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -67,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -115,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -149,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -292,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -304,7 +319,7 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
@@ -326,6 +341,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -502,10 +519,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -542,7 +559,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -587,7 +604,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -601,7 +618,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -656,7 +673,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -841,7 +857,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/android/exec.js
@@ -873,7 +888,8 @@ module.exports = function(success, fail, service, action, args) {
 
     // If a result was returned
     if (r.length > 0) {
-        eval("var v="+r+";");
+        var v;
+        eval("v="+r+";");
 
         // If status is OK, then return value back to caller
         if (v.status === cordova.callbackStatus.OK) {
@@ -1003,7 +1019,7 @@ module.exports = {
                 var db = null;
                 try {
                     db = originalOpenDatabase(name, version, desc, size);
-                } 
+                }
                 catch (ex) {
                     if (ex.code === 18) {
                         db = null;
@@ -1018,7 +1034,7 @@ module.exports = {
                 else {
                     return db;
                 }
-              
+
             };
         }
 
@@ -1077,7 +1093,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -1090,7 +1105,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1172,35 +1186,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1225,7 +1238,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1234,16 +1246,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1255,7 +1266,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1267,7 +1278,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1276,14 +1286,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1292,16 +1301,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1319,7 +1327,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1332,7 +1339,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1341,18 +1347,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1361,15 +1366,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1390,7 +1394,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1399,7 +1403,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1414,7 +1418,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1533,7 +1537,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1545,13 +1549,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1581,7 +1584,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1607,7 +1609,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1628,7 +1629,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1646,7 +1646,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1671,7 +1670,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1699,7 +1697,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1747,7 +1744,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1755,6 +1751,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1837,7 +1834,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1858,10 +1856,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -2086,7 +2084,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -2101,15 +2098,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2177,7 +2173,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2207,7 +2202,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2461,7 +2455,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2483,7 +2476,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2542,16 +2534,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2575,7 +2567,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2596,7 +2587,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2612,13 +2602,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2777,7 +2766,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2877,7 +2866,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2890,7 +2879,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2908,7 +2896,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -3090,7 +3077,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -3100,7 +3087,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -3121,7 +3107,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -3147,16 +3132,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3182,7 +3167,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3197,22 +3181,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3220,7 +3203,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3228,12 +3210,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3255,7 +3236,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3306,7 +3286,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3406,7 +3385,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/android/plugin/android/app.js
@@ -3469,7 +3447,7 @@ module.exports = {
    * Note: The user should not have to call this method.  Instead, when the user
    *       registers for the "backbutton" event, this is automatically done.
    *
-   * @param override		T=override, F=cancel override
+   * @param override        T=override, F=cancel override
    */
   overrideBackbutton:function(override) {
     exec(null, null, "App", "overrideBackbutton", [override]);
@@ -3480,9 +3458,8 @@ module.exports = {
    */
   exitApp:function() {
     return exec(null, null, "App", "exitApp", []);
-  } 
+  }
 };
-
 });
 
 // file: lib/android/plugin/android/callback.js
@@ -3572,7 +3549,6 @@ var port = null,
 };
 
 module.exports = callback;
-
 });
 
 // file: lib/android/plugin/android/device.js
@@ -3643,8 +3619,8 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
  * You must explicitly override the back button.
  */
 Device.prototype.overrideBackButton = function() {
-	console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
-	navigator.app.overrideBackbutton(true);
+    console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
+    navigator.app.overrideBackbutton(true);
 };
 
 /*
@@ -3654,8 +3630,8 @@ Device.prototype.overrideBackButton = function() {
  * This resets the back button to the default behaviour
  */
 Device.prototype.resetBackButton = function() {
-	console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
-	navigator.app.overrideBackbutton(false);
+    console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
+    navigator.app.overrideBackbutton(false);
 };
 
 /*
@@ -3665,12 +3641,11 @@ Device.prototype.resetBackButton = function() {
  * This terminates the activity!
  */
 Device.prototype.exitApp = function() {
-	console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
-	navigator.app.exitApp();
+    console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
+    navigator.app.exitApp();
 };
 
 module.exports = new Device();
-
 });
 
 // file: lib/android/plugin/android/notification.js
@@ -3726,7 +3701,7 @@ module.exports = {
      */
     progressValue : function(value) {
         exec(null, null, 'Notification', 'progressValue', [ value ]);
-    },
+    }
 };
 });
 
@@ -3765,13 +3740,12 @@ var cordova = require('cordova'),
 };
 
 module.exports = polling;
-
 });
 
 // file: lib/android/plugin/android/storage.js
 define("cordova/plugin/android/storage", function(require, exports, module) {
 var utils = require('cordova/utils'),
-    exec = require('cordova/exec');
+    exec = require('cordova/exec'),
     channel = require('cordova/channel');
 
 var queryQueue = {};
@@ -4077,7 +4051,7 @@ var CupcakeLocalStorage = function() {
           transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
           transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
             for(var i = 0; i < result.rows.length; i++) {
-              storage[result.rows.item(i)['id']] =  result.rows.item(i)['body'];
+              storage[result.rows.item(i).id] =  result.rows.item(i).body;
             }
             setLength(result.rows.length);
             channel.initializationComplete("cupcakeStorage");
@@ -4160,7 +4134,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -4203,30 +4177,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -4239,7 +4213,6 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/common/plugin/capture.js
@@ -4250,7 +4223,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -4276,9 +4249,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -4331,7 +4304,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -4355,8 +4328,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -4365,7 +4338,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -4389,17 +4362,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -4410,19 +4383,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -4484,7 +4456,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -4548,7 +4519,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -4583,7 +4554,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -4648,7 +4618,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -4709,7 +4678,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/common/plugin/requestFileSystem.js
@@ -4754,13 +4722,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -4822,12 +4790,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -4835,15 +4803,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -4886,7 +4854,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -4909,7 +4877,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -4920,20 +4887,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -4966,11 +4919,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -4983,5 +4936,4 @@ window.cordova = require('cordova');
 
 }(window));
 
-
 })();
\ No newline at end of file
diff --git a/lib/android/example/assets/www/index.html b/lib/android/example/assets/www/index.html
index bf3e0859..88927d72 100644
--- a/lib/android/example/assets/www/index.html
+++ b/lib/android/example/assets/www/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>PhoneGap</title>
       <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
-      <script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.7.0rc1.js"></script>
       <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>
diff --git a/lib/android/example/cordova/debug b/lib/android/example/cordova/debug
index 8dd31874..0bac2c79 100755
--- a/lib/android/example/cordova/debug
+++ b/lib/android/example/cordova/debug
@@ -4,6 +4,6 @@
 
 # if there are no devices listed then emulate
 
-
+ant clean
 ant debug install
 adb shell am start -n $PACKAGE/$PACKAGE.$ACTIVITY
diff --git a/lib/android/example/cordova/templates/project/assets/www/index.html b/lib/android/example/cordova/templates/project/assets/www/index.html
index bf3e0859..88927d72 100644
--- a/lib/android/example/cordova/templates/project/assets/www/index.html
+++ b/lib/android/example/cordova/templates/project/assets/www/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>PhoneGap</title>
       <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
-      <script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.7.0rc1.js"></script>
       <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>
diff --git a/lib/android/example/.cordova/android/cordova-1.6.1.jar b/lib/android/example/libs/cordova-1.7.0rc1.jar
similarity index 74%
rename from lib/android/example/.cordova/android/cordova-1.6.1.jar
rename to lib/android/example/libs/cordova-1.7.0rc1.jar
index 75b7e058..bfa27ab8 100644
Binary files a/lib/android/example/.cordova/android/cordova-1.6.1.jar and b/lib/android/example/libs/cordova-1.7.0rc1.jar differ
diff --git a/lib/bada/VERSION b/lib/bada/VERSION
index 64a542d4..e07cf32a 100644
--- a/lib/bada/VERSION
+++ b/lib/bada/VERSION
@@ -1,2 +1,2 @@
-1.6.1
+1.7.0rc1
 
diff --git a/lib/bada/src/Device.cpp b/lib/bada/src/Device.cpp
index 15246baf..a22eb541 100755
--- a/lib/bada/src/Device.cpp
+++ b/lib/bada/src/Device.cpp
@@ -69,7 +69,7 @@ Device::SetDeviceInfo() {
 
     if(r == E_SUCCESS) {
     	String res;
-    	res.Format(1024, L"window.device={platform:'bada',version:'%S',name:'n/a',cordova:'1.6.1',uuid:'%S'}", platformVersion.GetPointer(), imei.GetPointer());
+    	res.Format(1024, L"window.device={platform:'bada',version:'%S',name:'n/a',cordova:'1.7.0rc1',uuid:'%S'}", platformVersion.GetPointer(), imei.GetPointer());
     	//AppLogDebug("%S", res.GetPointer());
     	pWeb->EvaluateJavascriptN(res);
     }
diff --git a/lib/blackberry/sample/lib/cordova.1.6.1/ext-air/Cordova_Network/library.xml b/lib/blackberry/sample/lib/cordova.1.7.0rc1/ext-air/Cordova_Network/library.xml
similarity index 100%
rename from lib/blackberry/sample/lib/cordova.1.6.1/ext-air/Cordova_Network/library.xml
rename to lib/blackberry/sample/lib/cordova.1.7.0rc1/ext-air/Cordova_Network/library.xml
diff --git a/lib/blackberry/sample/lib/cordova.1.6.1/ext-air/Cordova_Network/src/org/apache/cordova/network/Network.as b/lib/blackberry/sample/lib/cordova.1.7.0rc1/ext-air/Cordova_Network/src/org/apache/cordova/network/Network.as
similarity index 100%
rename from lib/blackberry/sample/lib/cordova.1.6.1/ext-air/Cordova_Network/src/org/apache/cordova/network/Network.as
rename to lib/blackberry/sample/lib/cordova.1.7.0rc1/ext-air/Cordova_Network/src/org/apache/cordova/network/Network.as
diff --git a/lib/blackberry/sample/www/ext/cordova.1.6.1.jar b/lib/blackberry/sample/lib/cordova.1.7.0rc1/ext/cordova.1.7.0rc1.jar
similarity index 92%
rename from lib/blackberry/sample/www/ext/cordova.1.6.1.jar
rename to lib/blackberry/sample/lib/cordova.1.7.0rc1/ext/cordova.1.7.0rc1.jar
index 42ecff8c..a7af983c 100644
Binary files a/lib/blackberry/sample/www/ext/cordova.1.6.1.jar and b/lib/blackberry/sample/lib/cordova.1.7.0rc1/ext/cordova.1.7.0rc1.jar differ
diff --git a/lib/blackberry/sample/www/cordova-1.6.1.js b/lib/blackberry/sample/lib/cordova.1.7.0rc1/javascript/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/blackberry/sample/www/cordova-1.6.1.js
rename to lib/blackberry/sample/lib/cordova.1.7.0rc1/javascript/cordova-1.7.0rc1.js
index 801b37f9..d4680da6 100644
--- a/lib/blackberry/sample/www/cordova-1.6.1.js
+++ b/lib/blackberry/sample/lib/cordova.1.7.0rc1/javascript/cordova-1.7.0rc1.js
@@ -1,4 +1,6 @@
-// File generated at :: Tue Apr 10 2012 15:32:24 GMT-0500 (CDT)
+// commit a42f0ae6245e7609c9bad1eb582777a696201aad
+
+// File generated at :: Tue Apr 24 2012 15:08:45 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -65,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -113,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -147,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -290,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -302,13 +319,16 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
 if (!window.PhoneGap) {
     window.PhoneGap = cordova;
 }
+if (!window.Cordova) {
+    window.Cordova = cordova;
+}
 
 /**
  * Plugins object
@@ -324,6 +344,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -500,10 +522,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -540,7 +562,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -585,7 +607,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -599,7 +621,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -654,7 +676,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -839,7 +860,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/blackberry/exec.js
@@ -901,7 +921,6 @@ module.exports = function(success, fail, service, action, args) {
         utils.alert("Error: "+e);
     }
 };
-
 });
 
 // file: lib/blackberry/platform.js
@@ -1085,7 +1104,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -1098,7 +1116,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1180,35 +1197,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1233,7 +1249,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1242,16 +1257,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1263,7 +1277,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1275,7 +1289,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1284,14 +1297,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1300,16 +1312,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1327,7 +1338,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1340,7 +1350,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1349,18 +1358,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1369,15 +1377,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1398,7 +1405,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1407,7 +1414,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1422,7 +1429,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1541,7 +1548,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1553,13 +1560,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1589,7 +1595,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1615,7 +1620,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1636,7 +1640,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1654,7 +1657,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1679,7 +1681,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1707,7 +1708,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1755,7 +1755,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1763,6 +1762,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1845,7 +1845,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1866,10 +1867,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -2094,7 +2095,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -2109,15 +2109,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2185,7 +2184,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2215,7 +2213,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2469,7 +2466,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2491,7 +2487,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2550,16 +2545,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2583,7 +2578,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2604,7 +2598,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2620,13 +2613,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2785,7 +2777,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2885,7 +2877,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2898,7 +2890,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2916,7 +2907,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -3098,7 +3088,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -3108,7 +3098,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -3129,7 +3118,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -3155,16 +3143,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3190,7 +3178,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3205,22 +3192,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3228,7 +3214,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3236,12 +3221,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3263,7 +3247,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3314,7 +3297,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3414,7 +3396,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/common/plugin/battery.js
@@ -3427,7 +3408,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -3470,30 +3451,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -3506,13 +3487,13 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/blackberry/plugin/blackberry/Contact.js
 define("cordova/plugin/blackberry/Contact", function(require, exports, module) {
 var ContactError = require('cordova/plugin/ContactError'),
     ContactUtils = require('cordova/plugin/blackberry/ContactUtils'),
+    ContactAddress = require('cordova/plugin/ContactAddress'),
     exec = require('cordova/exec');
 
 // ------------------
@@ -3666,12 +3647,12 @@ var saveToDevice = function(contact) {
 
         var type = null;
         var number = null;
-        for ( var i = 0; i < contact.phoneNumbers.length; i += 1) {
-            if (!contact.phoneNumbers[i] || !contact.phoneNumbers[i].value) {
+        for ( var j = 0; j < contact.phoneNumbers.length; j += 1) {
+            if (!contact.phoneNumbers[j] || !contact.phoneNumbers[j].value) {
                 continue;
             }
-            type = contact.phoneNumbers[i].type;
-            number = contact.phoneNumbers[i].value;
+            type = contact.phoneNumbers[j].type;
+            number = contact.phoneNumbers[j].value;
             if (type === 'home') {
                 if (bbContact.homePhone === "") {
                     bbContact.homePhone = number;
@@ -3709,18 +3690,16 @@ var saveToDevice = function(contact) {
         var address = null;
         var bbHomeAddress = null;
         var bbWorkAddress = null;
-        for ( var i = 0; i < contact.addresses.length; i += 1) {
-            address = contact.addresses[i];
+        for ( var k = 0; k < contact.addresses.length; k += 1) {
+            address = contact.addresses[k];
             if (!address || address instanceof ContactAddress === false) {
                 continue;
             }
 
-            if (bbHomeAddress === null
-                    && (!address.type || address.type === "home")) {
+            if (bbHomeAddress === null && (!address.type || address.type === "home")) {
                 bbHomeAddress = createBlackBerryAddress(address);
                 bbContact.homeAddress = bbHomeAddress;
-            } else if (bbWorkAddress === null
-                    && (!address.type || address.type === "work")) {
+            } else if (bbWorkAddress === null && (!address.type || address.type === "work")) {
                 bbWorkAddress = createBlackBerryAddress(address);
                 bbContact.workAddress = bbWorkAddress;
             }
@@ -3736,8 +3715,8 @@ var saveToDevice = function(contact) {
         }
 
         var url = null;
-        for ( var i = 0; i < contact.urls.length; i += 1) {
-            url = contact.urls[i];
+        for ( var m = 0; m < contact.urls.length; m += 1) {
+            url = contact.urls[m];
             if (!url || !url.value) {
                 continue;
             }
@@ -3758,8 +3737,8 @@ var saveToDevice = function(contact) {
         }
 
         var org = null;
-        for ( var i = 0; i < contact.organizations.length; i += 1) {
-            org = contact.organizations[i];
+        for ( var n = 0; n < contact.organizations.length; n += 1) {
+            org = contact.organizations[n];
             if (!org) {
                 continue;
             }
@@ -3775,8 +3754,8 @@ var saveToDevice = function(contact) {
     if (contact.categories && contact.categories instanceof Array) {
         bbContact.categories = [];
         var category = null;
-        for ( var i = 0; i < contact.categories.length; i += 1) {
-            category = contact.categories[i];
+        for ( var o = 0; o < contact.categories.length; o += 1) {
+            category = contact.categories[o];
             if (typeof category == "string") {
                 bbContact.categories.push(category);
             }
@@ -3790,8 +3769,8 @@ var saveToDevice = function(contact) {
     // fail gracefully if photo URL is no good, but log the error
     if (contact.photos && contact.photos instanceof Array) {
         var photo = null;
-        for ( var i = 0; i < contact.photos.length; i += 1) {
-            photo = contact.photos[i];
+        for ( var p = 0; p < contact.photos.length; p += 1) {
+            photo = contact.photos[p];
             if (!photo || !photo.value) {
                 continue;
             }
@@ -3897,10 +3876,17 @@ module.exports = {
         }
     }
 };
+
 });
 
 // file: lib/blackberry/plugin/blackberry/ContactUtils.js
 define("cordova/plugin/blackberry/ContactUtils", function(require, exports, module) {
+var ContactAddress = require('cordova/plugin/ContactAddress'),
+    ContactName = require('cordova/plugin/ContactName'),
+    ContactField = require('cordova/plugin/ContactField'),
+    ContactOrganization = require('cordova/plugin/ContactOrganization'),
+    Contact = require('cordova/plugin/Contact');
+
 /**
  * Mappings for each Contact field that may be used in a find operation. Maps
  * W3C Contact fields to one or more fields in a BlackBerry contact object.
@@ -3990,8 +3976,7 @@ var createContactAddress = function(type, bbAddress) {
     var region = bbAddress.stateProvince || "";
     var postalCode = bbAddress.zipPostal || "";
     var country = bbAddress.country || "";
-    var formatted = streetAddress + ", " + locality + ", " + region + ", "
-            + postalCode + ", " + country;
+    var formatted = streetAddress + ", " + locality + ", " + region + ", " + postalCode + ", " + country;
 
     return new ContactAddress(null, type, formatted, streetAddress, locality,
             region, postalCode, country);
@@ -4043,8 +4028,7 @@ module.exports = {
         //
         var ciFilter = "";
         for ( var i = 0; i < filter.length; i++) {
-            ciFilter = ciFilter + "[" + filter[i].toLowerCase()
-                    + filter[i].toUpperCase() + "]";
+            ciFilter = ciFilter + "[" + filter[i].toLowerCase() + filter[i].toUpperCase() + "]";
         }
 
         // match anything that contains our filter string
@@ -4054,14 +4038,14 @@ module.exports = {
         var filterExpression = null;
         if (fields && fields instanceof Array) {
             var fe = null;
-            for ( var i in fields) {
-                if (!fields[i]) {
+            for ( var f in fields) {
+                if (!fields[f]) {
                     continue;
                 }
 
                 // retrieve the BlackBerry contact fields that map to the one
                 // specified
-                var bbFields = fieldMappings[fields[i]];
+                var bbFields = fieldMappings[fields[f]];
 
                 // BlackBerry doesn't support the field specified
                 if (!bbFields) {
@@ -4112,7 +4096,7 @@ module.exports = {
         var contact = new Contact(bbContact.uid, bbContact.user1);
 
         // nothing to do
-        if (!fields || !(fields instanceof Array) || fields.length == 0) {
+        if (!fields || !(fields instanceof Array) || fields.length === 0) {
             return contact;
         } else if (fields.length == 1 && fields[0] === "*") {
             // Cordova enhancement to allow fields value of ["*"] to indicate
@@ -4130,8 +4114,7 @@ module.exports = {
 
             // name
             if (field.indexOf('name') === 0) {
-                var formattedName = bbContact.title + ' ' + bbContact.firstName
-                        + ' ' + bbContact.lastName;
+                var formattedName = bbContact.title + ' ' + bbContact.firstName + ' ' + bbContact.lastName;
                 contact.name = new ContactName(formattedName,
                         bbContact.lastName, bbContact.firstName, null,
                         bbContact.title, null);
@@ -4254,6 +4237,7 @@ module.exports = {
         return contact;
     }
 };
+
 });
 
 // file: lib/blackberry/plugin/blackberry/DirectoryEntry.js
@@ -4497,7 +4481,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/Entry.js
@@ -4505,6 +4488,7 @@ define("cordova/plugin/blackberry/Entry", function(require, exports, module) {
 var FileError = require('cordova/plugin/FileError'),
     LocalFileSystem = require('cordova/plugin/LocalFileSystem'),
     resolveLocalFileSystemURI = require('cordova/plugin/resolveLocalFileSystemURI'),
+    requestFileSystem = require('cordova/plugin/requestFileSystem'),
     exec = require('cordova/exec');
 
 module.exports = {
@@ -4602,8 +4586,7 @@ module.exports = {
    * Clear the resource cache.
    */
   clearCache:function() {
-      if (typeof blackberry.widgetcache === "undefined"
-          || blackberry.widgetcache === null) {
+      if (typeof blackberry.widgetcache === "undefined" || blackberry.widgetcache === null) {
           console.log("blackberry.widgetcache permission not found. Cache clear denied.");
           return;
       }
@@ -4645,7 +4628,6 @@ module.exports = {
       blackberry.app.exit();
   }
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/contacts.js
@@ -4667,7 +4649,7 @@ module.exports = {
         }
 
         // Search qualifier is required and cannot be empty.
-        if (!fields || !(fields instanceof Array) || fields.length == 0) {
+        if (!fields || !(fields instanceof Array) || fields.length === 0) {
             if (typeof fail === 'function') {
                 fail(new ContactError(ContactError.INVALID_ARGUMENT_ERROR));
             }
@@ -4712,7 +4694,6 @@ module.exports = {
     }
 
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/device.js
@@ -4740,7 +4721,6 @@ channel.onCordovaReady.subscribeOnce(function() {
 });
 
 module.exports = me;
-
 });
 
 // file: lib/blackberry/plugin/blackberry/manager.js
@@ -4832,7 +4812,6 @@ module.exports = {
     pause: org.apache.cordova.JavaPluginManager.pause,
     destroy: org.apache.cordova.JavaPluginManager.destroy
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/notification.js
@@ -4888,7 +4867,7 @@ module.exports = {
      */
     progressValue : function(value) {
         exec(null, null, 'Notification', 'progressValue', [ value ]);
-    },
+    }
 };
 });
 
@@ -4900,7 +4879,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -4926,9 +4905,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -4981,7 +4960,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -5005,8 +4984,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -5015,7 +4994,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -5039,17 +5018,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -5060,19 +5039,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -5134,7 +5112,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -5198,7 +5175,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -5233,7 +5210,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -5298,7 +5274,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -5359,7 +5334,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/common/plugin/requestFileSystem.js
@@ -5404,13 +5378,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -5469,7 +5443,6 @@ module.exports = {
         return {"status" : cordova.callbackStatus.CLASS_NOT_FOUND_EXCEPTION, "message" : "Class " + clazz + " cannot be found"};
     }
 };
-
 });
 
 // file: lib/common/utils.js
@@ -5491,12 +5464,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -5504,15 +5477,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -5555,7 +5528,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -5578,7 +5551,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -5589,20 +5561,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -5635,11 +5593,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -5652,5 +5610,4 @@ window.cordova = require('cordova');
 
 }(window));
 
-
 })();
\ No newline at end of file
diff --git a/lib/blackberry/sample/www/playbook/cordova-1.6.1.js b/lib/blackberry/sample/lib/cordova.1.7.0rc1/javascript/playbook/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/blackberry/sample/www/playbook/cordova-1.6.1.js
rename to lib/blackberry/sample/lib/cordova.1.7.0rc1/javascript/playbook/cordova-1.7.0rc1.js
index 4e74c4fa..0a180bbb 100644
--- a/lib/blackberry/sample/www/playbook/cordova-1.6.1.js
+++ b/lib/blackberry/sample/lib/cordova.1.7.0rc1/javascript/playbook/cordova-1.7.0rc1.js
@@ -1,4 +1,6 @@
-// File generated at :: Tue Apr 10 2012 15:32:25 GMT-0500 (CDT)
+// commit a42f0ae6245e7609c9bad1eb582777a696201aad
+
+// File generated at :: Tue Apr 24 2012 15:08:45 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -65,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -113,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -147,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -290,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -302,13 +319,16 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
 if (!window.PhoneGap) {
     window.PhoneGap = cordova;
 }
+if (!window.Cordova) {
+    window.Cordova = cordova;
+}
 
 /**
  * Plugins object
@@ -324,6 +344,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -500,10 +522,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -540,7 +562,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -585,7 +607,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -599,7 +621,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -654,7 +676,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -839,7 +860,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/playbook/exec.js
@@ -902,7 +922,6 @@ module.exports = function(success, fail, service, action, args) {
         utils.alert("Error: "+e);
     }
 };
-
 });
 
 // file: lib/playbook/platform.js
@@ -925,7 +944,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -938,7 +956,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1020,35 +1037,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1073,7 +1089,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1082,16 +1097,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1103,7 +1117,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1115,7 +1129,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1124,14 +1137,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1140,16 +1152,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1167,7 +1178,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1180,7 +1190,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1189,18 +1198,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1209,15 +1217,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1238,7 +1245,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1247,7 +1254,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1262,7 +1269,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1381,7 +1388,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1393,13 +1400,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1429,7 +1435,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1455,7 +1460,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1476,7 +1480,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1494,7 +1497,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1519,7 +1521,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1547,7 +1548,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1595,7 +1595,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1603,6 +1602,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1685,7 +1685,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1706,10 +1707,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -1934,7 +1935,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -1949,15 +1949,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2025,7 +2024,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2055,7 +2053,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2309,7 +2306,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2331,7 +2327,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2390,16 +2385,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2423,7 +2418,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2444,7 +2438,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2460,13 +2453,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2625,7 +2617,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2725,7 +2717,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2738,7 +2730,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2756,7 +2747,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -2938,7 +2928,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -2948,7 +2938,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -2969,7 +2958,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -2995,16 +2983,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3030,7 +3018,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3045,22 +3032,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3068,7 +3054,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3076,12 +3061,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3103,7 +3087,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3154,7 +3137,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3254,7 +3236,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/common/plugin/battery.js
@@ -3267,7 +3248,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -3310,30 +3291,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -3346,7 +3327,6 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/common/plugin/capture.js
@@ -3357,7 +3337,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -3383,9 +3363,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -3438,7 +3418,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -3462,8 +3442,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -3472,7 +3452,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -3496,17 +3476,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -3517,19 +3497,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -3591,7 +3570,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -3655,7 +3633,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -3690,7 +3668,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -3755,7 +3732,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -3816,7 +3792,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/playbook/plugin/playbook/device.js
@@ -3845,13 +3820,13 @@ channel.onCordovaReady.subscribeOnce(function() {
 });
 
 module.exports = me;
-
 });
 
 // file: lib/playbook/plugin/playbook/manager.js
 define("cordova/plugin/playbook/manager", function(require, exports, module) {
 var webworks = require('cordova/plugin/webworks/manager'),
     cordova = require('cordova'),
+    MediaFile = require('cordova/plugin/MediaFile'),
     /**
      * Private list of HTML 5 audio objects, indexed by the Cordova media object ids
      */
@@ -3876,8 +3851,7 @@ var webworks = require('cordova/plugin/webworks/manager'),
                             "isPlugged" : state === 2
                         };
 
-                        if (me._isPlugged !== info.isPlugged
-                                && typeof win === 'function') {
+                        if (me._isPlugged !== info.isPlugged && typeof win === 'function') {
                             win(info);
                         }
                     }
@@ -3917,7 +3891,7 @@ var webworks = require('cordova/plugin/webworks/manager'),
                             "name" : blackberry.system.model,
                             "uuid" : blackberry.identity.PIN,
                             "platform" : "PlayBook",
-                            "cordova" : "1.6.1"
+                            "cordova" : "1.7.0rc1"
                         }
                 };
             }
@@ -4218,13 +4192,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -4283,7 +4257,6 @@ module.exports = {
         return {"status" : cordova.callbackStatus.CLASS_NOT_FOUND_EXCEPTION, "message" : "Class " + clazz + " cannot be found"};
     }
 };
-
 });
 
 // file: lib/common/utils.js
@@ -4305,12 +4278,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -4318,15 +4291,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -4369,7 +4342,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -4392,7 +4365,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -4403,20 +4375,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -4449,11 +4407,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -4465,9 +4423,7 @@ window.cordova = require('cordova');
     }
 
 }(window));
-
 // file: lib/scripts/bootstrap-playbook.js
 require('cordova/channel').onNativeReady.fire();
 
-
-})();
+})();
\ No newline at end of file
diff --git a/lib/blackberry/www/cordova-1.6.1.js b/lib/blackberry/sample/www/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/blackberry/www/cordova-1.6.1.js
rename to lib/blackberry/sample/www/cordova-1.7.0rc1.js
index 801b37f9..d4680da6 100644
--- a/lib/blackberry/www/cordova-1.6.1.js
+++ b/lib/blackberry/sample/www/cordova-1.7.0rc1.js
@@ -1,4 +1,6 @@
-// File generated at :: Tue Apr 10 2012 15:32:24 GMT-0500 (CDT)
+// commit a42f0ae6245e7609c9bad1eb582777a696201aad
+
+// File generated at :: Tue Apr 24 2012 15:08:45 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -65,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -113,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -147,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -290,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -302,13 +319,16 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
 if (!window.PhoneGap) {
     window.PhoneGap = cordova;
 }
+if (!window.Cordova) {
+    window.Cordova = cordova;
+}
 
 /**
  * Plugins object
@@ -324,6 +344,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -500,10 +522,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -540,7 +562,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -585,7 +607,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -599,7 +621,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -654,7 +676,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -839,7 +860,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/blackberry/exec.js
@@ -901,7 +921,6 @@ module.exports = function(success, fail, service, action, args) {
         utils.alert("Error: "+e);
     }
 };
-
 });
 
 // file: lib/blackberry/platform.js
@@ -1085,7 +1104,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -1098,7 +1116,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1180,35 +1197,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1233,7 +1249,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1242,16 +1257,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1263,7 +1277,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1275,7 +1289,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1284,14 +1297,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1300,16 +1312,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1327,7 +1338,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1340,7 +1350,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1349,18 +1358,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1369,15 +1377,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1398,7 +1405,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1407,7 +1414,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1422,7 +1429,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1541,7 +1548,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1553,13 +1560,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1589,7 +1595,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1615,7 +1620,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1636,7 +1640,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1654,7 +1657,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1679,7 +1681,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1707,7 +1708,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1755,7 +1755,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1763,6 +1762,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1845,7 +1845,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1866,10 +1867,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -2094,7 +2095,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -2109,15 +2109,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2185,7 +2184,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2215,7 +2213,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2469,7 +2466,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2491,7 +2487,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2550,16 +2545,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2583,7 +2578,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2604,7 +2598,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2620,13 +2613,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2785,7 +2777,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2885,7 +2877,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2898,7 +2890,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2916,7 +2907,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -3098,7 +3088,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -3108,7 +3098,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -3129,7 +3118,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -3155,16 +3143,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3190,7 +3178,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3205,22 +3192,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3228,7 +3214,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3236,12 +3221,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3263,7 +3247,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3314,7 +3297,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3414,7 +3396,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/common/plugin/battery.js
@@ -3427,7 +3408,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -3470,30 +3451,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -3506,13 +3487,13 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/blackberry/plugin/blackberry/Contact.js
 define("cordova/plugin/blackberry/Contact", function(require, exports, module) {
 var ContactError = require('cordova/plugin/ContactError'),
     ContactUtils = require('cordova/plugin/blackberry/ContactUtils'),
+    ContactAddress = require('cordova/plugin/ContactAddress'),
     exec = require('cordova/exec');
 
 // ------------------
@@ -3666,12 +3647,12 @@ var saveToDevice = function(contact) {
 
         var type = null;
         var number = null;
-        for ( var i = 0; i < contact.phoneNumbers.length; i += 1) {
-            if (!contact.phoneNumbers[i] || !contact.phoneNumbers[i].value) {
+        for ( var j = 0; j < contact.phoneNumbers.length; j += 1) {
+            if (!contact.phoneNumbers[j] || !contact.phoneNumbers[j].value) {
                 continue;
             }
-            type = contact.phoneNumbers[i].type;
-            number = contact.phoneNumbers[i].value;
+            type = contact.phoneNumbers[j].type;
+            number = contact.phoneNumbers[j].value;
             if (type === 'home') {
                 if (bbContact.homePhone === "") {
                     bbContact.homePhone = number;
@@ -3709,18 +3690,16 @@ var saveToDevice = function(contact) {
         var address = null;
         var bbHomeAddress = null;
         var bbWorkAddress = null;
-        for ( var i = 0; i < contact.addresses.length; i += 1) {
-            address = contact.addresses[i];
+        for ( var k = 0; k < contact.addresses.length; k += 1) {
+            address = contact.addresses[k];
             if (!address || address instanceof ContactAddress === false) {
                 continue;
             }
 
-            if (bbHomeAddress === null
-                    && (!address.type || address.type === "home")) {
+            if (bbHomeAddress === null && (!address.type || address.type === "home")) {
                 bbHomeAddress = createBlackBerryAddress(address);
                 bbContact.homeAddress = bbHomeAddress;
-            } else if (bbWorkAddress === null
-                    && (!address.type || address.type === "work")) {
+            } else if (bbWorkAddress === null && (!address.type || address.type === "work")) {
                 bbWorkAddress = createBlackBerryAddress(address);
                 bbContact.workAddress = bbWorkAddress;
             }
@@ -3736,8 +3715,8 @@ var saveToDevice = function(contact) {
         }
 
         var url = null;
-        for ( var i = 0; i < contact.urls.length; i += 1) {
-            url = contact.urls[i];
+        for ( var m = 0; m < contact.urls.length; m += 1) {
+            url = contact.urls[m];
             if (!url || !url.value) {
                 continue;
             }
@@ -3758,8 +3737,8 @@ var saveToDevice = function(contact) {
         }
 
         var org = null;
-        for ( var i = 0; i < contact.organizations.length; i += 1) {
-            org = contact.organizations[i];
+        for ( var n = 0; n < contact.organizations.length; n += 1) {
+            org = contact.organizations[n];
             if (!org) {
                 continue;
             }
@@ -3775,8 +3754,8 @@ var saveToDevice = function(contact) {
     if (contact.categories && contact.categories instanceof Array) {
         bbContact.categories = [];
         var category = null;
-        for ( var i = 0; i < contact.categories.length; i += 1) {
-            category = contact.categories[i];
+        for ( var o = 0; o < contact.categories.length; o += 1) {
+            category = contact.categories[o];
             if (typeof category == "string") {
                 bbContact.categories.push(category);
             }
@@ -3790,8 +3769,8 @@ var saveToDevice = function(contact) {
     // fail gracefully if photo URL is no good, but log the error
     if (contact.photos && contact.photos instanceof Array) {
         var photo = null;
-        for ( var i = 0; i < contact.photos.length; i += 1) {
-            photo = contact.photos[i];
+        for ( var p = 0; p < contact.photos.length; p += 1) {
+            photo = contact.photos[p];
             if (!photo || !photo.value) {
                 continue;
             }
@@ -3897,10 +3876,17 @@ module.exports = {
         }
     }
 };
+
 });
 
 // file: lib/blackberry/plugin/blackberry/ContactUtils.js
 define("cordova/plugin/blackberry/ContactUtils", function(require, exports, module) {
+var ContactAddress = require('cordova/plugin/ContactAddress'),
+    ContactName = require('cordova/plugin/ContactName'),
+    ContactField = require('cordova/plugin/ContactField'),
+    ContactOrganization = require('cordova/plugin/ContactOrganization'),
+    Contact = require('cordova/plugin/Contact');
+
 /**
  * Mappings for each Contact field that may be used in a find operation. Maps
  * W3C Contact fields to one or more fields in a BlackBerry contact object.
@@ -3990,8 +3976,7 @@ var createContactAddress = function(type, bbAddress) {
     var region = bbAddress.stateProvince || "";
     var postalCode = bbAddress.zipPostal || "";
     var country = bbAddress.country || "";
-    var formatted = streetAddress + ", " + locality + ", " + region + ", "
-            + postalCode + ", " + country;
+    var formatted = streetAddress + ", " + locality + ", " + region + ", " + postalCode + ", " + country;
 
     return new ContactAddress(null, type, formatted, streetAddress, locality,
             region, postalCode, country);
@@ -4043,8 +4028,7 @@ module.exports = {
         //
         var ciFilter = "";
         for ( var i = 0; i < filter.length; i++) {
-            ciFilter = ciFilter + "[" + filter[i].toLowerCase()
-                    + filter[i].toUpperCase() + "]";
+            ciFilter = ciFilter + "[" + filter[i].toLowerCase() + filter[i].toUpperCase() + "]";
         }
 
         // match anything that contains our filter string
@@ -4054,14 +4038,14 @@ module.exports = {
         var filterExpression = null;
         if (fields && fields instanceof Array) {
             var fe = null;
-            for ( var i in fields) {
-                if (!fields[i]) {
+            for ( var f in fields) {
+                if (!fields[f]) {
                     continue;
                 }
 
                 // retrieve the BlackBerry contact fields that map to the one
                 // specified
-                var bbFields = fieldMappings[fields[i]];
+                var bbFields = fieldMappings[fields[f]];
 
                 // BlackBerry doesn't support the field specified
                 if (!bbFields) {
@@ -4112,7 +4096,7 @@ module.exports = {
         var contact = new Contact(bbContact.uid, bbContact.user1);
 
         // nothing to do
-        if (!fields || !(fields instanceof Array) || fields.length == 0) {
+        if (!fields || !(fields instanceof Array) || fields.length === 0) {
             return contact;
         } else if (fields.length == 1 && fields[0] === "*") {
             // Cordova enhancement to allow fields value of ["*"] to indicate
@@ -4130,8 +4114,7 @@ module.exports = {
 
             // name
             if (field.indexOf('name') === 0) {
-                var formattedName = bbContact.title + ' ' + bbContact.firstName
-                        + ' ' + bbContact.lastName;
+                var formattedName = bbContact.title + ' ' + bbContact.firstName + ' ' + bbContact.lastName;
                 contact.name = new ContactName(formattedName,
                         bbContact.lastName, bbContact.firstName, null,
                         bbContact.title, null);
@@ -4254,6 +4237,7 @@ module.exports = {
         return contact;
     }
 };
+
 });
 
 // file: lib/blackberry/plugin/blackberry/DirectoryEntry.js
@@ -4497,7 +4481,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/Entry.js
@@ -4505,6 +4488,7 @@ define("cordova/plugin/blackberry/Entry", function(require, exports, module) {
 var FileError = require('cordova/plugin/FileError'),
     LocalFileSystem = require('cordova/plugin/LocalFileSystem'),
     resolveLocalFileSystemURI = require('cordova/plugin/resolveLocalFileSystemURI'),
+    requestFileSystem = require('cordova/plugin/requestFileSystem'),
     exec = require('cordova/exec');
 
 module.exports = {
@@ -4602,8 +4586,7 @@ module.exports = {
    * Clear the resource cache.
    */
   clearCache:function() {
-      if (typeof blackberry.widgetcache === "undefined"
-          || blackberry.widgetcache === null) {
+      if (typeof blackberry.widgetcache === "undefined" || blackberry.widgetcache === null) {
           console.log("blackberry.widgetcache permission not found. Cache clear denied.");
           return;
       }
@@ -4645,7 +4628,6 @@ module.exports = {
       blackberry.app.exit();
   }
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/contacts.js
@@ -4667,7 +4649,7 @@ module.exports = {
         }
 
         // Search qualifier is required and cannot be empty.
-        if (!fields || !(fields instanceof Array) || fields.length == 0) {
+        if (!fields || !(fields instanceof Array) || fields.length === 0) {
             if (typeof fail === 'function') {
                 fail(new ContactError(ContactError.INVALID_ARGUMENT_ERROR));
             }
@@ -4712,7 +4694,6 @@ module.exports = {
     }
 
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/device.js
@@ -4740,7 +4721,6 @@ channel.onCordovaReady.subscribeOnce(function() {
 });
 
 module.exports = me;
-
 });
 
 // file: lib/blackberry/plugin/blackberry/manager.js
@@ -4832,7 +4812,6 @@ module.exports = {
     pause: org.apache.cordova.JavaPluginManager.pause,
     destroy: org.apache.cordova.JavaPluginManager.destroy
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/notification.js
@@ -4888,7 +4867,7 @@ module.exports = {
      */
     progressValue : function(value) {
         exec(null, null, 'Notification', 'progressValue', [ value ]);
-    },
+    }
 };
 });
 
@@ -4900,7 +4879,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -4926,9 +4905,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -4981,7 +4960,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -5005,8 +4984,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -5015,7 +4994,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -5039,17 +5018,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -5060,19 +5039,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -5134,7 +5112,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -5198,7 +5175,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -5233,7 +5210,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -5298,7 +5274,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -5359,7 +5334,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/common/plugin/requestFileSystem.js
@@ -5404,13 +5378,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -5469,7 +5443,6 @@ module.exports = {
         return {"status" : cordova.callbackStatus.CLASS_NOT_FOUND_EXCEPTION, "message" : "Class " + clazz + " cannot be found"};
     }
 };
-
 });
 
 // file: lib/common/utils.js
@@ -5491,12 +5464,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -5504,15 +5477,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -5555,7 +5528,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -5578,7 +5551,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -5589,20 +5561,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -5635,11 +5593,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -5652,5 +5610,4 @@ window.cordova = require('cordova');
 
 }(window));
 
-
 })();
\ No newline at end of file
diff --git a/lib/blackberry/www/ext/cordova.1.6.1.jar b/lib/blackberry/sample/www/ext/cordova.1.7.0rc1.jar
similarity index 92%
rename from lib/blackberry/www/ext/cordova.1.6.1.jar
rename to lib/blackberry/sample/www/ext/cordova.1.7.0rc1.jar
index 42ecff8c..a7af983c 100644
Binary files a/lib/blackberry/www/ext/cordova.1.6.1.jar and b/lib/blackberry/sample/www/ext/cordova.1.7.0rc1.jar differ
diff --git a/lib/blackberry/sample/www/index.html b/lib/blackberry/sample/www/index.html
index 0a017f4f..9ca266e3 100644
--- a/lib/blackberry/sample/www/index.html
+++ b/lib/blackberry/sample/www/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" id="viewport" content="width=device-width,height=device-height,initial-scale=1.0,user-scalable=no">
     <script src="json2.js" type="text/javascript"></script>
-    <script src="cordova-1.6.1.js" type="text/javascript"></script>
+    <script src="cordova-1.7.0rc1.js" type="text/javascript"></script>
     <script type="text/javascript">
 
         //---------------------------------------------------------------------
diff --git a/lib/blackberry/www/playbook/cordova-1.6.1.js b/lib/blackberry/sample/www/playbook/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/blackberry/www/playbook/cordova-1.6.1.js
rename to lib/blackberry/sample/www/playbook/cordova-1.7.0rc1.js
index 4e74c4fa..0a180bbb 100644
--- a/lib/blackberry/www/playbook/cordova-1.6.1.js
+++ b/lib/blackberry/sample/www/playbook/cordova-1.7.0rc1.js
@@ -1,4 +1,6 @@
-// File generated at :: Tue Apr 10 2012 15:32:25 GMT-0500 (CDT)
+// commit a42f0ae6245e7609c9bad1eb582777a696201aad
+
+// File generated at :: Tue Apr 24 2012 15:08:45 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -65,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -113,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -147,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -290,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -302,13 +319,16 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
 if (!window.PhoneGap) {
     window.PhoneGap = cordova;
 }
+if (!window.Cordova) {
+    window.Cordova = cordova;
+}
 
 /**
  * Plugins object
@@ -324,6 +344,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -500,10 +522,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -540,7 +562,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -585,7 +607,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -599,7 +621,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -654,7 +676,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -839,7 +860,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/playbook/exec.js
@@ -902,7 +922,6 @@ module.exports = function(success, fail, service, action, args) {
         utils.alert("Error: "+e);
     }
 };
-
 });
 
 // file: lib/playbook/platform.js
@@ -925,7 +944,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -938,7 +956,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1020,35 +1037,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1073,7 +1089,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1082,16 +1097,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1103,7 +1117,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1115,7 +1129,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1124,14 +1137,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1140,16 +1152,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1167,7 +1178,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1180,7 +1190,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1189,18 +1198,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1209,15 +1217,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1238,7 +1245,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1247,7 +1254,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1262,7 +1269,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1381,7 +1388,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1393,13 +1400,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1429,7 +1435,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1455,7 +1460,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1476,7 +1480,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1494,7 +1497,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1519,7 +1521,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1547,7 +1548,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1595,7 +1595,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1603,6 +1602,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1685,7 +1685,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1706,10 +1707,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -1934,7 +1935,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -1949,15 +1949,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2025,7 +2024,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2055,7 +2053,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2309,7 +2306,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2331,7 +2327,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2390,16 +2385,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2423,7 +2418,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2444,7 +2438,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2460,13 +2453,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2625,7 +2617,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2725,7 +2717,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2738,7 +2730,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2756,7 +2747,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -2938,7 +2928,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -2948,7 +2938,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -2969,7 +2958,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -2995,16 +2983,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3030,7 +3018,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3045,22 +3032,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3068,7 +3054,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3076,12 +3061,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3103,7 +3087,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3154,7 +3137,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3254,7 +3236,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/common/plugin/battery.js
@@ -3267,7 +3248,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -3310,30 +3291,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -3346,7 +3327,6 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/common/plugin/capture.js
@@ -3357,7 +3337,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -3383,9 +3363,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -3438,7 +3418,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -3462,8 +3442,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -3472,7 +3452,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -3496,17 +3476,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -3517,19 +3497,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -3591,7 +3570,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -3655,7 +3633,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -3690,7 +3668,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -3755,7 +3732,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -3816,7 +3792,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/playbook/plugin/playbook/device.js
@@ -3845,13 +3820,13 @@ channel.onCordovaReady.subscribeOnce(function() {
 });
 
 module.exports = me;
-
 });
 
 // file: lib/playbook/plugin/playbook/manager.js
 define("cordova/plugin/playbook/manager", function(require, exports, module) {
 var webworks = require('cordova/plugin/webworks/manager'),
     cordova = require('cordova'),
+    MediaFile = require('cordova/plugin/MediaFile'),
     /**
      * Private list of HTML 5 audio objects, indexed by the Cordova media object ids
      */
@@ -3876,8 +3851,7 @@ var webworks = require('cordova/plugin/webworks/manager'),
                             "isPlugged" : state === 2
                         };
 
-                        if (me._isPlugged !== info.isPlugged
-                                && typeof win === 'function') {
+                        if (me._isPlugged !== info.isPlugged && typeof win === 'function') {
                             win(info);
                         }
                     }
@@ -3917,7 +3891,7 @@ var webworks = require('cordova/plugin/webworks/manager'),
                             "name" : blackberry.system.model,
                             "uuid" : blackberry.identity.PIN,
                             "platform" : "PlayBook",
-                            "cordova" : "1.6.1"
+                            "cordova" : "1.7.0rc1"
                         }
                 };
             }
@@ -4218,13 +4192,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -4283,7 +4257,6 @@ module.exports = {
         return {"status" : cordova.callbackStatus.CLASS_NOT_FOUND_EXCEPTION, "message" : "Class " + clazz + " cannot be found"};
     }
 };
-
 });
 
 // file: lib/common/utils.js
@@ -4305,12 +4278,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -4318,15 +4291,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -4369,7 +4342,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -4392,7 +4365,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -4403,20 +4375,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -4449,11 +4407,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -4465,9 +4423,7 @@ window.cordova = require('cordova');
     }
 
 }(window));
-
 // file: lib/scripts/bootstrap-playbook.js
 require('cordova/channel').onNativeReady.fire();
 
-
-})();
+})();
\ No newline at end of file
diff --git a/lib/blackberry/sample/lib/cordova.1.6.1/javascript/cordova-1.6.1.js b/lib/blackberry/www/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/blackberry/sample/lib/cordova.1.6.1/javascript/cordova-1.6.1.js
rename to lib/blackberry/www/cordova-1.7.0rc1.js
index 801b37f9..d4680da6 100644
--- a/lib/blackberry/sample/lib/cordova.1.6.1/javascript/cordova-1.6.1.js
+++ b/lib/blackberry/www/cordova-1.7.0rc1.js
@@ -1,4 +1,6 @@
-// File generated at :: Tue Apr 10 2012 15:32:24 GMT-0500 (CDT)
+// commit a42f0ae6245e7609c9bad1eb582777a696201aad
+
+// File generated at :: Tue Apr 24 2012 15:08:45 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -65,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -113,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -147,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -290,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -302,13 +319,16 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
 if (!window.PhoneGap) {
     window.PhoneGap = cordova;
 }
+if (!window.Cordova) {
+    window.Cordova = cordova;
+}
 
 /**
  * Plugins object
@@ -324,6 +344,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -500,10 +522,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -540,7 +562,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -585,7 +607,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -599,7 +621,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -654,7 +676,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -839,7 +860,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/blackberry/exec.js
@@ -901,7 +921,6 @@ module.exports = function(success, fail, service, action, args) {
         utils.alert("Error: "+e);
     }
 };
-
 });
 
 // file: lib/blackberry/platform.js
@@ -1085,7 +1104,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -1098,7 +1116,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1180,35 +1197,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1233,7 +1249,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1242,16 +1257,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1263,7 +1277,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1275,7 +1289,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1284,14 +1297,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1300,16 +1312,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1327,7 +1338,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1340,7 +1350,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1349,18 +1358,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1369,15 +1377,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1398,7 +1405,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1407,7 +1414,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1422,7 +1429,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1541,7 +1548,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1553,13 +1560,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1589,7 +1595,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1615,7 +1620,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1636,7 +1640,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1654,7 +1657,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1679,7 +1681,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1707,7 +1708,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1755,7 +1755,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1763,6 +1762,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1845,7 +1845,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1866,10 +1867,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -2094,7 +2095,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -2109,15 +2109,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2185,7 +2184,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2215,7 +2213,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2469,7 +2466,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2491,7 +2487,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2550,16 +2545,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2583,7 +2578,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2604,7 +2598,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2620,13 +2613,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2785,7 +2777,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2885,7 +2877,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2898,7 +2890,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2916,7 +2907,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -3098,7 +3088,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -3108,7 +3098,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -3129,7 +3118,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -3155,16 +3143,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3190,7 +3178,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3205,22 +3192,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3228,7 +3214,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3236,12 +3221,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3263,7 +3247,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3314,7 +3297,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3414,7 +3396,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/common/plugin/battery.js
@@ -3427,7 +3408,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -3470,30 +3451,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -3506,13 +3487,13 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/blackberry/plugin/blackberry/Contact.js
 define("cordova/plugin/blackberry/Contact", function(require, exports, module) {
 var ContactError = require('cordova/plugin/ContactError'),
     ContactUtils = require('cordova/plugin/blackberry/ContactUtils'),
+    ContactAddress = require('cordova/plugin/ContactAddress'),
     exec = require('cordova/exec');
 
 // ------------------
@@ -3666,12 +3647,12 @@ var saveToDevice = function(contact) {
 
         var type = null;
         var number = null;
-        for ( var i = 0; i < contact.phoneNumbers.length; i += 1) {
-            if (!contact.phoneNumbers[i] || !contact.phoneNumbers[i].value) {
+        for ( var j = 0; j < contact.phoneNumbers.length; j += 1) {
+            if (!contact.phoneNumbers[j] || !contact.phoneNumbers[j].value) {
                 continue;
             }
-            type = contact.phoneNumbers[i].type;
-            number = contact.phoneNumbers[i].value;
+            type = contact.phoneNumbers[j].type;
+            number = contact.phoneNumbers[j].value;
             if (type === 'home') {
                 if (bbContact.homePhone === "") {
                     bbContact.homePhone = number;
@@ -3709,18 +3690,16 @@ var saveToDevice = function(contact) {
         var address = null;
         var bbHomeAddress = null;
         var bbWorkAddress = null;
-        for ( var i = 0; i < contact.addresses.length; i += 1) {
-            address = contact.addresses[i];
+        for ( var k = 0; k < contact.addresses.length; k += 1) {
+            address = contact.addresses[k];
             if (!address || address instanceof ContactAddress === false) {
                 continue;
             }
 
-            if (bbHomeAddress === null
-                    && (!address.type || address.type === "home")) {
+            if (bbHomeAddress === null && (!address.type || address.type === "home")) {
                 bbHomeAddress = createBlackBerryAddress(address);
                 bbContact.homeAddress = bbHomeAddress;
-            } else if (bbWorkAddress === null
-                    && (!address.type || address.type === "work")) {
+            } else if (bbWorkAddress === null && (!address.type || address.type === "work")) {
                 bbWorkAddress = createBlackBerryAddress(address);
                 bbContact.workAddress = bbWorkAddress;
             }
@@ -3736,8 +3715,8 @@ var saveToDevice = function(contact) {
         }
 
         var url = null;
-        for ( var i = 0; i < contact.urls.length; i += 1) {
-            url = contact.urls[i];
+        for ( var m = 0; m < contact.urls.length; m += 1) {
+            url = contact.urls[m];
             if (!url || !url.value) {
                 continue;
             }
@@ -3758,8 +3737,8 @@ var saveToDevice = function(contact) {
         }
 
         var org = null;
-        for ( var i = 0; i < contact.organizations.length; i += 1) {
-            org = contact.organizations[i];
+        for ( var n = 0; n < contact.organizations.length; n += 1) {
+            org = contact.organizations[n];
             if (!org) {
                 continue;
             }
@@ -3775,8 +3754,8 @@ var saveToDevice = function(contact) {
     if (contact.categories && contact.categories instanceof Array) {
         bbContact.categories = [];
         var category = null;
-        for ( var i = 0; i < contact.categories.length; i += 1) {
-            category = contact.categories[i];
+        for ( var o = 0; o < contact.categories.length; o += 1) {
+            category = contact.categories[o];
             if (typeof category == "string") {
                 bbContact.categories.push(category);
             }
@@ -3790,8 +3769,8 @@ var saveToDevice = function(contact) {
     // fail gracefully if photo URL is no good, but log the error
     if (contact.photos && contact.photos instanceof Array) {
         var photo = null;
-        for ( var i = 0; i < contact.photos.length; i += 1) {
-            photo = contact.photos[i];
+        for ( var p = 0; p < contact.photos.length; p += 1) {
+            photo = contact.photos[p];
             if (!photo || !photo.value) {
                 continue;
             }
@@ -3897,10 +3876,17 @@ module.exports = {
         }
     }
 };
+
 });
 
 // file: lib/blackberry/plugin/blackberry/ContactUtils.js
 define("cordova/plugin/blackberry/ContactUtils", function(require, exports, module) {
+var ContactAddress = require('cordova/plugin/ContactAddress'),
+    ContactName = require('cordova/plugin/ContactName'),
+    ContactField = require('cordova/plugin/ContactField'),
+    ContactOrganization = require('cordova/plugin/ContactOrganization'),
+    Contact = require('cordova/plugin/Contact');
+
 /**
  * Mappings for each Contact field that may be used in a find operation. Maps
  * W3C Contact fields to one or more fields in a BlackBerry contact object.
@@ -3990,8 +3976,7 @@ var createContactAddress = function(type, bbAddress) {
     var region = bbAddress.stateProvince || "";
     var postalCode = bbAddress.zipPostal || "";
     var country = bbAddress.country || "";
-    var formatted = streetAddress + ", " + locality + ", " + region + ", "
-            + postalCode + ", " + country;
+    var formatted = streetAddress + ", " + locality + ", " + region + ", " + postalCode + ", " + country;
 
     return new ContactAddress(null, type, formatted, streetAddress, locality,
             region, postalCode, country);
@@ -4043,8 +4028,7 @@ module.exports = {
         //
         var ciFilter = "";
         for ( var i = 0; i < filter.length; i++) {
-            ciFilter = ciFilter + "[" + filter[i].toLowerCase()
-                    + filter[i].toUpperCase() + "]";
+            ciFilter = ciFilter + "[" + filter[i].toLowerCase() + filter[i].toUpperCase() + "]";
         }
 
         // match anything that contains our filter string
@@ -4054,14 +4038,14 @@ module.exports = {
         var filterExpression = null;
         if (fields && fields instanceof Array) {
             var fe = null;
-            for ( var i in fields) {
-                if (!fields[i]) {
+            for ( var f in fields) {
+                if (!fields[f]) {
                     continue;
                 }
 
                 // retrieve the BlackBerry contact fields that map to the one
                 // specified
-                var bbFields = fieldMappings[fields[i]];
+                var bbFields = fieldMappings[fields[f]];
 
                 // BlackBerry doesn't support the field specified
                 if (!bbFields) {
@@ -4112,7 +4096,7 @@ module.exports = {
         var contact = new Contact(bbContact.uid, bbContact.user1);
 
         // nothing to do
-        if (!fields || !(fields instanceof Array) || fields.length == 0) {
+        if (!fields || !(fields instanceof Array) || fields.length === 0) {
             return contact;
         } else if (fields.length == 1 && fields[0] === "*") {
             // Cordova enhancement to allow fields value of ["*"] to indicate
@@ -4130,8 +4114,7 @@ module.exports = {
 
             // name
             if (field.indexOf('name') === 0) {
-                var formattedName = bbContact.title + ' ' + bbContact.firstName
-                        + ' ' + bbContact.lastName;
+                var formattedName = bbContact.title + ' ' + bbContact.firstName + ' ' + bbContact.lastName;
                 contact.name = new ContactName(formattedName,
                         bbContact.lastName, bbContact.firstName, null,
                         bbContact.title, null);
@@ -4254,6 +4237,7 @@ module.exports = {
         return contact;
     }
 };
+
 });
 
 // file: lib/blackberry/plugin/blackberry/DirectoryEntry.js
@@ -4497,7 +4481,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/Entry.js
@@ -4505,6 +4488,7 @@ define("cordova/plugin/blackberry/Entry", function(require, exports, module) {
 var FileError = require('cordova/plugin/FileError'),
     LocalFileSystem = require('cordova/plugin/LocalFileSystem'),
     resolveLocalFileSystemURI = require('cordova/plugin/resolveLocalFileSystemURI'),
+    requestFileSystem = require('cordova/plugin/requestFileSystem'),
     exec = require('cordova/exec');
 
 module.exports = {
@@ -4602,8 +4586,7 @@ module.exports = {
    * Clear the resource cache.
    */
   clearCache:function() {
-      if (typeof blackberry.widgetcache === "undefined"
-          || blackberry.widgetcache === null) {
+      if (typeof blackberry.widgetcache === "undefined" || blackberry.widgetcache === null) {
           console.log("blackberry.widgetcache permission not found. Cache clear denied.");
           return;
       }
@@ -4645,7 +4628,6 @@ module.exports = {
       blackberry.app.exit();
   }
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/contacts.js
@@ -4667,7 +4649,7 @@ module.exports = {
         }
 
         // Search qualifier is required and cannot be empty.
-        if (!fields || !(fields instanceof Array) || fields.length == 0) {
+        if (!fields || !(fields instanceof Array) || fields.length === 0) {
             if (typeof fail === 'function') {
                 fail(new ContactError(ContactError.INVALID_ARGUMENT_ERROR));
             }
@@ -4712,7 +4694,6 @@ module.exports = {
     }
 
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/device.js
@@ -4740,7 +4721,6 @@ channel.onCordovaReady.subscribeOnce(function() {
 });
 
 module.exports = me;
-
 });
 
 // file: lib/blackberry/plugin/blackberry/manager.js
@@ -4832,7 +4812,6 @@ module.exports = {
     pause: org.apache.cordova.JavaPluginManager.pause,
     destroy: org.apache.cordova.JavaPluginManager.destroy
 };
-
 });
 
 // file: lib/blackberry/plugin/blackberry/notification.js
@@ -4888,7 +4867,7 @@ module.exports = {
      */
     progressValue : function(value) {
         exec(null, null, 'Notification', 'progressValue', [ value ]);
-    },
+    }
 };
 });
 
@@ -4900,7 +4879,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -4926,9 +4905,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -4981,7 +4960,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -5005,8 +4984,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -5015,7 +4994,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -5039,17 +5018,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -5060,19 +5039,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -5134,7 +5112,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -5198,7 +5175,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -5233,7 +5210,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -5298,7 +5274,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -5359,7 +5334,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/common/plugin/requestFileSystem.js
@@ -5404,13 +5378,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -5469,7 +5443,6 @@ module.exports = {
         return {"status" : cordova.callbackStatus.CLASS_NOT_FOUND_EXCEPTION, "message" : "Class " + clazz + " cannot be found"};
     }
 };
-
 });
 
 // file: lib/common/utils.js
@@ -5491,12 +5464,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -5504,15 +5477,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -5555,7 +5528,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -5578,7 +5551,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -5589,20 +5561,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -5635,11 +5593,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -5652,5 +5610,4 @@ window.cordova = require('cordova');
 
 }(window));
 
-
 })();
\ No newline at end of file
diff --git a/lib/blackberry/sample/lib/cordova.1.6.1/ext/cordova.1.6.1.jar b/lib/blackberry/www/ext/cordova.1.7.0rc1.jar
similarity index 92%
rename from lib/blackberry/sample/lib/cordova.1.6.1/ext/cordova.1.6.1.jar
rename to lib/blackberry/www/ext/cordova.1.7.0rc1.jar
index 42ecff8c..a7af983c 100644
Binary files a/lib/blackberry/sample/lib/cordova.1.6.1/ext/cordova.1.6.1.jar and b/lib/blackberry/www/ext/cordova.1.7.0rc1.jar differ
diff --git a/lib/blackberry/sample/lib/cordova.1.6.1/javascript/playbook/cordova-1.6.1.js b/lib/blackberry/www/playbook/cordova-1.7.0rc1.js
similarity index 95%
rename from lib/blackberry/sample/lib/cordova.1.6.1/javascript/playbook/cordova-1.6.1.js
rename to lib/blackberry/www/playbook/cordova-1.7.0rc1.js
index 4e74c4fa..0a180bbb 100644
--- a/lib/blackberry/sample/lib/cordova.1.6.1/javascript/playbook/cordova-1.6.1.js
+++ b/lib/blackberry/www/playbook/cordova-1.7.0rc1.js
@@ -1,4 +1,6 @@
-// File generated at :: Tue Apr 10 2012 15:32:25 GMT-0500 (CDT)
+// commit a42f0ae6245e7609c9bad1eb582777a696201aad
+
+// File generated at :: Tue Apr 24 2012 15:08:45 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -65,10 +67,20 @@ if (typeof module === "object" && typeof require === "function") {
     module.exports.require = require;
     module.exports.define = define;
 }
-
 // file: lib/cordova.js
 define("cordova", function(require, exports, module) {
 var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
 /**
  * Intercept calls to addEventListener + removeEventListener and handle deviceready,
  * resume, and pause events.
@@ -113,13 +125,18 @@ window.addEventListener = function(evt, handler, capture) {
 };
 
 document.removeEventListener = function(evt, handler, capture) {
-  var e = evt.toLowerCase();
-  // If unsubcribing from an event that is handled by a plugin
-  if (typeof documentEventHandlers[e] != "undefined") {
-    documentEventHandlers[e].unsubscribe(handler);
-  } else {
-    m_document_removeEventListener.call(document, evt, handler, capture);
-  }
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
 };
 
 window.removeEventListener = function(evt, handler, capture) {
@@ -147,9 +164,9 @@ function createEvent(type, data) {
 
 if(typeof window.console === "undefined")
 {
-	window.console = { 
-		log:function(){}
-	};
+    window.console = {
+        log:function(){}
+    };
 }
 
 var cordova = {
@@ -290,7 +307,7 @@ var cordova = {
             console.log("Error: Plugin "+name+" already exists.");
         }
     },
-    
+
     addConstructor: function(func) {
         channel.onCordovaReady.subscribeOnce(function() {
             try {
@@ -302,13 +319,16 @@ var cordova = {
     }
 };
 
-/** 
+/**
  * Legacy variable for plugin support
  * TODO: remove in 2.0.
  */
 if (!window.PhoneGap) {
     window.PhoneGap = cordova;
 }
+if (!window.Cordova) {
+    window.Cordova = cordova;
+}
 
 /**
  * Plugins object
@@ -324,6 +344,8 @@ module.exports = cordova;
 
 // file: lib/common/builder.js
 define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
 function each(objects, func, context) {
     for (var prop in objects) {
         if (objects.hasOwnProperty(prop)) {
@@ -500,10 +522,10 @@ var Channel = function(type, opts) {
 
         /**
          * cordova Channels that must fire before "deviceready" is fired.
-         */ 
+         */
         deviceReadyChannelsArray: [],
         deviceReadyChannelsMap: {},
-        
+
         /**
          * Indicate that a feature needs to be initialized before it is ready to be used.
          * This holds up Cordova's "deviceready" event until the feature has been initialized
@@ -540,7 +562,7 @@ var Channel = function(type, opts) {
     utils = require('cordova/utils');
 
 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
  * Channel.fire is called so too will the function.
  * Optionally specify an execution context for the function
  * and a guid that can be used to stop subscribing to the channel.
@@ -585,7 +607,7 @@ Channel.prototype.subscribeOnce = function(f, c) {
     return g;
 };
 
-/** 
+/**
  * Unsubscribes the function with the given guid from the channel.
  */
 Channel.prototype.unsubscribe = function(g) {
@@ -599,7 +621,7 @@ Channel.prototype.unsubscribe = function(g) {
     if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
 };
 
-/** 
+/**
  * Calls all functions subscribed to this channel.
  */
 Channel.prototype.fire = function(e) {
@@ -654,7 +676,6 @@ channel.waitForInitialization('onCordovaInfoReady');
 channel.waitForInitialization('onCordovaConnectionReady');
 
 module.exports = channel;
-
 });
 
 // file: lib/common/common.js
@@ -839,7 +860,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/playbook/exec.js
@@ -902,7 +922,6 @@ module.exports = function(success, fail, service, action, args) {
         utils.alert("Error: "+e);
     }
 };
-
 });
 
 // file: lib/playbook/platform.js
@@ -925,7 +944,6 @@ module.exports = {
         }
     }
 };
-
 });
 
 // file: lib/common/plugin/Acceleration.js
@@ -938,7 +956,6 @@ var Acceleration = function(x, y, z, timestamp) {
 };
 
 module.exports = Acceleration;
-
 });
 
 // file: lib/common/plugin/Camera.js
@@ -1020,35 +1037,34 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
     if (typeof options.encodingType == "number") {
         encodingType = options.encodingType;
     }
-    
+
     var mediaType = Camera.MediaType.PICTURE;
     if (typeof options.mediaType == "number") {
         mediaType = options.mediaType;
     }
     var allowEdit = false;
     if (typeof options.allowEdit == "boolean") {
-    	allowEdit = options.allowEdit;
+        allowEdit = options.allowEdit;
     } else if (typeof options.allowEdit == "number") {
-    	allowEdit = options.allowEdit <= 0 ? false : true;
+        allowEdit = options.allowEdit <= 0 ? false : true;
     }
     var correctOrientation = false;
     if (typeof options.correctOrientation == "boolean") {
-    	correctOrientation = options.correctOrientation;
+        correctOrientation = options.correctOrientation;
     } else if (typeof options.correctOrientation == "number") {
-    	correctOrientation = options.correctOrientation <=0 ? false : true;
+        correctOrientation = options.correctOrientation <=0 ? false : true;
     }
     var saveToPhotoAlbum = false;
-	if (typeof options.saveToPhotoAlbum == "boolean") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
     } else if (typeof options.saveToPhotoAlbum == "number") {
-    	saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
     }
 
     exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
-}
+};
 
 module.exports = cameraExport;
-
 });
 
 // file: lib/common/plugin/CameraConstants.js
@@ -1073,7 +1089,6 @@ module.exports = {
     SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
   }
 };
-
 });
 
 // file: lib/common/plugin/CaptureAudioOptions.js
@@ -1082,16 +1097,15 @@ define("cordova/plugin/CaptureAudioOptions", function(require, exports, module)
  * Encapsulates all audio capture operation configuration options.
  */
 var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureAudioOptions;
-
 });
 
 // file: lib/common/plugin/CaptureError.js
@@ -1103,7 +1117,7 @@ var CaptureError = function(c) {
    this.code = c || null;
 };
 
-// Camera or microphone failed to capture image or sound. 
+// Camera or microphone failed to capture image or sound.
 CaptureError.CAPTURE_INTERNAL_ERR = 0;
 // Camera application or audio capture application is currently serving other capture request.
 CaptureError.CAPTURE_APPLICATION_BUSY = 1;
@@ -1115,7 +1129,6 @@ CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
 CaptureError.CAPTURE_NOT_SUPPORTED = 20;
 
 module.exports = CaptureError;
-
 });
 
 // file: lib/common/plugin/CaptureImageOptions.js
@@ -1124,14 +1137,13 @@ define("cordova/plugin/CaptureImageOptions", function(require, exports, module)
  * Encapsulates all image capture operation configuration options.
  */
 var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureImageOptions;
-
 });
 
 // file: lib/common/plugin/CaptureVideoOptions.js
@@ -1140,16 +1152,15 @@ define("cordova/plugin/CaptureVideoOptions", function(require, exports, module)
  * Encapsulates all video capture operation configuration options.
  */
 var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
 };
 
 module.exports = CaptureVideoOptions;
-
 });
 
 // file: lib/common/plugin/CompassError.js
@@ -1167,7 +1178,6 @@ CompassError.COMPASS_INTERNAL_ERR = 0;
 CompassError.COMPASS_NOT_SUPPORTED = 20;
 
 module.exports = CompassError;
-
 });
 
 // file: lib/common/plugin/CompassHeading.js
@@ -1180,7 +1190,6 @@ var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, tim
 };
 
 module.exports = CompassHeading;
-
 });
 
 // file: lib/common/plugin/ConfigurationData.js
@@ -1189,18 +1198,17 @@ define("cordova/plugin/ConfigurationData", function(require, exports, module) {
  * Encapsulates a set of parameters that the capture device supports.
  */
 function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type = null; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
     this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
+    // The width attribute represents width of the image or video in pixels.
     // In the case of a sound clip this attribute has value 0
     this.width = 0;
 }
 
 module.exports = ConfigurationData;
-
 });
 
 // file: lib/common/plugin/Connection.js
@@ -1209,15 +1217,14 @@ define("cordova/plugin/Connection", function(require, exports, module) {
  * Network status
  */
 module.exports = {
-		UNKNOWN: "unknown",
-		ETHERNET: "ethernet",
-		WIFI: "wifi",
-		CELL_2G: "2g",
-		CELL_3G: "3g",
-		CELL_4G: "4g",
-		NONE: "none"
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
 };
-
 });
 
 // file: lib/common/plugin/Contact.js
@@ -1238,7 +1245,7 @@ function convertIn(contact) {
       console.log("Cordova Contact convertIn error: exception creating date.");
     }
     return contact;
-};
+}
 
 /**
 * Converts Complex objects into primitives
@@ -1247,7 +1254,7 @@ function convertIn(contact) {
 
 function convertOut(contact) {
     var value = contact.birthday;
-    if (value != null) {
+    if (value !== null) {
         // try to make it a Date object if it is not already
         if (!value instanceof Date){
             try {
@@ -1262,7 +1269,7 @@ function convertOut(contact) {
         contact.birthday = value;
     }
     return contact;
-};
+}
 
 /**
 * Contains information about a single contact.
@@ -1381,7 +1388,7 @@ Contact.prototype.save = function(successCB, errorCB) {
   var fail = function(code) {
       errorCB(new ContactError(code));
   };
-	var success = function(result) {
+    var success = function(result) {
       if (result) {
           if (typeof successCB === 'function') {
               var fullContact = require('cordova/plugin/contacts').create(result);
@@ -1393,13 +1400,12 @@ Contact.prototype.save = function(successCB, errorCB) {
           fail(ContactError.UNKNOWN_ERROR);
       }
   };
-	var dupContact = convertOut(utils.clone(this));
-	exec(success, fail, "Contacts", "save", [dupContact]);
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
 };
 
 
 module.exports = Contact;
-
 });
 
 // file: lib/common/plugin/ContactAddress.js
@@ -1429,7 +1435,6 @@ var ContactAddress = function(pref, type, formatted, streetAddress, locality, re
 };
 
 module.exports = ContactAddress;
-
 });
 
 // file: lib/common/plugin/ContactError.js
@@ -1455,7 +1460,6 @@ ContactError.NOT_SUPPORTED_ERROR = 5;
 ContactError.PERMISSION_DENIED_ERROR = 20;
 
 module.exports = ContactError;
-
 });
 
 // file: lib/common/plugin/ContactField.js
@@ -1476,7 +1480,6 @@ var ContactField = function(type, value, pref) {
 };
 
 module.exports = ContactField;
-
 });
 
 // file: lib/common/plugin/ContactFindOptions.js
@@ -1494,7 +1497,6 @@ var ContactFindOptions = function(filter, multiple) {
 };
 
 module.exports = ContactFindOptions;
-
 });
 
 // file: lib/common/plugin/ContactName.js
@@ -1519,7 +1521,6 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf
 };
 
 module.exports = ContactName;
-
 });
 
 // file: lib/common/plugin/ContactOrganization.js
@@ -1547,7 +1548,6 @@ var ContactOrganization = function(pref, type, name, dept, title) {
 };
 
 module.exports = ContactOrganization;
-
 });
 
 // file: lib/common/plugin/Coordinates.js
@@ -1595,7 +1595,6 @@ var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 };
 
 module.exports = Coordinates;
-
 });
 
 // file: lib/common/plugin/DirectoryEntry.js
@@ -1603,6 +1602,7 @@ define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
 var utils = require('cordova/utils'),
     exec = require('cordova/exec'),
     Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
     DirectoryReader = require('cordova/plugin/DirectoryReader');
 
 /**
@@ -1685,7 +1685,8 @@ module.exports = DirectoryEntry;
 
 // file: lib/common/plugin/DirectoryReader.js
 define("cordova/plugin/DirectoryReader", function(require, exports, module) {
-var exec = require('cordova/exec');
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
 
 /**
  * An interface that lists the files and directories in a directory.
@@ -1706,10 +1707,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
         for (var i=0; i<result.length; i++) {
             var entry = null;
             if (result[i].isDirectory) {
-                entry = new DirectoryEntry();
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
             }
             else if (result[i].isFile) {
-                entry = new FileEntry();
+                entry = new (require('cordova/plugin/FileEntry'))();
             }
             entry.isDirectory = result[i].isDirectory;
             entry.isFile = result[i].isFile;
@@ -1934,7 +1935,6 @@ Entry.prototype.getParent = function(successCallback, errorCallback) {
 };
 
 module.exports = Entry;
-
 });
 
 // file: lib/common/plugin/File.js
@@ -1949,15 +1949,14 @@ define("cordova/plugin/File", function(require, exports, module) {
  */
 
 var File = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || '';
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
 };
 
 module.exports = File;
-
 });
 
 // file: lib/common/plugin/FileEntry.js
@@ -2025,7 +2024,6 @@ FileEntry.prototype.file = function(successCallback, errorCallback) {
 
 
 module.exports = FileEntry;
-
 });
 
 // file: lib/common/plugin/FileError.js
@@ -2055,7 +2053,6 @@ FileError.TYPE_MISMATCH_ERR = 11;
 FileError.PATH_EXISTS_ERR = 12;
 
 module.exports = FileError;
-
 });
 
 // file: lib/common/plugin/FileReader.js
@@ -2309,7 +2306,6 @@ FileReader.prototype.readAsArrayBuffer = function(file) {
 };
 
 module.exports = FileReader;
-
 });
 
 // file: lib/common/plugin/FileSystem.js
@@ -2331,7 +2327,6 @@ var FileSystem = function(name, root) {
 };
 
 module.exports = FileSystem;
-
 });
 
 // file: lib/common/plugin/FileTransfer.js
@@ -2390,16 +2385,16 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
     var win = function(result) {
         var entry = null;
         if (result.isDirectory) {
-            entry = new DirectoryEntry();
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
         }
         else if (result.isFile) {
-            entry = new FileEntry();
+            entry = new (require('cordova/plugin/FileEntry'))();
         }
         entry.isDirectory = result.isDirectory;
         entry.isFile = result.isFile;
         entry.name = result.name;
         entry.fullPath = result.fullPath;
-        successCallback(entry);   
+        successCallback(entry);
     };
     exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
 };
@@ -2423,7 +2418,6 @@ FileTransferError.INVALID_URL_ERR = 2;
 FileTransferError.CONNECTION_ERR = 3;
 
 module.exports = FileTransferError;
-
 });
 
 // file: lib/common/plugin/FileUploadOptions.js
@@ -2444,7 +2438,6 @@ var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
 };
 
 module.exports = FileUploadOptions;
-
 });
 
 // file: lib/common/plugin/FileUploadResult.js
@@ -2460,13 +2453,12 @@ var FileUploadResult = function() {
 };
 
 module.exports = FileUploadResult;
-
 });
 
 // file: lib/common/plugin/FileWriter.js
 define("cordova/plugin/FileWriter", function(require, exports, module) {
 var exec = require('cordova/exec'),
-    FileError = require('cordova/plugin/FileError');
+    FileError = require('cordova/plugin/FileError'),
     ProgressEvent = require('cordova/plugin/ProgressEvent');
 
 /**
@@ -2625,7 +2617,7 @@ FileWriter.prototype.seek = function(offset) {
         throw new FileError(FileError.INVALID_STATE_ERR);
     }
 
-    if (!offset && offset != 0) {
+    if (!offset && offset !== 0) {
         return;
     }
 
@@ -2725,7 +2717,7 @@ module.exports = FileWriter;
 define("cordova/plugin/Flags", function(require, exports, module) {
 /**
  * Supplies arguments to methods that lookup or create files and directories.
- * 
+ *
  * @param create
  *            {boolean} file or directory if it doesn't exist
  * @param exclusive
@@ -2738,7 +2730,6 @@ function Flags(create, exclusive) {
 }
 
 module.exports = Flags;
-
 });
 
 // file: lib/common/plugin/LocalFileSystem.js
@@ -2756,7 +2747,6 @@ LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
 LocalFileSystem.PERSISTENT = 1; //persistent
 
 module.exports = LocalFileSystem;
-
 });
 
 // file: lib/common/plugin/Media.js
@@ -2938,7 +2928,7 @@ Media.onStatus = function(id, msg, value) {
     }
     else if (msg === Media.MEDIA_ERROR) {
         if (media.errorCallback) {
-        	// value should be a MediaError object when msg == MEDIA_ERROR
+            // value should be a MediaError object when msg == MEDIA_ERROR
             media.errorCallback(value);
         }
     }
@@ -2948,7 +2938,6 @@ Media.onStatus = function(id, msg, value) {
 };
 
 module.exports = Media;
-
 });
 
 // file: lib/common/plugin/MediaError.js
@@ -2969,7 +2958,6 @@ MediaError.MEDIA_ERR_DECODE         = 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
 module.exports = MediaError;
-
 });
 
 // file: lib/common/plugin/MediaFile.js
@@ -2995,16 +2983,16 @@ utils.extend(MediaFile, File);
 
 /**
  * Request capture format data for a specific file and type
- * 
+ *
  * @param {Function} successCB
  * @param {Function} errorCB
  */
 MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
-	} else {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
     exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-	}	
+    }
 };
 
 /**
@@ -3030,7 +3018,6 @@ MediaFile.cast = function(pluginResult) {
 };
 
 module.exports = MediaFile;
-
 });
 
 // file: lib/common/plugin/MediaFileData.js
@@ -3045,22 +3032,21 @@ define("cordova/plugin/MediaFileData", function(require, exports, module) {
  * @param {float} duration
  */
 var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
 };
 
 module.exports = MediaFileData;
-
 });
 
 // file: lib/common/plugin/Metadata.js
 define("cordova/plugin/Metadata", function(require, exports, module) {
 /**
  * Information about the state of the file or directory
- * 
+ *
  * {Date} modificationTime (readonly)
  */
 var Metadata = function(time) {
@@ -3068,7 +3054,6 @@ var Metadata = function(time) {
 };
 
 module.exports = Metadata;
-
 });
 
 // file: lib/common/plugin/Position.js
@@ -3076,12 +3061,11 @@ define("cordova/plugin/Position", function(require, exports, module) {
 var Coordinates = require('cordova/plugin/Coordinates');
 
 var Position = function(coords, timestamp) {
-	this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
-	this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
-
 });
 
 // file: lib/common/plugin/PositionError.js
@@ -3103,7 +3087,6 @@ PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
-
 });
 
 // file: lib/common/plugin/ProgressEvent.js
@@ -3154,7 +3137,6 @@ var ProgressEvent = (function() {
 })();
 
 module.exports = ProgressEvent;
-
 });
 
 // file: lib/common/plugin/accelerometer.js
@@ -3254,7 +3236,6 @@ var accelerometer = {
 };
 
 module.exports = accelerometer;
-
 });
 
 // file: lib/common/plugin/battery.js
@@ -3267,7 +3248,7 @@ var cordova = require('cordova'),
     exec = require('cordova/exec');
 
 function handlers() {
-  return battery.channels.batterystatus.numHandlers + 
+  return battery.channels.batterystatus.numHandlers +
          battery.channels.batterylow.numHandlers +
          battery.channels.batterycritical.numHandlers;
 }
@@ -3310,30 +3291,30 @@ Battery.prototype.onUnsubscribe = function() {
 
 /**
  * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
+ *
+ * @param {Object} info            keys: level, isPlugged
  */
 Battery.prototype._status = function(info) {
-	if (info) {
-		var me = battery;
+    if (info) {
+        var me = battery;
     var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			cordova.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					cordova.fireWindowEvent("batterylow", info);
-				}
-				else {
-					cordova.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
 };
 
 /**
@@ -3346,7 +3327,6 @@ Battery.prototype._error = function(e) {
 var battery = new Battery();
 
 module.exports = battery;
-
 });
 
 // file: lib/common/plugin/capture.js
@@ -3357,7 +3337,7 @@ var exec = require('cordova/exec'),
 /**
  * Launches a capture of different types.
  *
- * @param (DOMString} type 
+ * @param (DOMString} type
  * @param {Function} successCB
  * @param {Function} errorCB
  * @param {CaptureVideoOptions} options
@@ -3383,9 +3363,9 @@ function _capture(type, successCallback, errorCallback, options) {
  * The Capture interface exposes an interface to the camera and microphone of the hosting device.
  */
 function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
 }
 
 /**
@@ -3438,7 +3418,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the current heading.
          * @param {Function} successCallback The function to call when the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {CompassOptions} options The options for getting the heading data (not used).
          */
@@ -3462,8 +3442,8 @@ var exec = require('cordova/exec'),
             var fail = function(code) {
                 var ce = new CompassError(code);
                 errorCallback(ce);
-            }
-            
+            };
+
             // Get heading
             exec(win, fail, "Compass", "getHeading", [options]);
         },
@@ -3472,7 +3452,7 @@ var exec = require('cordova/exec'),
          * Asynchronously acquires the heading repeatedly at a given interval.
          * @param {Function} successCallback The function to call each time the heading
          * data is available
-         * @param {Function} errorCallback The function to call when there is an error 
+         * @param {Function} errorCallback The function to call when there is an error
          * getting the heading data.
          * @param {HeadingOptions} options The options for getting the heading data
          * such as timeout and the frequency of the watch. For iOS, filter parameter
@@ -3496,17 +3476,17 @@ var exec = require('cordova/exec'),
             }
 
             var id = utils.createUUID();
-			if (filter > 0) {
-				// is an iOS request for watch by filter, no timer needed
-				timers[id] = "iOS";
-				compass.getCurrentHeading(successCallback, errorCallback, options);
-			} else {
-				// Start watch timer to get headings
-            	timers[id] = window.setInterval(function() {
-                	compass.getCurrentHeading(successCallback, errorCallback);
-            	}, frequency);
-			}
-				
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
             return id;
         },
 
@@ -3517,19 +3497,18 @@ var exec = require('cordova/exec'),
         clearWatch:function(id) {
             // Stop javascript timer & remove from timer list
             if (id && timers[id]) {
-            	if (timers[id] != "iOS") {
-              		clearInterval(timers[id]);
-              	} else {
-            		// is iOS watch by filter so call into device to stop
-            		exec(null, null, "Compass", "stopHeading", []);
-            	}
-	            delete timers[id];
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
             }
         }
     };
 
 module.exports = compass;
-
 });
 
 // file: lib/common/plugin/contacts.js
@@ -3591,7 +3570,6 @@ var contacts = {
 };
 
 module.exports = contacts;
-
 });
 
 // file: lib/common/plugin/geolocation.js
@@ -3655,7 +3633,7 @@ var geolocation = {
             errorCallback(new PositionError(e.code, e.message));
         };
 
-        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]); 
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
     },
     /**
      * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -3690,7 +3668,6 @@ var geolocation = {
 };
 
 module.exports = geolocation;
-
 });
 
 // file: lib/common/plugin/network.js
@@ -3755,7 +3732,6 @@ NetworkConnection.prototype.getInfo = function (successCallback, errorCallback)
 };
 
 module.exports = new NetworkConnection();
-
 });
 
 // file: lib/common/plugin/notification.js
@@ -3816,7 +3792,6 @@ module.exports = {
         exec(null, null, "Notification", "beep", [count]);
     }
 };
-
 });
 
 // file: lib/playbook/plugin/playbook/device.js
@@ -3845,13 +3820,13 @@ channel.onCordovaReady.subscribeOnce(function() {
 });
 
 module.exports = me;
-
 });
 
 // file: lib/playbook/plugin/playbook/manager.js
 define("cordova/plugin/playbook/manager", function(require, exports, module) {
 var webworks = require('cordova/plugin/webworks/manager'),
     cordova = require('cordova'),
+    MediaFile = require('cordova/plugin/MediaFile'),
     /**
      * Private list of HTML 5 audio objects, indexed by the Cordova media object ids
      */
@@ -3876,8 +3851,7 @@ var webworks = require('cordova/plugin/webworks/manager'),
                             "isPlugged" : state === 2
                         };
 
-                        if (me._isPlugged !== info.isPlugged
-                                && typeof win === 'function') {
+                        if (me._isPlugged !== info.isPlugged && typeof win === 'function') {
                             win(info);
                         }
                     }
@@ -3917,7 +3891,7 @@ var webworks = require('cordova/plugin/webworks/manager'),
                             "name" : blackberry.system.model,
                             "uuid" : blackberry.identity.PIN,
                             "platform" : "PlayBook",
-                            "cordova" : "1.6.1"
+                            "cordova" : "1.7.0rc1"
                         }
                 };
             }
@@ -4218,13 +4192,13 @@ var requestFileSystem = function(type, size, successCallback, errorCallback) {
 };
 
 module.exports = requestFileSystem;
-
 });
 
 // file: lib/common/plugin/resolveLocalFileSystemURI.js
 define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
 var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
     FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
     exec = require('cordova/exec');
 
 /**
@@ -4283,7 +4257,6 @@ module.exports = {
         return {"status" : cordova.callbackStatus.CLASS_NOT_FOUND_EXCEPTION, "message" : "Class " + clazz + " cannot be found"};
     }
 };
-
 });
 
 // file: lib/common/utils.js
@@ -4305,12 +4278,12 @@ var _self = {
      * Does a deep clone of the object.
      */
     clone: function(obj) {
-        if(!obj) { 
+        if(!obj) {
             return obj;
         }
-        
+
         var retVal, i;
-        
+
         if(obj instanceof Array){
             retVal = [];
             for(i = 0; i < obj.length; ++i){
@@ -4318,15 +4291,15 @@ var _self = {
             }
             return retVal;
         }
-        
+
         if (obj instanceof Function) {
             return obj;
         }
-        
+
         if(!(obj instanceof Object)){
             return obj;
         }
-        
+
         if(obj instanceof Date){
             return obj;
         }
@@ -4369,7 +4342,7 @@ var _self = {
      */
     extend: (function() {
         // proxy used to establish prototype chain
-        var F = function() {}; 
+        var F = function() {};
         // extend Child from Parent
         return function(Child, Parent) {
             F.prototype = Parent.prototype;
@@ -4392,7 +4365,6 @@ var _self = {
 };
 
 module.exports = _self;
-
 });
 
 
@@ -4403,20 +4375,6 @@ window.cordova = require('cordova');
     var channel = require("cordova/channel"),
         _self = {
             boot: function () {
-                //---------------
-                // Event handling
-                //---------------
-
-                /**
-                 * Listen for DOMContentLoaded and notify our channel subscribers.
-                 */
-                document.addEventListener('DOMContentLoaded', function() {
-                    channel.onDOMContentLoaded.fire();
-                }, false);
-                if (document.readyState == 'complete') {
-                  channel.onDOMContentLoaded.fire();
-                }
-
                 /**
                  * Create all cordova objects once page has fully loaded and native side is ready.
                  */
@@ -4449,11 +4407,11 @@ window.cordova = require('cordova');
                     channel.join(function() {
                         channel.onDeviceReady.fire();
                     }, channel.deviceReadyChannelsArray);
-                    
+
                 }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
             }
         };
-        
+
     // boot up once native side is ready
     channel.onNativeReady.subscribeOnce(_self.boot);
 
@@ -4465,9 +4423,7 @@ window.cordova = require('cordova');
     }
 
 }(window));
-
 // file: lib/scripts/bootstrap-playbook.js
 require('cordova/channel').onNativeReady.fire();
 
-
-})();
+})();
\ No newline at end of file
diff --git a/lib/ios/Cordova-1.6.1.dmg.SHA1 b/lib/ios/Cordova-1.6.1.dmg.SHA1
deleted file mode 100644
index d9f7c5a9..00000000
--- a/lib/ios/Cordova-1.6.1.dmg.SHA1
+++ /dev/null
@@ -1 +0,0 @@
-SHA1(dist/Cordova-1.6.1.dmg)= 55e07d10c3179b90dd531da0aadcb5d1a1a478ca
diff --git a/lib/ios/Cordova-1.6.1.dmg b/lib/ios/Cordova-1.7.0rc1.dmg
similarity index 68%
rename from lib/ios/Cordova-1.6.1.dmg
rename to lib/ios/Cordova-1.7.0rc1.dmg
index d631f11b..0ab4b720 100644
Binary files a/lib/ios/Cordova-1.6.1.dmg and b/lib/ios/Cordova-1.7.0rc1.dmg differ
diff --git a/lib/ios/Cordova-1.7.0rc1.dmg.SHA1 b/lib/ios/Cordova-1.7.0rc1.dmg.SHA1
new file mode 100644
index 00000000..33a17788
--- /dev/null
+++ b/lib/ios/Cordova-1.7.0rc1.dmg.SHA1
@@ -0,0 +1 @@
+SHA1(dist/Cordova-1.7.0rc1.dmg)= 1c6402529d0f2cef060af81b38320bfb3d53c982
diff --git a/lib/webos/Makefile b/lib/webos/Makefile
index 0b1d9cdc..404bdbb2 100755
--- a/lib/webos/Makefile
+++ b/lib/webos/Makefile
@@ -18,7 +18,7 @@ OPEN = open
 ECHO = echo
 ECHO_N = echo -n
 JAVA = java
-PGVERSION = 1.6.1
+PGVERSION = 1.7.0
 
 NAME = `$(CAT) framework/appinfo.json | $(GREP) '"id"' | $(CUT) -d \" -f 4`
 VERSION = `$(CAT) framework/appinfo.json | $(GREP) '"version"' | $(CUT) -d \" -f 4`
diff --git a/lib/webos/VERSION b/lib/webos/VERSION
index 2eda823f..9dbb0c00 100644
--- a/lib/webos/VERSION
+++ b/lib/webos/VERSION
@@ -1 +1 @@
-1.6.1
\ No newline at end of file
+1.7.0
\ No newline at end of file
diff --git a/lib/webos/framework/index.html b/lib/webos/framework/index.html
index dd5675f8..aa99888c 100644
--- a/lib/webos/framework/index.html
+++ b/lib/webos/framework/index.html
@@ -16,7 +16,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title>cordova WebOS</title>
 	
-	<script type="text/javascript" src="cordova-1.6.1.js"></script>   
+	<script type="text/javascript" src="cordova-1.7.0.js"></script>   
 	<script type="text/javascript">
 		// create global var for sqlite database instance
 		var db;
diff --git a/lib/windows/CordovaStarter-1.7.0.zip b/lib/windows/CordovaStarter-1.7.0.zip
new file mode 100644
index 00000000..c1fb77b9
Binary files /dev/null and b/lib/windows/CordovaStarter-1.7.0.zip differ
diff --git a/lib/windows/VERSION b/lib/windows/VERSION
index 2eda823f..9dbb0c00 100644
--- a/lib/windows/VERSION
+++ b/lib/windows/VERSION
@@ -1 +1 @@
-1.6.1
\ No newline at end of file
+1.7.0
\ No newline at end of file
diff --git a/lib/windows/cordova-1.7.0.js b/lib/windows/cordova-1.7.0.js
new file mode 100644
index 00000000..a2ff225c
--- /dev/null
+++ b/lib/windows/cordova-1.7.0.js
@@ -0,0 +1,4774 @@
+// commit 1eb529fe62d3e542e155745696b2be0e1ae1d316
+
+// File generated at :: Mon Apr 23 2012 12:02:02 GMT-0700 (Pacific Daylight Time)
+
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+
+;(function() {
+
+// file: lib\scripts\require.js
+var require,
+    define;
+
+(function () {
+    var modules = {};
+
+    function build(module) {
+        var factory = module.factory;
+        module.exports = {};
+        delete module.factory;
+        factory(require, module.exports, module);
+        return module.exports;
+    }
+
+    require = function (id) {
+        if (!modules[id]) {
+            throw "module " + id + " not found";
+        }
+        return modules[id].factory ? build(modules[id]) : modules[id].exports;
+    };
+
+    define = function (id, factory) {
+        if (modules[id]) {
+            throw "module " + id + " already defined";
+        }
+
+        modules[id] = {
+            id: id,
+            factory: factory
+        };
+    };
+
+    define.remove = function (id) {
+        delete modules[id];
+    };
+
+})();
+
+//Export for use in node
+if (typeof module === "object" && typeof require === "function") {
+    module.exports.require = require;
+    module.exports.define = define;
+}
+// file: lib/cordova.js
+define("cordova", function(require, exports, module) {
+var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
+/**
+ * Intercept calls to addEventListener + removeEventListener and handle deviceready,
+ * resume, and pause events.
+ */
+var m_document_addEventListener = document.addEventListener;
+var m_document_removeEventListener = document.removeEventListener;
+var m_window_addEventListener = window.addEventListener;
+var m_window_removeEventListener = window.removeEventListener;
+
+/**
+ * Houses custom event handlers to intercept on document + window event listeners.
+ */
+var documentEventHandlers = {},
+    windowEventHandlers = {};
+
+document.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    if (e == 'deviceready') {
+        channel.onDeviceReady.subscribeOnce(handler);
+    } else if (e == 'resume') {
+      channel.onResume.subscribe(handler);
+      // if subscribing listener after event has already fired, invoke the handler
+      if (channel.onResume.fired && handler instanceof Function) {
+          handler();
+      }
+    } else if (e == 'pause') {
+      channel.onPause.subscribe(handler);
+    } else if (typeof documentEventHandlers[e] != 'undefined') {
+      documentEventHandlers[e].subscribe(handler);
+    } else {
+      m_document_addEventListener.call(document, evt, handler, capture);
+    }
+};
+
+window.addEventListener = function(evt, handler, capture) {
+  var e = evt.toLowerCase();
+  if (typeof windowEventHandlers[e] != 'undefined') {
+    windowEventHandlers[e].subscribe(handler);
+  } else {
+    m_window_addEventListener.call(window, evt, handler, capture);
+  }
+};
+
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
+};
+
+window.removeEventListener = function(evt, handler, capture) {
+  var e = evt.toLowerCase();
+  // If unsubcribing from an event that is handled by a plugin
+  if (typeof windowEventHandlers[e] != "undefined") {
+    windowEventHandlers[e].unsubscribe(handler);
+  } else {
+    m_window_removeEventListener.call(window, evt, handler, capture);
+  }
+};
+
+function createEvent(type, data) {
+  var event = document.createEvent('Events');
+  event.initEvent(type, false, false);
+  if (data) {
+    for (var i in data) {
+      if (data.hasOwnProperty(i)) {
+        event[i] = data[i];
+      }
+    }
+  }
+  return event;
+}
+
+if(typeof window.console === "undefined")
+{
+    window.console = {
+        log:function(){}
+    };
+}
+
+var cordova = {
+    define:define,
+    require:require,
+    /**
+     * Methods to add/remove your own addEventListener hijacking on document + window.
+     */
+    addWindowEventHandler:function(event, opts) {
+      return (windowEventHandlers[event] = channel.create(event, opts));
+    },
+    addDocumentEventHandler:function(event, opts) {
+      return (documentEventHandlers[event] = channel.create(event, opts));
+    },
+    removeWindowEventHandler:function(event) {
+      delete windowEventHandlers[event];
+    },
+    removeDocumentEventHandler:function(event) {
+      delete documentEventHandlers[event];
+    },
+    /**
+     * Retreive original event handlers that were replaced by Cordova
+     *
+     * @return object
+     */
+    getOriginalHandlers: function() {
+        return {'document': {'addEventListener': m_document_addEventListener, 'removeEventListener': m_document_removeEventListener},
+        'window': {'addEventListener': m_window_addEventListener, 'removeEventListener': m_window_removeEventListener}};
+    },
+    /**
+     * Method to fire event from native code
+     */
+    fireDocumentEvent: function(type, data) {
+      var evt = createEvent(type, data);
+      if (typeof documentEventHandlers[type] != 'undefined') {
+        documentEventHandlers[type].fire(evt);
+      } else {
+        document.dispatchEvent(evt);
+      }
+    },
+    fireWindowEvent: function(type, data) {
+      var evt = createEvent(type,data);
+      if (typeof windowEventHandlers[type] != 'undefined') {
+        windowEventHandlers[type].fire(evt);
+      } else {
+        window.dispatchEvent(evt);
+      }
+    },
+    // TODO: this is Android only; think about how to do this better
+    shuttingDown:false,
+    UsePolling:false,
+    // END TODO
+
+    // TODO: iOS only
+    // This queue holds the currently executing command and all pending
+    // commands executed with cordova.exec().
+    commandQueue:[],
+    // Indicates if we're currently in the middle of flushing the command
+    // queue on the native side.
+    commandQueueFlushing:false,
+    // END TODO
+    /**
+     * Plugin callback mechanism.
+     */
+    callbackId: 0,
+    callbacks:  {},
+    callbackStatus: {
+        NO_RESULT: 0,
+        OK: 1,
+        CLASS_NOT_FOUND_EXCEPTION: 2,
+        ILLEGAL_ACCESS_EXCEPTION: 3,
+        INSTANTIATION_EXCEPTION: 4,
+        MALFORMED_URL_EXCEPTION: 5,
+        IO_EXCEPTION: 6,
+        INVALID_ACTION: 7,
+        JSON_EXCEPTION: 8,
+        ERROR: 9
+    },
+
+    /**
+     * Called by native code when returning successful result from an action.
+     *
+     * @param callbackId
+     * @param args
+     */
+    callbackSuccess: function(callbackId, args) {
+        if (cordova.callbacks[callbackId]) {
+
+            // If result is to be sent to callback
+            if (args.status == cordova.callbackStatus.OK) {
+                try {
+                    if (cordova.callbacks[callbackId].success) {
+                        cordova.callbacks[callbackId].success(args.message);
+                    }
+                }
+                catch (e) {
+                    console.log("Error in success callback: "+callbackId+" = "+e);
+                }
+            }
+
+            // Clear callback if not expecting any more results
+            if (!args.keepCallback) {
+                delete cordova.callbacks[callbackId];
+            }
+        }
+    },
+
+    /**
+     * Called by native code when returning error result from an action.
+     *
+     * @param callbackId
+     * @param args
+     */
+    callbackError: function(callbackId, args) {
+        if (cordova.callbacks[callbackId]) {
+            try {
+                if (cordova.callbacks[callbackId].fail) {
+                    cordova.callbacks[callbackId].fail(args.message);
+                }
+            }
+            catch (e) {
+                console.log("Error in error callback: "+callbackId+" = "+e);
+            }
+
+            // Clear callback if not expecting any more results
+            if (!args.keepCallback) {
+                delete cordova.callbacks[callbackId];
+            }
+        }
+    },
+    // TODO: remove in 2.0.
+    addPlugin: function(name, obj) {
+        console.log("[DEPRECATION NOTICE] window.addPlugin and window.plugins will be removed in version 2.0.");
+        if (!window.plugins[name]) {
+            window.plugins[name] = obj;
+        }
+        else {
+            console.log("Error: Plugin "+name+" already exists.");
+        }
+    },
+
+    addConstructor: function(func) {
+        channel.onCordovaReady.subscribeOnce(function() {
+            try {
+                func();
+            } catch(e) {
+                console.log("Failed to run constructor: " + e);
+            }
+        });
+    }
+};
+
+/**
+ * Legacy variable for plugin support
+ * TODO: remove in 2.0.
+ */
+if (!window.PhoneGap) {
+    window.PhoneGap = cordova;
+}
+
+/**
+ * Plugins object
+ * TODO: remove in 2.0.
+ */
+if (!window.plugins) {
+    window.plugins = {};
+}
+
+module.exports = cordova;
+
+});
+
+// file: lib\common\builder.js
+define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
+function each(objects, func, context) {
+    for (var prop in objects) {
+        if (objects.hasOwnProperty(prop)) {
+            func.apply(context, [objects[prop], prop]);
+        }
+    }
+}
+
+function include(parent, objects, clobber, merge) {
+    each(objects, function (obj, key) {
+        try {
+          var result = obj.path ? require(obj.path) : {};
+
+          if (clobber) {
+              // Clobber if it doesn't exist.
+              if (typeof parent[key] === 'undefined') {
+                  parent[key] = result;
+              } else if (typeof obj.path !== 'undefined') {
+                  // If merging, merge properties onto parent, otherwise, clobber.
+                  if (merge) {
+                      recursiveMerge(parent[key], result);
+                  } else {
+                      parent[key] = result;
+                  }
+              }
+              result = parent[key];
+          } else {
+            // Overwrite if not currently defined.
+            if (typeof parent[key] == 'undefined') {
+              parent[key] = result;
+            } else if (merge && typeof obj.path !== 'undefined') {
+              // If merging, merge parent onto result
+              recursiveMerge(result, parent[key]);
+              parent[key] = result;
+            } else {
+              // Set result to what already exists, so we can build children into it if they exist.
+              result = parent[key];
+            }
+          }
+
+          if (obj.children) {
+            include(result, obj.children, clobber, merge);
+          }
+        } catch(e) {
+          utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
+        }
+    });
+}
+
+/**
+ * Merge properties from one object onto another recursively.  Properties from
+ * the src object will overwrite existing target property.
+ *
+ * @param target Object to merge properties into.
+ * @param src Object to merge properties from.
+ */
+function recursiveMerge(target, src) {
+    for (var prop in src) {
+        if (src.hasOwnProperty(prop)) {
+            if (typeof target.prototype !== 'undefined' && target.prototype.constructor === target) {
+                // If the target object is a constructor override off prototype.
+                target.prototype[prop] = src[prop];
+            } else {
+                target[prop] = typeof src[prop] === 'object' ? recursiveMerge(
+                        target[prop], src[prop]) : src[prop];
+            }
+        }
+    }
+    return target;
+}
+
+module.exports = {
+    build: function (objects) {
+        return {
+            intoButDontClobber: function (target) {
+                include(target, objects, false, false);
+            },
+            intoAndClobber: function(target) {
+                include(target, objects, true, false);
+            },
+            intoAndMerge: function(target) {
+                include(target, objects, true, true);
+            }
+        };
+    }
+};
+
+});
+
+// file: lib\common\channel.js
+define("cordova/channel", function(require, exports, module) {
+/**
+ * Custom pub-sub "channel" that can have functions subscribed to it
+ * This object is used to define and control firing of events for
+ * cordova initialization.
+ *
+ * The order of events during page load and Cordova startup is as follows:
+ *
+ * onDOMContentLoaded         Internal event that is received when the web page is loaded and parsed.
+ * onNativeReady              Internal event that indicates the Cordova native side is ready.
+ * onCordovaReady             Internal event fired when all Cordova JavaScript objects have been created.
+ * onCordovaInfoReady         Internal event fired when device properties are available.
+ * onCordovaConnectionReady   Internal event fired when the connection property has been set.
+ * onDeviceReady              User event fired to indicate that Cordova is ready
+ * onResume                   User event fired to indicate a start/resume lifecycle event
+ * onPause                    User event fired to indicate a pause lifecycle event
+ * onDestroy                  Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
+ *
+ * The only Cordova events that user code should register for are:
+ *      deviceready           Cordova native code is initialized and Cordova APIs can be called from JavaScript
+ *      pause                 App has moved to background
+ *      resume                App has returned to foreground
+ *
+ * Listeners can be registered as:
+ *      document.addEventListener("deviceready", myDeviceReadyListener, false);
+ *      document.addEventListener("resume", myResumeListener, false);
+ *      document.addEventListener("pause", myPauseListener, false);
+ *
+ * The DOM lifecycle events should be used for saving and restoring state
+ *      window.onload
+ *      window.onunload
+ *
+ */
+
+/**
+ * Channel
+ * @constructor
+ * @param type  String the channel name
+ * @param opts  Object options to pass into the channel, currently
+ *                     supports:
+ *                     onSubscribe: callback that fires when
+ *                       something subscribes to the Channel. Sets
+ *                       context to the Channel.
+ *                     onUnsubscribe: callback that fires when
+ *                       something unsubscribes to the Channel. Sets
+ *                       context to the Channel.
+ */
+var Channel = function(type, opts) {
+        this.type = type;
+        this.handlers = {};
+        this.numHandlers = 0;
+        this.guid = 0;
+        this.fired = false;
+        this.enabled = true;
+        this.events = {
+          onSubscribe:null,
+          onUnsubscribe:null
+        };
+        if (opts) {
+          if (opts.onSubscribe) this.events.onSubscribe = opts.onSubscribe;
+          if (opts.onUnsubscribe) this.events.onUnsubscribe = opts.onUnsubscribe;
+        }
+    },
+    channel = {
+        /**
+         * Calls the provided function only after all of the channels specified
+         * have been fired.
+         */
+        join: function (h, c) {
+            var i = c.length;
+            var len = i;
+            var f = function() {
+                if (!(--i)) h();
+            };
+            for (var j=0; j<len; j++) {
+                !c[j].fired?c[j].subscribeOnce(f):i--;
+            }
+            if (!i) h();
+        },
+        create: function (type, opts) {
+            channel[type] = new Channel(type, opts);
+            return channel[type];
+        },
+
+        /**
+         * cordova Channels that must fire before "deviceready" is fired.
+         */
+        deviceReadyChannelsArray: [],
+        deviceReadyChannelsMap: {},
+
+        /**
+         * Indicate that a feature needs to be initialized before it is ready to be used.
+         * This holds up Cordova's "deviceready" event until the feature has been initialized
+         * and Cordova.initComplete(feature) is called.
+         *
+         * @param feature {String}     The unique feature name
+         */
+        waitForInitialization: function(feature) {
+            if (feature) {
+                var c = null;
+                if (this[feature]) {
+                    c = this[feature];
+                }
+                else {
+                    c = this.create(feature);
+                }
+                this.deviceReadyChannelsMap[feature] = c;
+                this.deviceReadyChannelsArray.push(c);
+            }
+        },
+
+        /**
+         * Indicate that initialization code has completed and the feature is ready to be used.
+         *
+         * @param feature {String}     The unique feature name
+         */
+        initializationComplete: function(feature) {
+            var c = this.deviceReadyChannelsMap[feature];
+            if (c) {
+                c.fire();
+            }
+        }
+    },
+    utils = require('cordova/utils');
+
+/**
+ * Subscribes the given function to the channel. Any time that
+ * Channel.fire is called so too will the function.
+ * Optionally specify an execution context for the function
+ * and a guid that can be used to stop subscribing to the channel.
+ * Returns the guid.
+ */
+Channel.prototype.subscribe = function(f, c, g) {
+    // need a function to call
+    if (f === null || f === undefined) { return; }
+
+    var func = f;
+    if (typeof c == "object" && f instanceof Function) { func = utils.close(c, f); }
+
+    g = g || func.observer_guid || f.observer_guid || this.guid++;
+    func.observer_guid = g;
+    f.observer_guid = g;
+    this.handlers[g] = func;
+    this.numHandlers++;
+    if (this.events.onSubscribe) this.events.onSubscribe.call(this);
+    return g;
+};
+
+/**
+ * Like subscribe but the function is only called once and then it
+ * auto-unsubscribes itself.
+ */
+Channel.prototype.subscribeOnce = function(f, c) {
+    // need a function to call
+    if (f === null || f === undefined) { return; }
+
+    var g = null;
+    var _this = this;
+    var m = function() {
+        f.apply(c || null, arguments);
+        _this.unsubscribe(g);
+    };
+    if (this.fired) {
+        if (typeof c == "object" && f instanceof Function) { f = utils.close(c, f); }
+        f.apply(this, this.fireArgs);
+    } else {
+        g = this.subscribe(m);
+    }
+    return g;
+};
+
+/**
+ * Unsubscribes the function with the given guid from the channel.
+ */
+Channel.prototype.unsubscribe = function(g) {
+    // need a function to unsubscribe
+    if (g === null || g === undefined) { return; }
+
+    if (g instanceof Function) { g = g.observer_guid; }
+    this.handlers[g] = null;
+    delete this.handlers[g];
+    this.numHandlers--;
+    if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
+};
+
+/**
+ * Calls all functions subscribed to this channel.
+ */
+Channel.prototype.fire = function(e) {
+    if (this.enabled) {
+        var fail = false;
+        this.fired = true;
+        for (var item in this.handlers) {
+            var handler = this.handlers[item];
+            if (handler instanceof Function) {
+                var rv = (handler.apply(this, arguments)===false);
+                fail = fail || rv;
+            }
+        }
+        this.fireArgs = arguments;
+        return !fail;
+    }
+    return true;
+};
+
+// defining them here so they are ready super fast!
+// DOM event that is received when the web page is loaded and parsed.
+channel.create('onDOMContentLoaded');
+
+// Event to indicate the Cordova native side is ready.
+channel.create('onNativeReady');
+
+// Event to indicate that all Cordova JavaScript objects have been created
+// and it's time to run plugin constructors.
+channel.create('onCordovaReady');
+
+// Event to indicate that device properties are available
+channel.create('onCordovaInfoReady');
+
+// Event to indicate that the connection property has been set.
+channel.create('onCordovaConnectionReady');
+
+// Event to indicate that Cordova is ready
+channel.create('onDeviceReady');
+
+// Event to indicate a resume lifecycle event
+channel.create('onResume');
+
+// Event to indicate a pause lifecycle event
+channel.create('onPause');
+
+// Event to indicate a destroy lifecycle event
+channel.create('onDestroy');
+
+// Channels that must fire before "deviceready" is fired.
+channel.waitForInitialization('onCordovaReady');
+channel.waitForInitialization('onCordovaInfoReady');
+channel.waitForInitialization('onCordovaConnectionReady');
+
+module.exports = channel;
+});
+
+// file: lib\common\common.js
+define("cordova/common", function(require, exports, module) {
+module.exports = {
+    objects: {
+        cordova: {
+            path: 'cordova',
+            children: {
+                exec: {
+                    path: 'cordova/exec'
+                }
+            }
+        },
+        navigator: {
+            children: {
+                notification: {
+                    path: 'cordova/plugin/notification'
+                },
+                accelerometer: {
+                    path: 'cordova/plugin/accelerometer'
+                },
+                battery: {
+                    path: 'cordova/plugin/battery'
+                },
+                camera:{
+                    path: 'cordova/plugin/Camera'
+                },
+                compass:{
+                    path: 'cordova/plugin/compass'
+                },
+                contacts: {
+                    path: 'cordova/plugin/contacts'
+                },
+                device:{
+                    children:{
+                        capture: {
+                            path: 'cordova/plugin/capture'
+                        }
+                    }
+                },
+                geolocation: {
+                    path: 'cordova/plugin/geolocation'
+                },
+                network: {
+                    children: {
+                        connection: {
+                            path: 'cordova/plugin/network'
+                        }
+                    }
+                }
+            }
+        },
+        Acceleration: {
+            path: 'cordova/plugin/Acceleration'
+        },
+        Camera:{
+            path: 'cordova/plugin/CameraConstants'
+        },
+        CaptureError: {
+            path: 'cordova/plugin/CaptureError'
+        },
+        CaptureAudioOptions:{
+            path: 'cordova/plugin/CaptureAudioOptions'
+        },
+        CaptureImageOptions: {
+            path: 'cordova/plugin/CaptureImageOptions'
+        },
+        CaptureVideoOptions: {
+            path: 'cordova/plugin/CaptureVideoOptions'
+        },
+        CompassHeading:{
+            path: 'cordova/plugin/CompassHeading'
+        },
+        CompassError:{
+            path: 'cordova/plugin/CompassError'
+        },
+        ConfigurationData: {
+            path: 'cordova/plugin/ConfigurationData'
+        },
+        Connection: {
+            path: 'cordova/plugin/Connection'
+        },
+        Contact: {
+            path: 'cordova/plugin/Contact'
+        },
+        ContactAddress: {
+            path: 'cordova/plugin/ContactAddress'
+        },
+        ContactError: {
+            path: 'cordova/plugin/ContactError'
+        },
+        ContactField: {
+            path: 'cordova/plugin/ContactField'
+        },
+        ContactFindOptions: {
+            path: 'cordova/plugin/ContactFindOptions'
+        },
+        ContactName: {
+            path: 'cordova/plugin/ContactName'
+        },
+        ContactOrganization: {
+            path: 'cordova/plugin/ContactOrganization'
+        },
+        Coordinates: {
+            path: 'cordova/plugin/Coordinates'
+        },
+        DirectoryEntry: {
+            path: 'cordova/plugin/DirectoryEntry'
+        },
+        DirectoryReader: {
+            path: 'cordova/plugin/DirectoryReader'
+        },
+        Entry: {
+            path: 'cordova/plugin/Entry'
+        },
+        File: {
+            path: 'cordova/plugin/File'
+        },
+        FileEntry: {
+            path: 'cordova/plugin/FileEntry'
+        },
+        FileError: {
+            path: 'cordova/plugin/FileError'
+        },
+        FileReader: {
+            path: 'cordova/plugin/FileReader'
+        },
+        FileSystem: {
+            path: 'cordova/plugin/FileSystem'
+        },
+        FileTransfer: {
+            path: 'cordova/plugin/FileTransfer'
+        },
+        FileTransferError: {
+            path: 'cordova/plugin/FileTransferError'
+        },
+        FileUploadOptions: {
+            path: 'cordova/plugin/FileUploadOptions'
+        },
+        FileUploadResult: {
+            path: 'cordova/plugin/FileUploadResult'
+        },
+        FileWriter: {
+            path: 'cordova/plugin/FileWriter'
+        },
+        Flags: {
+            path: 'cordova/plugin/Flags'
+        },
+        LocalFileSystem: {
+            path: 'cordova/plugin/LocalFileSystem'
+        },
+        Media: {
+            path: 'cordova/plugin/Media'
+        },
+        MediaError: {
+            path: 'cordova/plugin/MediaError'
+        },
+        MediaFile: {
+            path: 'cordova/plugin/MediaFile'
+        },
+        MediaFileData:{
+            path: 'cordova/plugin/MediaFileData'
+        },
+        Metadata:{
+            path: 'cordova/plugin/Metadata'
+        },
+        Position: {
+            path: 'cordova/plugin/Position'
+        },
+        PositionError: {
+            path: 'cordova/plugin/PositionError'
+        },
+        ProgressEvent: {
+            path: 'cordova/plugin/ProgressEvent'
+        },
+        requestFileSystem:{
+            path: 'cordova/plugin/requestFileSystem'
+        },
+        resolveLocalFileSystemURI:{
+            path: 'cordova/plugin/resolveLocalFileSystemURI'
+        }
+    }
+};
+});
+
+// file: lib\wp7\exec.js
+define("cordova/exec", function(require, exports, module) {
+var cordova = require('cordova');
+
+
+ /* definition of named properties expected by the native side,
+    all arrays are stored in order of how they are received from common js code.
+    When other platforms evolve to using named args this will be removed.
+ */
+
+var NamedArgs =  {
+    File:{
+        getFileMetadata:["fullPath"],
+        readAsText:["fileName","encoding"],
+        readAsDataURL:["fileName"],
+        getDirectory:["fullPath","path","options"],
+        remove:["fullPath"],
+        removeRecursively:["fullPath"],
+        getFile:["fullPath","path","options"],
+        readEntries:["fullPath"],
+        write:["fileName","data","position"],
+        truncate:["fileName","size"]
+    },
+    FileTransfer:{
+        upload:["filePath", "server", "fileKey", "fileName", "mimeType", "params", "debug", "chunkedMode"]
+    },
+    Contacts:{
+        search:["fields","options"]
+    },
+    Media:{
+        create:["id","src"],
+        startPlayingAudio:["id","src","milliseconds"],
+        //stopPlayingAudio
+        seekToAudio:["id","milliseconds"],
+        //pausePlayingAudio
+        //getCurrentPositionAudio
+        startRecordingAudio:["id","src"],
+        stopRecordingAudio:["id"],
+        release:["id"],
+        setVolume:["id","volume"]
+    },
+    Notification: {
+        alert:["message","title","buttonLabel"],
+        confirm:["message","title","buttonLabel"]
+    },
+    Camera:{
+        takePicture:["quality", "destinationType", "sourceType", "targetWidth", "targetHeight", "encodingType"]
+    }
+};
+
+/**
+ * Execute a cordova command.  It is up to the native side whether this action
+ * is synchronous or asynchronous.  The native side can return:
+ *      Synchronous: PluginResult object as a JSON string
+ *      Asynchrounous: Empty string ""
+ * If async, the native side will cordova.callbackSuccess or cordova.callbackError,
+ * depending upon the result of the action.
+ *
+ * @param {Function} success    The success callback
+ * @param {Function} fail       The fail callback
+ * @param {String} service      The name of the service to use
+ * @param {String} action       Action to be run in cordova
+ * @param {String[]} [args]     Zero or more arguments to pass to the method
+
+ */
+
+module.exports = function(success, fail, service, action, args) {
+
+    var callbackId = service + cordova.callbackId++;
+    if (typeof success == "function" || typeof fail == "function")
+    {
+        cordova.callbacks[callbackId] = {success:success, fail:fail};
+    }
+
+    // generate a new command string, ex. DebugConsole/log/DebugConsole23/{"message":"wtf dude?"}
+
+    if(NamedArgs[service] && NamedArgs[service][action]) {
+        var argNames = NamedArgs[service][action];
+        var newArgs = {};
+        var len = Math.min(args.length,argNames.length);
+
+        for(var n = 0; n < len; n++) {
+            newArgs[argNames[n]] = args[n];
+        }
+
+        args = newArgs;
+    }
+    else if(args && args.length && args.length == 1) {
+        args = args[0];
+    }
+
+    var command = service + "/" + action + "/" + callbackId + "/" + JSON.stringify(args);
+    // pass it on to Notify
+    try {
+        if(window.external) {
+            window.external.Notify(command);
+        }
+        else {
+            console.log("window.external not available :: command=" + command);
+        }
+    }
+    catch(e) {
+        console.log("Exception calling native with command :: " + command + " :: exception=" + e);
+    }
+};
+
+
+});
+
+// file: lib\wp7\platform.js
+define("cordova/platform", function(require, exports, module) {
+var cordova = require('cordova'),
+      exec = require('cordova/exec');
+
+// specifically require the following patches :
+
+// localStorage+SessionStorage APIs
+require("cordova/plugin/wp7/DOMStorage");
+
+// Fix XHR calls to local file-system
+require("cordova/plugin/wp7/XHRPatch");
+
+
+module.exports = {
+    id: "wp7",
+    initialize:function() {
+
+
+
+
+    // INject a lsitener for the backbutton, and tell native to override the flag (true/false) when we have 1 or more, or 0, listeners
+    var backButtonChannel = cordova.addDocumentEventHandler('backbutton', {
+      onSubscribe:function() {
+        if (this.numHandlers === 1) {
+            exec(null, null, "CoreEvents", "overridebackbutton", [true]);
+        }
+      },
+      onUnsubscribe:function() {
+        if (this.numHandlers === 0) {
+          exec(null, null, "CoreEvents", "overridebackbutton", [false]);
+        }
+      }
+    });
+    },
+    objects: {
+        CordovaCommandResult: {
+            path:"cordova/plugin/wp7/CordovaCommandResult"
+        },
+        CordovaMediaonStatus: {
+            path:"cordova/plugin/wp7/CordovaMediaonStatus"
+        },
+        requestFileSystem: {
+            path:"cordova/plugin/wp7/requestFileSystem"
+        },
+        resolveLocalFileSystemURI: {
+            path:"cordova/plugin/wp7/resolveLocalFileSystemURI"
+        },
+        File: {
+            path: "cordova/plugin/File"
+        },
+        FileReader: {
+            path: "cordova/plugin/FileReader"
+        },
+        FileError: {
+            path: "cordova/plugin/FileError"
+        },
+        MediaError: {
+            path: "cordova/plugin/MediaError"
+        },
+        navigator: {
+            children: {
+                device: {
+                    path: "cordova/plugin/wp7/device",
+                    children:{
+                        capture:{
+                            path:"cordova/plugin/capture"
+                        }
+                    }
+                },
+                console: {
+                    path: "cordova/plugin/wp7/console"
+
+                }
+            }
+        },
+        device:{
+          path:"cordova/plugin/wp7/device"
+        },
+        console:{
+          path: "cordova/plugin/wp7/console"
+        }
+    }
+};
+});
+
+// file: lib\common\plugin\Acceleration.js
+define("cordova/plugin/Acceleration", function(require, exports, module) {
+var Acceleration = function(x, y, z, timestamp) {
+  this.x = x;
+  this.y = y;
+  this.z = z;
+  this.timestamp = timestamp || (new Date()).getTime();
+};
+
+module.exports = Acceleration;
+});
+
+// file: lib\common\plugin\Camera.js
+define("cordova/plugin/Camera", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    Camera = require('cordova/plugin/CameraConstants');
+
+var cameraExport = {};
+
+// Tack on the Camera Constants to the base camera plugin.
+for (var key in Camera) {
+    cameraExport[key] = Camera[key];
+}
+
+/**
+ * Gets a picture from source defined by "options.sourceType", and returns the
+ * image as defined by the "options.destinationType" option.
+
+ * The defaults are sourceType=CAMERA and destinationType=FILE_URL.
+ *
+ * @param {Function} successCallback
+ * @param {Function} errorCallback
+ * @param {Object} options
+ */
+cameraExport.getPicture = function(successCallback, errorCallback, options) {
+    // successCallback required
+    if (typeof successCallback != "function") {
+        console.log("Camera Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("Camera Error: errorCallback is not a function");
+        return;
+    }
+
+    var quality = 50;
+    if (options && typeof options.quality == "number") {
+        quality = options.quality;
+    } else if (options && typeof options.quality == "string") {
+        var qlity = parseInt(options.quality, 10);
+        if (isNaN(qlity) === false) {
+            quality = qlity.valueOf();
+        }
+    }
+
+    var destinationType = Camera.DestinationType.FILE_URI;
+    if (typeof options.destinationType == "number") {
+        destinationType = options.destinationType;
+    }
+
+    var sourceType = Camera.PictureSourceType.CAMERA;
+    if (typeof options.sourceType == "number") {
+        sourceType = options.sourceType;
+    }
+
+    var targetWidth = -1;
+    if (typeof options.targetWidth == "number") {
+        targetWidth = options.targetWidth;
+    } else if (typeof options.targetWidth == "string") {
+        var width = parseInt(options.targetWidth, 10);
+        if (isNaN(width) === false) {
+            targetWidth = width.valueOf();
+        }
+    }
+
+    var targetHeight = -1;
+    if (typeof options.targetHeight == "number") {
+        targetHeight = options.targetHeight;
+    } else if (typeof options.targetHeight == "string") {
+        var height = parseInt(options.targetHeight, 10);
+        if (isNaN(height) === false) {
+            targetHeight = height.valueOf();
+        }
+    }
+
+    var encodingType = Camera.EncodingType.JPEG;
+    if (typeof options.encodingType == "number") {
+        encodingType = options.encodingType;
+    }
+
+    var mediaType = Camera.MediaType.PICTURE;
+    if (typeof options.mediaType == "number") {
+        mediaType = options.mediaType;
+    }
+    var allowEdit = false;
+    if (typeof options.allowEdit == "boolean") {
+        allowEdit = options.allowEdit;
+    } else if (typeof options.allowEdit == "number") {
+        allowEdit = options.allowEdit <= 0 ? false : true;
+    }
+    var correctOrientation = false;
+    if (typeof options.correctOrientation == "boolean") {
+        correctOrientation = options.correctOrientation;
+    } else if (typeof options.correctOrientation == "number") {
+        correctOrientation = options.correctOrientation <=0 ? false : true;
+    }
+    var saveToPhotoAlbum = false;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
+    } else if (typeof options.saveToPhotoAlbum == "number") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+    }
+
+    exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
+};
+
+module.exports = cameraExport;
+});
+
+// file: lib\common\plugin\CameraConstants.js
+define("cordova/plugin/CameraConstants", function(require, exports, module) {
+module.exports = {
+  DestinationType:{
+    DATA_URL: 0,         // Return base64 encoded string
+    FILE_URI: 1          // Return file uri (content://media/external/images/media/2 for Android)
+  },
+  EncodingType:{
+    JPEG: 0,             // Return JPEG encoded image
+    PNG: 1               // Return PNG encoded image
+  },
+  MediaType:{
+    PICTURE: 0,          // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
+    VIDEO: 1,            // allow selection of video only, ONLY RETURNS URL
+    ALLMEDIA : 2         // allow selection from all media types
+  },
+  PictureSourceType:{
+    PHOTOLIBRARY : 0,    // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
+    CAMERA : 1,          // Take picture from camera
+    SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
+  }
+};
+});
+
+// file: lib\common\plugin\CaptureAudioOptions.js
+define("cordova/plugin/CaptureAudioOptions", function(require, exports, module) {
+/**
+ * Encapsulates all audio capture operation configuration options.
+ */
+var CaptureAudioOptions = function(){
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
+};
+
+module.exports = CaptureAudioOptions;
+});
+
+// file: lib\common\plugin\CaptureError.js
+define("cordova/plugin/CaptureError", function(require, exports, module) {
+/**
+ * The CaptureError interface encapsulates all errors in the Capture API.
+ */
+var CaptureError = function(c) {
+   this.code = c || null;
+};
+
+// Camera or microphone failed to capture image or sound.
+CaptureError.CAPTURE_INTERNAL_ERR = 0;
+// Camera application or audio capture application is currently serving other capture request.
+CaptureError.CAPTURE_APPLICATION_BUSY = 1;
+// Invalid use of the API (e.g. limit parameter has value less than one).
+CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
+// User exited camera application or audio capture application before capturing anything.
+CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
+// The requested capture operation is not supported.
+CaptureError.CAPTURE_NOT_SUPPORTED = 20;
+
+module.exports = CaptureError;
+});
+
+// file: lib\common\plugin\CaptureImageOptions.js
+define("cordova/plugin/CaptureImageOptions", function(require, exports, module) {
+/**
+ * Encapsulates all image capture operation configuration options.
+ */
+var CaptureImageOptions = function(){
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
+};
+
+module.exports = CaptureImageOptions;
+});
+
+// file: lib\common\plugin\CaptureVideoOptions.js
+define("cordova/plugin/CaptureVideoOptions", function(require, exports, module) {
+/**
+ * Encapsulates all video capture operation configuration options.
+ */
+var CaptureVideoOptions = function(){
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
+};
+
+module.exports = CaptureVideoOptions;
+});
+
+// file: lib\common\plugin\CompassError.js
+define("cordova/plugin/CompassError", function(require, exports, module) {
+/**
+ *  CompassError.
+ *  An error code assigned by an implementation when an error has occured
+ * @constructor
+ */
+var CompassError = function(err) {
+    this.code = (err !== undefined ? err : null);
+};
+
+CompassError.COMPASS_INTERNAL_ERR = 0;
+CompassError.COMPASS_NOT_SUPPORTED = 20;
+
+module.exports = CompassError;
+});
+
+// file: lib\common\plugin\CompassHeading.js
+define("cordova/plugin/CompassHeading", function(require, exports, module) {
+var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, timestamp) {
+  this.magneticHeading = (magneticHeading !== undefined ? magneticHeading : null);
+  this.trueHeading = (trueHeading !== undefined ? trueHeading : null);
+  this.headingAccuracy = (headingAccuracy !== undefined ? headingAccuracy : null);
+  this.timestamp = (timestamp !== undefined ? timestamp : new Date().getTime());
+};
+
+module.exports = CompassHeading;
+});
+
+// file: lib\common\plugin\ConfigurationData.js
+define("cordova/plugin/ConfigurationData", function(require, exports, module) {
+/**
+ * Encapsulates a set of parameters that the capture device supports.
+ */
+function ConfigurationData() {
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
+    this.height = 0;
+    // The width attribute represents width of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0
+    this.width = 0;
+}
+
+module.exports = ConfigurationData;
+});
+
+// file: lib\common\plugin\Connection.js
+define("cordova/plugin/Connection", function(require, exports, module) {
+/**
+ * Network status
+ */
+module.exports = {
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
+};
+});
+
+// file: lib\common\plugin\Contact.js
+define("cordova/plugin/Contact", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    ContactError = require('cordova/plugin/ContactError'),
+    utils = require('cordova/utils');
+
+/**
+* Converts primitives into Complex Object
+* Currently only used for Date fields
+*/
+function convertIn(contact) {
+    var value = contact.birthday;
+    try {
+      contact.birthday = new Date(parseFloat(value));
+    } catch (exception){
+      console.log("Cordova Contact convertIn error: exception creating date.");
+    }
+    return contact;
+}
+
+/**
+* Converts Complex objects into primitives
+* Only conversion at present is for Dates.
+**/
+
+function convertOut(contact) {
+    var value = contact.birthday;
+    if (value !== null) {
+        // try to make it a Date object if it is not already
+        if (!value instanceof Date){
+            try {
+                value = new Date(value);
+            } catch(exception){
+                value = null;
+            }
+        }
+        if (value instanceof Date){
+            value = value.valueOf(); // convert to milliseconds
+        }
+        contact.birthday = value;
+    }
+    return contact;
+}
+
+/**
+* Contains information about a single contact.
+* @constructor
+* @param {DOMString} id unique identifier
+* @param {DOMString} displayName
+* @param {ContactName} name
+* @param {DOMString} nickname
+* @param {Array.<ContactField>} phoneNumbers array of phone numbers
+* @param {Array.<ContactField>} emails array of email addresses
+* @param {Array.<ContactAddress>} addresses array of addresses
+* @param {Array.<ContactField>} ims instant messaging user ids
+* @param {Array.<ContactOrganization>} organizations
+* @param {DOMString} birthday contact's birthday
+* @param {DOMString} note user notes about contact
+* @param {Array.<ContactField>} photos
+* @param {Array.<ContactField>} categories
+* @param {Array.<ContactField>} urls contact's web sites
+*/
+var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
+    ims, organizations, birthday, note, photos, categories, urls) {
+    this.id = id || null;
+    this.rawId = null;
+    this.displayName = displayName || null;
+    this.name = name || null; // ContactName
+    this.nickname = nickname || null;
+    this.phoneNumbers = phoneNumbers || null; // ContactField[]
+    this.emails = emails || null; // ContactField[]
+    this.addresses = addresses || null; // ContactAddress[]
+    this.ims = ims || null; // ContactField[]
+    this.organizations = organizations || null; // ContactOrganization[]
+    this.birthday = birthday || null;
+    this.note = note || null;
+    this.photos = photos || null; // ContactField[]
+    this.categories = categories || null; // ContactField[]
+    this.urls = urls || null; // ContactField[]
+};
+
+/**
+* Removes contact from device storage.
+* @param successCB success callback
+* @param errorCB error callback
+*/
+Contact.prototype.remove = function(successCB, errorCB) {
+    var fail = function(code) {
+        errorCB(new ContactError(code));
+    };
+    if (this.id === null) {
+        fail(ContactError.UNKNOWN_ERROR);
+    }
+    else {
+        exec(successCB, fail, "Contacts", "remove", [this.id]);
+    }
+};
+
+/**
+* Creates a deep copy of this Contact.
+* With the contact ID set to null.
+* @return copy of this Contact
+*/
+Contact.prototype.clone = function() {
+    var clonedContact = utils.clone(this);
+    var i;
+    clonedContact.id = null;
+    clonedContact.rawId = null;
+    // Loop through and clear out any id's in phones, emails, etc.
+    if (clonedContact.phoneNumbers) {
+        for (i = 0; i < clonedContact.phoneNumbers.length; i++) {
+            clonedContact.phoneNumbers[i].id = null;
+        }
+    }
+    if (clonedContact.emails) {
+        for (i = 0; i < clonedContact.emails.length; i++) {
+            clonedContact.emails[i].id = null;
+        }
+    }
+    if (clonedContact.addresses) {
+        for (i = 0; i < clonedContact.addresses.length; i++) {
+            clonedContact.addresses[i].id = null;
+        }
+    }
+    if (clonedContact.ims) {
+        for (i = 0; i < clonedContact.ims.length; i++) {
+            clonedContact.ims[i].id = null;
+        }
+    }
+    if (clonedContact.organizations) {
+        for (i = 0; i < clonedContact.organizations.length; i++) {
+            clonedContact.organizations[i].id = null;
+        }
+    }
+    if (clonedContact.categories) {
+        for (i = 0; i < clonedContact.categories.length; i++) {
+            clonedContact.categories[i].id = null;
+        }
+    }
+    if (clonedContact.photos) {
+        for (i = 0; i < clonedContact.photos.length; i++) {
+            clonedContact.photos[i].id = null;
+        }
+    }
+    if (clonedContact.urls) {
+        for (i = 0; i < clonedContact.urls.length; i++) {
+            clonedContact.urls[i].id = null;
+        }
+    }
+    return clonedContact;
+};
+
+/**
+* Persists contact to device storage.
+* @param successCB success callback
+* @param errorCB error callback
+*/
+Contact.prototype.save = function(successCB, errorCB) {
+  var fail = function(code) {
+      errorCB(new ContactError(code));
+  };
+    var success = function(result) {
+      if (result) {
+          if (typeof successCB === 'function') {
+              var fullContact = require('cordova/plugin/contacts').create(result);
+              successCB(convertIn(fullContact));
+          }
+      }
+      else {
+          // no Entry object returned
+          fail(ContactError.UNKNOWN_ERROR);
+      }
+  };
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
+};
+
+
+module.exports = Contact;
+});
+
+// file: lib\common\plugin\ContactAddress.js
+define("cordova/plugin/ContactAddress", function(require, exports, module) {
+/**
+* Contact address.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code
+* @param formatted // NOTE: not a W3C standard
+* @param streetAddress
+* @param locality
+* @param region
+* @param postalCode
+* @param country
+*/
+
+var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) {
+    this.id = null;
+    this.pref = (typeof pref != 'undefined' ? pref : false);
+    this.type = type || null;
+    this.formatted = formatted || null;
+    this.streetAddress = streetAddress || null;
+    this.locality = locality || null;
+    this.region = region || null;
+    this.postalCode = postalCode || null;
+    this.country = country || null;
+};
+
+module.exports = ContactAddress;
+});
+
+// file: lib\common\plugin\ContactError.js
+define("cordova/plugin/ContactError", function(require, exports, module) {
+/**
+ *  ContactError.
+ *  An error code assigned by an implementation when an error has occured
+ * @constructor
+ */
+var ContactError = function(err) {
+    this.code = (typeof err != 'undefined' ? err : null);
+};
+
+/**
+ * Error codes
+ */
+ContactError.UNKNOWN_ERROR = 0;
+ContactError.INVALID_ARGUMENT_ERROR = 1;
+ContactError.TIMEOUT_ERROR = 2;
+ContactError.PENDING_OPERATION_ERROR = 3;
+ContactError.IO_ERROR = 4;
+ContactError.NOT_SUPPORTED_ERROR = 5;
+ContactError.PERMISSION_DENIED_ERROR = 20;
+
+module.exports = ContactError;
+});
+
+// file: lib\common\plugin\ContactField.js
+define("cordova/plugin/ContactField", function(require, exports, module) {
+/**
+* Generic contact field.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code // NOTE: not a W3C standard
+* @param type
+* @param value
+* @param pref
+*/
+var ContactField = function(type, value, pref) {
+    this.id = null;
+    this.type = type || null;
+    this.value = value || null;
+    this.pref = (typeof pref != 'undefined' ? pref : false);
+};
+
+module.exports = ContactField;
+});
+
+// file: lib\common\plugin\ContactFindOptions.js
+define("cordova/plugin/ContactFindOptions", function(require, exports, module) {
+/**
+ * ContactFindOptions.
+ * @constructor
+ * @param filter used to match contacts against
+ * @param multiple boolean used to determine if more than one contact should be returned
+ */
+
+var ContactFindOptions = function(filter, multiple) {
+    this.filter = filter || '';
+    this.multiple = (typeof multiple != 'undefined' ? multiple : false);
+};
+
+module.exports = ContactFindOptions;
+});
+
+// file: lib\common\plugin\ContactName.js
+define("cordova/plugin/ContactName", function(require, exports, module) {
+/**
+* Contact name.
+* @constructor
+* @param formatted // NOTE: not part of W3C standard
+* @param familyName
+* @param givenName
+* @param middle
+* @param prefix
+* @param suffix
+*/
+var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
+    this.formatted = formatted || null;
+    this.familyName = familyName || null;
+    this.givenName = givenName || null;
+    this.middleName = middle || null;
+    this.honorificPrefix = prefix || null;
+    this.honorificSuffix = suffix || null;
+};
+
+module.exports = ContactName;
+});
+
+// file: lib\common\plugin\ContactOrganization.js
+define("cordova/plugin/ContactOrganization", function(require, exports, module) {
+/**
+* Contact organization.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code // NOTE: not a W3C standard
+* @param name
+* @param dept
+* @param title
+* @param startDate
+* @param endDate
+* @param location
+* @param desc
+*/
+
+var ContactOrganization = function(pref, type, name, dept, title) {
+    this.id = null;
+    this.pref = (typeof pref != 'undefined' ? pref : false);
+    this.type = type || null;
+    this.name = name || null;
+    this.department = dept || null;
+    this.title = title || null;
+};
+
+module.exports = ContactOrganization;
+});
+
+// file: lib\common\plugin\Coordinates.js
+define("cordova/plugin/Coordinates", function(require, exports, module) {
+/**
+ * This class contains position information.
+ * @param {Object} lat
+ * @param {Object} lng
+ * @param {Object} alt
+ * @param {Object} acc
+ * @param {Object} head
+ * @param {Object} vel
+ * @param {Object} altacc
+ * @constructor
+ */
+var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
+    /**
+     * The latitude of the position.
+     */
+    this.latitude = lat;
+    /**
+     * The longitude of the position,
+     */
+    this.longitude = lng;
+    /**
+     * The accuracy of the position.
+     */
+    this.accuracy = acc;
+    /**
+     * The altitude of the position.
+     */
+    this.altitude = alt;
+    /**
+     * The direction the device is moving at the position.
+     */
+    this.heading = head;
+    /**
+     * The velocity with which the device is moving at the position.
+     */
+    this.speed = vel;
+    /**
+     * The altitude accuracy of the position.
+     */
+    this.altitudeAccuracy = (altacc !== undefined) ? altacc : null;
+};
+
+module.exports = Coordinates;
+});
+
+// file: lib\common\plugin\DirectoryEntry.js
+define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
+    DirectoryReader = require('cordova/plugin/DirectoryReader');
+
+/**
+ * An interface representing a directory on the file system.
+ *
+ * {boolean} isFile always false (readonly)
+ * {boolean} isDirectory always true (readonly)
+ * {DOMString} name of the directory, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the directory (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+var DirectoryEntry = function(name, fullPath) {
+     DirectoryEntry.__super__.constructor.apply(this, [false, true, name, fullPath]);
+};
+
+utils.extend(DirectoryEntry, Entry);
+
+/**
+ * Creates a new DirectoryReader to read entries from this directory
+ */
+DirectoryEntry.prototype.createReader = function() {
+    return new DirectoryReader(this.fullPath);
+};
+
+/**
+ * Creates or looks up a directory
+ *
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
+ * @param {Flags} options to create or excluively create the directory
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var entry = new DirectoryEntry(result.name, result.fullPath);
+        successCallback(entry);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getDirectory", [this.fullPath, path, options]);
+};
+
+/**
+ * Deletes a directory and all of it's contents
+ *
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(successCallback, fail, "File", "removeRecursively", [this.fullPath]);
+};
+
+/**
+ * Creates or looks up a file
+ *
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
+ * @param {Flags} options to create or excluively create the file
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var FileEntry = require('cordova/plugin/FileEntry');
+        var entry = new FileEntry(result.name, result.fullPath);
+        successCallback(entry);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getFile", [this.fullPath, path, options]);
+};
+
+module.exports = DirectoryEntry;
+
+});
+
+// file: lib\common\plugin\DirectoryReader.js
+define("cordova/plugin/DirectoryReader", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
+
+/**
+ * An interface that lists the files and directories in a directory.
+ */
+function DirectoryReader(path) {
+    this.path = path || null;
+}
+
+/**
+ * Returns a list of entries from a directory.
+ *
+ * @param {Function} successCallback is called with a list of entries
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var retVal = [];
+        for (var i=0; i<result.length; i++) {
+            var entry = null;
+            if (result[i].isDirectory) {
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
+            }
+            else if (result[i].isFile) {
+                entry = new (require('cordova/plugin/FileEntry'))();
+            }
+            entry.isDirectory = result[i].isDirectory;
+            entry.isFile = result[i].isFile;
+            entry.name = result[i].name;
+            entry.fullPath = result[i].fullPath;
+            retVal.push(entry);
+        }
+        successCallback(retVal);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "readEntries", [this.path]);
+};
+
+module.exports = DirectoryReader;
+
+});
+
+// file: lib\common\plugin\Entry.js
+define("cordova/plugin/Entry", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError'),
+    Metadata = require('cordova/plugin/Metadata');
+
+/**
+ * Represents a file or directory on the local file system.
+ *
+ * @param isFile
+ *            {boolean} true if Entry is a file (readonly)
+ * @param isDirectory
+ *            {boolean} true if Entry is a directory (readonly)
+ * @param name
+ *            {DOMString} name of the file or directory, excluding the path
+ *            leading to it (readonly)
+ * @param fullPath
+ *            {DOMString} the absolute full path to the file or directory
+ *            (readonly)
+ */
+function Entry(isFile, isDirectory, name, fullPath, fileSystem) {
+    this.isFile = (typeof isFile != 'undefined'?isFile:false);
+    this.isDirectory = (typeof isDirectory != 'undefined'?isDirectory:false);
+    this.name = name || '';
+    this.fullPath = fullPath || '';
+    this.filesystem = fileSystem || null;
+}
+
+/**
+ * Look up the metadata of the entry.
+ *
+ * @param successCallback
+ *            {Function} is called with a Metadata object
+ * @param errorCallback
+ *            {Function} is called with a FileError
+ */
+Entry.prototype.getMetadata = function(successCallback, errorCallback) {
+  var success = typeof successCallback !== 'function' ? null : function(lastModified) {
+      var metadata = new Metadata(lastModified);
+      successCallback(metadata);
+  };
+  var fail = typeof errorCallback !== 'function' ? null : function(code) {
+      errorCallback(new FileError(code));
+  };
+
+  exec(success, fail, "File", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Move a file or directory to a new location.
+ *
+ * @param parent
+ *            {DirectoryEntry} the directory to which to move this entry
+ * @param newName
+ *            {DOMString} new name of the entry, defaults to the current name
+ * @param successCallback
+ *            {Function} called with the new DirectoryEntry object
+ * @param errorCallback
+ *            {Function} called with a FileError
+ */
+Entry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+    // user must specify parent Entry
+    if (!parent) {
+        fail(FileError.NOT_FOUND_ERR);
+        return;
+    }
+    // source path
+    var srcPath = this.fullPath,
+        // entry name
+        name = newName || this.name,
+        success = function(entry) {
+            if (entry) {
+                if (typeof successCallback === 'function') {
+                    // create appropriate Entry object
+                    var result = (entry.isDirectory) ? new (require('cordova/plugin/DirectoryEntry'))(entry.name, entry.fullPath) : new (require('cordova/plugin/FileEntry'))(entry.name, entry.fullPath);
+                    try {
+                        successCallback(result);
+                    }
+                    catch (e) {
+                        console.log('Error invoking callback: ' + e);
+                    }
+                }
+            }
+            else {
+                // no Entry object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+
+    // copy
+    exec(success, fail, "File", "moveTo", [srcPath, parent.fullPath, name]);
+};
+
+/**
+ * Copy a directory to a different location.
+ *
+ * @param parent
+ *            {DirectoryEntry} the directory to which to copy the entry
+ * @param newName
+ *            {DOMString} new name of the entry, defaults to the current name
+ * @param successCallback
+ *            {Function} called with the new Entry object
+ * @param errorCallback
+ *            {Function} called with a FileError
+ */
+Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+
+    // user must specify parent Entry
+    if (!parent) {
+        fail(FileError.NOT_FOUND_ERR);
+        return;
+    }
+
+        // source path
+    var srcPath = this.fullPath,
+        // entry name
+        name = newName || this.name,
+        // success callback
+        success = function(entry) {
+            if (entry) {
+                if (typeof successCallback === 'function') {
+                    // create appropriate Entry object
+                    var result = (entry.isDirectory) ? new (require('cordova/plugin/DirectoryEntry'))(entry.name, entry.fullPath) : new (require('cordova/plugin/FileEntry'))(entry.name, entry.fullPath);
+                    try {
+                        successCallback(result);
+                    }
+                    catch (e) {
+                        console.log('Error invoking callback: ' + e);
+                    }
+                }
+            }
+            else {
+                // no Entry object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+
+    // copy
+    exec(success, fail, "File", "copyTo", [srcPath, parent.fullPath, name]);
+};
+
+/**
+ * Return a URL that can be used to identify this entry.
+ */
+Entry.prototype.toURL = function() {
+    // fullPath attribute contains the full URL
+    return this.fullPath;
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ *
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @return uri
+ */
+Entry.prototype.toURI = function(mimeType) {
+    console.log("DEPRECATED: Update your code to use 'toURL'");
+    // fullPath attribute contains the full URI
+    return this.fullPath;
+};
+
+/**
+ * Remove a file or directory. It is an error to attempt to delete a
+ * directory that is not empty. It is an error to attempt to delete a
+ * root directory of a file system.
+ *
+ * @param successCallback {Function} called with no parameters
+ * @param errorCallback {Function} called with a FileError
+ */
+Entry.prototype.remove = function(successCallback, errorCallback) {
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(successCallback, fail, "File", "remove", [this.fullPath]);
+};
+
+/**
+ * Look up the parent DirectoryEntry of this entry.
+ *
+ * @param successCallback {Function} called with the parent DirectoryEntry object
+ * @param errorCallback {Function} called with a FileError
+ */
+Entry.prototype.getParent = function(successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var DirectoryEntry = require('cordova/plugin/DirectoryEntry');
+        var entry = new DirectoryEntry(result.name, result.fullPath);
+        successCallback(entry);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getParent", [this.fullPath]);
+};
+
+module.exports = Entry;
+});
+
+// file: lib\common\plugin\File.js
+define("cordova/plugin/File", function(require, exports, module) {
+/**
+ * Constructor.
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+
+var File = function(name, fullPath, type, lastModifiedDate, size){
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
+};
+
+module.exports = File;
+});
+
+// file: lib\common\plugin\FileEntry.js
+define("cordova/plugin/FileEntry", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    Entry = require('cordova/plugin/Entry'),
+    FileWriter = require('cordova/plugin/FileWriter'),
+    File = require('cordova/plugin/File'),
+    FileError = require('cordova/plugin/FileError');
+
+/**
+ * An interface representing a file on the file system.
+ *
+ * {boolean} isFile always true (readonly)
+ * {boolean} isDirectory always false (readonly)
+ * {DOMString} name of the file, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the file (readonly)
+ * {FileSystem} filesystem on which the file resides (readonly)
+ */
+var FileEntry = function(name, fullPath) {
+     FileEntry.__super__.constructor.apply(this, [true, false, name, fullPath]);
+};
+
+utils.extend(FileEntry, Entry);
+
+/**
+ * Creates a new FileWriter associated with the file that this FileEntry represents.
+ *
+ * @param {Function} successCallback is called with the new FileWriter
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
+    this.file(function(filePointer) {
+        var writer = new FileWriter(filePointer);
+
+        if (writer.fileName === null || writer.fileName === "") {
+            if (typeof errorCallback === "function") {
+                errorCallback(new FileError(FileError.INVALID_STATE_ERR));
+            }
+        } else {
+            if (typeof successCallback === "function") {
+                successCallback(writer);
+            }
+        }
+    }, errorCallback);
+};
+
+/**
+ * Returns a File that represents the current state of the file that this FileEntry represents.
+ *
+ * @param {Function} successCallback is called with the new File object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.file = function(successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(f) {
+        var file = new File(f.name, f.fullPath, f.type, f.lastModifiedDate, f.size);
+        successCallback(file);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getFileMetadata", [this.fullPath]);
+};
+
+
+module.exports = FileEntry;
+});
+
+// file: lib\common\plugin\FileError.js
+define("cordova/plugin/FileError", function(require, exports, module) {
+/**
+ * FileError
+ */
+function FileError(error) {
+  this.code = error || null;
+}
+
+// File error codes
+// Found in DOMException
+FileError.NOT_FOUND_ERR = 1;
+FileError.SECURITY_ERR = 2;
+FileError.ABORT_ERR = 3;
+
+// Added by File API specification
+FileError.NOT_READABLE_ERR = 4;
+FileError.ENCODING_ERR = 5;
+FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
+FileError.INVALID_STATE_ERR = 7;
+FileError.SYNTAX_ERR = 8;
+FileError.INVALID_MODIFICATION_ERR = 9;
+FileError.QUOTA_EXCEEDED_ERR = 10;
+FileError.TYPE_MISMATCH_ERR = 11;
+FileError.PATH_EXISTS_ERR = 12;
+
+module.exports = FileError;
+});
+
+// file: lib\common\plugin\FileReader.js
+define("cordova/plugin/FileReader", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError'),
+    ProgressEvent = require('cordova/plugin/ProgressEvent');
+
+/**
+ * This class reads the mobile device file system.
+ *
+ * For Android:
+ *      The root directory is the root of the file system.
+ *      To read from the SD card, the file name is "sdcard/my_file.txt"
+ * @constructor
+ */
+var FileReader = function() {
+    this.fileName = "";
+
+    this.readyState = 0; // FileReader.EMPTY
+
+    // File data
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onloadstart = null;    // When the read starts.
+    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
+    this.onload = null;         // When the read has successfully completed.
+    this.onerror = null;        // When the read has failed (see errors).
+    this.onloadend = null;      // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
+};
+
+// States
+FileReader.EMPTY = 0;
+FileReader.LOADING = 1;
+FileReader.DONE = 2;
+
+/**
+ * Abort reading file.
+ */
+FileReader.prototype.abort = function() {
+    this.result = null;
+
+    if (this.readyState == FileReader.DONE || this.readyState == FileReader.EMPTY) {
+      return;
+    }
+
+    this.readyState = FileReader.DONE;
+
+    // If abort callback
+    if (typeof this.onabort === 'function') {
+        this.onabort(new ProgressEvent('abort', {target:this}));
+    }
+    // If load end callback
+    if (typeof this.onloadend === 'function') {
+        this.onloadend(new ProgressEvent('loadend', {target:this}));
+    }
+};
+
+/**
+ * Read text file.
+ *
+ * @param file          {File} File object containing file properties
+ * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
+ */
+FileReader.prototype.readAsText = function(file, encoding) {
+    // Figure out pathing
+    this.fileName = '';
+    if (typeof file.fullPath === 'undefined') {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // Already loading something
+    if (this.readyState == FileReader.LOADING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        this.onloadstart(new ProgressEvent("loadstart", {target:this}));
+    }
+
+    // Default encoding is UTF-8
+    var enc = encoding ? encoding : "UTF-8";
+
+    var me = this;
+
+    // Read file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                me.onload(new ProgressEvent("load", {target:me}));
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // null result
+            me.result = null;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {target:me}));
+            }
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        }, "File", "readAsText", [this.fileName, enc]);
+};
+
+
+/**
+ * Read file and return data as a base64 encoded data url.
+ * A data url is of the form:
+ *      data:[<mediatype>][;base64],<data>
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsDataURL = function(file) {
+    this.fileName = "";
+    if (typeof file.fullPath === "undefined") {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // Already loading something
+    if (this.readyState == FileReader.LOADING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        this.onloadstart(new ProgressEvent("loadstart", {target:this}));
+    }
+
+    var me = this;
+
+    // Read file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                me.onload(new ProgressEvent("load", {target:me}));
+            }
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            me.result = null;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {target:me}));
+            }
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        }, "File", "readAsDataURL", [this.fileName]);
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsBinaryString = function(file) {
+    // TODO - Can't return binary data to browser.
+    console.log('method "readAsBinaryString" is not supported at this time.');
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsArrayBuffer = function(file) {
+    // TODO - Can't return binary data to browser.
+    console.log('This method is not supported at this time.');
+};
+
+module.exports = FileReader;
+});
+
+// file: lib\common\plugin\FileSystem.js
+define("cordova/plugin/FileSystem", function(require, exports, module) {
+var DirectoryEntry = require('cordova/plugin/DirectoryEntry');
+
+/**
+ * An interface representing a file system
+ *
+ * @constructor
+ * {DOMString} name the unique name of the file system (readonly)
+ * {DirectoryEntry} root directory of the file system (readonly)
+ */
+var FileSystem = function(name, root) {
+    this.name = name || null;
+    if (root) {
+        this.root = new DirectoryEntry(root.name, root.fullPath);
+    }
+};
+
+module.exports = FileSystem;
+});
+
+// file: lib\common\plugin\FileTransfer.js
+define("cordova/plugin/FileTransfer", function(require, exports, module) {
+var exec = require('cordova/exec');
+
+/**
+ * FileTransfer uploads a file to a remote server.
+ * @constructor
+ */
+var FileTransfer = function() {};
+
+/**
+* Given an absolute file path, uploads a file on the device to a remote server
+* using a multipart HTTP request.
+* @param filePath {String}           Full path of the file on the device
+* @param server {String}             URL of the server to receive the file
+* @param successCallback (Function}  Callback to be invoked when upload has completed
+* @param errorCallback {Function}    Callback to be invoked upon error
+* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
+* @param trustAllHosts {Boolean} Optional trust all hosts (e.g. for self-signed certs), defaults to false
+*/
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) {
+    // check for options
+    var fileKey = null;
+    var fileName = null;
+    var mimeType = null;
+    var params = null;
+    var chunkedMode = true;
+    if (options) {
+        fileKey = options.fileKey;
+        fileName = options.fileName;
+        mimeType = options.mimeType;
+        if (options.chunkedMode !== null || typeof options.chunkedMode !== "undefined") {
+            chunkedMode = options.chunkedMode;
+        }
+        if (options.params) {
+            params = options.params;
+        }
+        else {
+            params = {};
+        }
+    }
+
+    exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode]);
+};
+
+/**
+ * Downloads a file form a given URL and saves it to the specified directory.
+ * @param source {String}          URL of the server to receive the file
+ * @param target {String}         Full path of the file on the device
+ * @param successCallback (Function}  Callback to be invoked when upload has completed
+ * @param errorCallback {Function}    Callback to be invoked upon error
+ */
+FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
+    var win = function(result) {
+        var entry = null;
+        if (result.isDirectory) {
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
+        }
+        else if (result.isFile) {
+            entry = new (require('cordova/plugin/FileEntry'))();
+        }
+        entry.isDirectory = result.isDirectory;
+        entry.isFile = result.isFile;
+        entry.name = result.name;
+        entry.fullPath = result.fullPath;
+        successCallback(entry);
+    };
+    exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
+};
+
+module.exports = FileTransfer;
+
+});
+
+// file: lib\common\plugin\FileTransferError.js
+define("cordova/plugin/FileTransferError", function(require, exports, module) {
+/**
+ * FileTransferError
+ * @constructor
+ */
+var FileTransferError = function(code) {
+    this.code = code || null;
+};
+
+FileTransferError.FILE_NOT_FOUND_ERR = 1;
+FileTransferError.INVALID_URL_ERR = 2;
+FileTransferError.CONNECTION_ERR = 3;
+
+module.exports = FileTransferError;
+});
+
+// file: lib\common\plugin\FileUploadOptions.js
+define("cordova/plugin/FileUploadOptions", function(require, exports, module) {
+/**
+ * Options to customize the HTTP request used to upload files.
+ * @constructor
+ * @param fileKey {String}   Name of file request parameter.
+ * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
+ * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
+ * @param params {Object}    Object with key: value params to send to the server.
+ */
+var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
+    this.fileKey = fileKey || null;
+    this.fileName = fileName || null;
+    this.mimeType = mimeType || null;
+    this.params = params || null;
+};
+
+module.exports = FileUploadOptions;
+});
+
+// file: lib\common\plugin\FileUploadResult.js
+define("cordova/plugin/FileUploadResult", function(require, exports, module) {
+/**
+ * FileUploadResult
+ * @constructor
+ */
+var FileUploadResult = function() {
+    this.bytesSent = 0;
+    this.responseCode = null;
+    this.response = null;
+};
+
+module.exports = FileUploadResult;
+});
+
+// file: lib\common\plugin\FileWriter.js
+define("cordova/plugin/FileWriter", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError'),
+    ProgressEvent = require('cordova/plugin/ProgressEvent');
+
+/**
+ * This class writes to the mobile device file system.
+ *
+ * For Android:
+ *      The root directory is the root of the file system.
+ *      To write to the SD card, the file name is "sdcard/my_file.txt"
+ *
+ * @constructor
+ * @param file {File} File object containing file properties
+ * @param append if true write to the end of the file, otherwise overwrite the file
+ */
+var FileWriter = function(file) {
+    this.fileName = "";
+    this.length = 0;
+    if (file) {
+        this.fileName = file.fullPath || file;
+        this.length = file.size || 0;
+    }
+    // default is to write at the beginning of the file
+    this.position = 0;
+
+    this.readyState = 0; // EMPTY
+
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onwritestart = null;   // When writing starts
+    this.onprogress = null;     // While writing the file, and reporting partial file data
+    this.onwrite = null;        // When the write has successfully completed.
+    this.onwriteend = null;     // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
+    this.onerror = null;        // When the write has failed (see errors).
+};
+
+// States
+FileWriter.INIT = 0;
+FileWriter.WRITING = 1;
+FileWriter.DONE = 2;
+
+/**
+ * Abort writing file.
+ */
+FileWriter.prototype.abort = function() {
+    // check for invalid state
+    if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // set error
+    this.error = new FileError(FileError.ABORT_ERR);
+
+    this.readyState = FileWriter.DONE;
+
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        this.onabort(new ProgressEvent("abort", {"target":this}));
+    }
+
+    // If write end callback
+    if (typeof this.onwriteend === "function") {
+        this.onwriteend(new ProgressEvent("writeend", {"target":this}));
+    }
+};
+
+/**
+ * Writes data to the file
+ *
+ * @param text to be written
+ */
+FileWriter.prototype.write = function(text) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        me.onwritestart(new ProgressEvent("writestart", {"target":me}));
+    }
+
+    // Write file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // position always increases by bytes written because file would be extended
+            me.position += r;
+            // The length of the file is now where we are done writing.
+
+            me.length = me.position;
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                me.onwrite(new ProgressEvent("write", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        }, "File", "write", [this.fileName, text, this.position]);
+};
+
+/**
+ * Moves the file pointer to the location specified.
+ *
+ * If the offset is a negative number the position of the file
+ * pointer is rewound.  If the offset is greater than the file
+ * size the position is set to the end of the file.
+ *
+ * @param offset is the location to move the file pointer to.
+ */
+FileWriter.prototype.seek = function(offset) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    if (!offset && offset !== 0) {
+        return;
+    }
+
+    // See back from end of file.
+    if (offset < 0) {
+        this.position = Math.max(offset + this.length, 0);
+    }
+    // Offset is bigger then file size so set position
+    // to the end of the file.
+    else if (offset > this.length) {
+        this.position = this.length;
+    }
+    // Offset is between 0 and file size so set the position
+    // to start writing.
+    else {
+        this.position = offset;
+    }
+};
+
+/**
+ * Truncates the file to the size specified.
+ *
+ * @param size to chop the file at.
+ */
+FileWriter.prototype.truncate = function(size) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        me.onwritestart(new ProgressEvent("writestart", {"target":this}));
+    }
+
+    // Write file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // Update the length of the file
+            me.length = r;
+            me.position = Math.min(me.position, r);
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                me.onwrite(new ProgressEvent("write", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        }, "File", "truncate", [this.fileName, size]);
+};
+
+module.exports = FileWriter;
+
+});
+
+// file: lib\common\plugin\Flags.js
+define("cordova/plugin/Flags", function(require, exports, module) {
+/**
+ * Supplies arguments to methods that lookup or create files and directories.
+ *
+ * @param create
+ *            {boolean} file or directory if it doesn't exist
+ * @param exclusive
+ *            {boolean} used with create; if true the command will fail if
+ *            target path exists
+ */
+function Flags(create, exclusive) {
+    this.create = create || false;
+    this.exclusive = exclusive || false;
+}
+
+module.exports = Flags;
+});
+
+// file: lib\common\plugin\LocalFileSystem.js
+define("cordova/plugin/LocalFileSystem", function(require, exports, module) {
+var exec = require('cordova/exec');
+
+/**
+ * Represents a local file system.
+ */
+var LocalFileSystem = function() {
+
+};
+
+LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
+LocalFileSystem.PERSISTENT = 1; //persistent
+
+module.exports = LocalFileSystem;
+});
+
+// file: lib\common\plugin\Media.js
+define("cordova/plugin/Media", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec');
+
+var mediaObjects = {};
+
+/**
+ * This class provides access to the device media, interfaces to both sound and video
+ *
+ * @constructor
+ * @param src                   The file name or url to play
+ * @param successCallback       The callback to be called when the file is done playing or recording.
+ *                                  successCallback()
+ * @param errorCallback         The callback to be called if there is an error.
+ *                                  errorCallback(int errorCode) - OPTIONAL
+ * @param statusCallback        The callback to be called when media status has changed.
+ *                                  statusCallback(int statusCode) - OPTIONAL
+ */
+var Media = function(src, successCallback, errorCallback, statusCallback) {
+
+    // successCallback optional
+    if (successCallback && (typeof successCallback !== "function")) {
+        console.log("Media Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Media Error: errorCallback is not a function");
+        return;
+    }
+
+    // statusCallback optional
+    if (statusCallback && (typeof statusCallback !== "function")) {
+        console.log("Media Error: statusCallback is not a function");
+        return;
+    }
+
+    this.id = utils.createUUID();
+    mediaObjects[this.id] = this;
+    this.src = src;
+    this.successCallback = successCallback;
+    this.errorCallback = errorCallback;
+    this.statusCallback = statusCallback;
+    this._duration = -1;
+    this._position = -1;
+    exec(null, this.errorCallback, "Media", "create", [this.id, this.src]);
+};
+
+// Media messages
+Media.MEDIA_STATE = 1;
+Media.MEDIA_DURATION = 2;
+Media.MEDIA_POSITION = 3;
+Media.MEDIA_ERROR = 9;
+
+// Media states
+Media.MEDIA_NONE = 0;
+Media.MEDIA_STARTING = 1;
+Media.MEDIA_RUNNING = 2;
+Media.MEDIA_PAUSED = 3;
+Media.MEDIA_STOPPED = 4;
+Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
+
+// "static" function to return existing objs.
+Media.get = function(id) {
+    return mediaObjects[id];
+};
+
+/**
+ * Start or resume playing audio file.
+ */
+Media.prototype.play = function(options) {
+    exec(null, null, "Media", "startPlayingAudio", [this.id, this.src, options]);
+};
+
+/**
+ * Stop playing audio file.
+ */
+Media.prototype.stop = function() {
+    var me = this;
+    exec(function() {
+        me._position = 0;
+        me.successCallback();
+    }, this.errorCallback, "Media", "stopPlayingAudio", [this.id]);
+};
+
+/**
+ * Seek or jump to a new time in the track..
+ */
+Media.prototype.seekTo = function(milliseconds) {
+    var me = this;
+    exec(function(p) {
+        me._position = p;
+    }, this.errorCallback, "Media", "seekToAudio", [this.id, milliseconds]);
+};
+
+/**
+ * Pause playing audio file.
+ */
+Media.prototype.pause = function() {
+    exec(null, this.errorCallback, "Media", "pausePlayingAudio", [this.id]);
+};
+
+/**
+ * Get duration of an audio file.
+ * The duration is only set for audio that is playing, paused or stopped.
+ *
+ * @return      duration or -1 if not known.
+ */
+Media.prototype.getDuration = function() {
+    return this._duration;
+};
+
+/**
+ * Get position of audio.
+ */
+Media.prototype.getCurrentPosition = function(success, fail) {
+    var me = this;
+    exec(function(p) {
+        me._position = p;
+        success(p);
+    }, fail, "Media", "getCurrentPositionAudio", [this.id]);
+};
+
+/**
+ * Start recording audio file.
+ */
+Media.prototype.startRecord = function() {
+    exec(this.successCallback, this.errorCallback, "Media", "startRecordingAudio", [this.id, this.src]);
+};
+
+/**
+ * Stop recording audio file.
+ */
+Media.prototype.stopRecord = function() {
+    exec(this.successCallback, this.errorCallback, "Media", "stopRecordingAudio", [this.id]);
+};
+
+/**
+ * Release the resources.
+ */
+Media.prototype.release = function() {
+    exec(null, this.errorCallback, "Media", "release", [this.id]);
+};
+
+/**
+ * Adjust the volume.
+ */
+Media.prototype.setVolume = function(volume) {
+    exec(null, null, "Media", "setVolume", [this.id, volume]);
+};
+
+/**
+ * Audio has status update.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ * @param status        The status code (int)
+ * @param msg           The status message (string)
+ */
+Media.onStatus = function(id, msg, value) {
+    var media = mediaObjects[id];
+    // If state update
+    if (msg === Media.MEDIA_STATE) {
+        if (value === Media.MEDIA_STOPPED) {
+            if (media.successCallback) {
+                media.successCallback();
+            }
+        }
+        if (media.statusCallback) {
+            media.statusCallback(value);
+        }
+    }
+    else if (msg === Media.MEDIA_DURATION) {
+        media._duration = value;
+    }
+    else if (msg === Media.MEDIA_ERROR) {
+        if (media.errorCallback) {
+            // value should be a MediaError object when msg == MEDIA_ERROR
+            media.errorCallback(value);
+        }
+    }
+    else if (msg === Media.MEDIA_POSITION) {
+        media._position = value;
+    }
+};
+
+module.exports = Media;
+});
+
+// file: lib\common\plugin\MediaError.js
+define("cordova/plugin/MediaError", function(require, exports, module) {
+/**
+ * This class contains information about any Media errors.
+ * @constructor
+ */
+var MediaError = function(code, msg) {
+    this.code = (code !== undefined ? code : null);
+    this.message = msg || "";
+};
+
+MediaError.MEDIA_ERR_NONE_ACTIVE    = 0;
+MediaError.MEDIA_ERR_ABORTED        = 1;
+MediaError.MEDIA_ERR_NETWORK        = 2;
+MediaError.MEDIA_ERR_DECODE         = 3;
+MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
+
+module.exports = MediaError;
+});
+
+// file: lib\common\plugin\MediaFile.js
+define("cordova/plugin/MediaFile", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    File = require('cordova/plugin/File'),
+    CaptureError = require('cordova/plugin/CaptureError');
+/**
+ * Represents a single file.
+ *
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+var MediaFile = function(name, fullPath, type, lastModifiedDate, size){
+  MediaFile.__super__.constructor.apply(this, arguments);
+};
+
+utils.extend(MediaFile, File);
+
+/**
+ * Request capture format data for a specific file and type
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ */
+MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
+    exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
+    }
+};
+
+/**
+ * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
+ * (used in Objective-C and Android)
+ *
+ * @param {PluginResult} pluginResult
+ */
+MediaFile.cast = function(pluginResult) {
+  var mediaFiles = [];
+  var i;
+  for (i=0; i<pluginResult.message.length; i++) {
+    var mediaFile = new MediaFile();
+    mediaFile.name = pluginResult.message[i].name;
+    mediaFile.fullPath = pluginResult.message[i].fullPath;
+    mediaFile.type = pluginResult.message[i].type;
+    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
+    mediaFile.size = pluginResult.message[i].size;
+    mediaFiles.push(mediaFile);
+  }
+  pluginResult.message = mediaFiles;
+  return pluginResult;
+};
+
+module.exports = MediaFile;
+});
+
+// file: lib\common\plugin\MediaFileData.js
+define("cordova/plugin/MediaFileData", function(require, exports, module) {
+/**
+ * MediaFileData encapsulates format information of a media file.
+ *
+ * @param {DOMString} codecs
+ * @param {long} bitrate
+ * @param {long} height
+ * @param {long} width
+ * @param {float} duration
+ */
+var MediaFileData = function(codecs, bitrate, height, width, duration){
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
+};
+
+module.exports = MediaFileData;
+});
+
+// file: lib\common\plugin\Metadata.js
+define("cordova/plugin/Metadata", function(require, exports, module) {
+/**
+ * Information about the state of the file or directory
+ *
+ * {Date} modificationTime (readonly)
+ */
+var Metadata = function(time) {
+    this.modificationTime = (typeof time != 'undefined'?new Date(time):null);
+};
+
+module.exports = Metadata;
+});
+
+// file: lib\common\plugin\Position.js
+define("cordova/plugin/Position", function(require, exports, module) {
+var Coordinates = require('cordova/plugin/Coordinates');
+
+var Position = function(coords, timestamp) {
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+};
+
+module.exports = Position;
+});
+
+// file: lib\common\plugin\PositionError.js
+define("cordova/plugin/PositionError", function(require, exports, module) {
+/**
+ * Position error object
+ *
+ * @constructor
+ * @param code
+ * @param message
+ */
+var PositionError = function(code, message) {
+    this.code = code || null;
+    this.message = message || '';
+};
+
+PositionError.PERMISSION_DENIED = 1;
+PositionError.POSITION_UNAVAILABLE = 2;
+PositionError.TIMEOUT = 3;
+
+module.exports = PositionError;
+});
+
+// file: lib\common\plugin\ProgressEvent.js
+define("cordova/plugin/ProgressEvent", function(require, exports, module) {
+// If ProgressEvent exists in global context, use it already, otherwise use our own polyfill
+// Feature test: See if we can instantiate a native ProgressEvent;
+// if so, use that approach,
+// otherwise fill-in with our own implementation.
+//
+// NOTE: right now we always fill in with our own. Down the road would be nice if we can use whatever is native in the webview.
+var ProgressEvent = (function() {
+    /*
+    var createEvent = function(data) {
+        var event = document.createEvent('Events');
+        event.initEvent('ProgressEvent', false, false);
+        if (data) {
+            for (var i in data) {
+                if (data.hasOwnProperty(i)) {
+                    event[i] = data[i];
+                }
+            }
+            if (data.target) {
+                // TODO: cannot call <some_custom_object>.dispatchEvent
+                // need to first figure out how to implement EventTarget
+            }
+        }
+        return event;
+    };
+    try {
+        var ev = createEvent({type:"abort",target:document});
+        return function ProgressEvent(type, data) {
+            data.type = type;
+            return createEvent(data);
+        };
+    } catch(e){
+    */
+        return function ProgressEvent(type, dict) {
+            this.type = type;
+            this.bubbles = false;
+            this.cancelBubble = false;
+            this.cancelable = false;
+            this.lengthComputable = false;
+            this.loaded = dict && dict.loaded ? dict.loaded : 0;
+            this.total = dict && dict.total ? dict.total : 0;
+            this.target = dict && dict.target ? dict.target : null;
+        };
+    //}
+})();
+
+module.exports = ProgressEvent;
+});
+
+// file: lib\common\plugin\accelerometer.js
+define("cordova/plugin/accelerometer", function(require, exports, module) {
+/**
+ * This class provides access to device accelerometer data.
+ * @constructor
+ */
+var utils = require("cordova/utils"),
+    exec = require("cordova/exec");
+
+// Local singleton variables.
+var timers = {};
+
+var accelerometer = {
+    /**
+     * Asynchronously aquires the current acceleration.
+     *
+     * @param {Function} successCallback    The function to call when the acceleration data is available
+     * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
+     * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
+     */
+    getCurrentAcceleration: function(successCallback, errorCallback, options) {
+
+        // successCallback required
+        if (typeof successCallback !== "function") {
+            console.log("Accelerometer Error: successCallback is not a function");
+            return;
+        }
+
+        // errorCallback optional
+        if (errorCallback && (typeof errorCallback !== "function")) {
+            console.log("Accelerometer Error: errorCallback is not a function");
+            return;
+        }
+
+        // Get acceleration
+        exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
+    },
+
+    /**
+     * Asynchronously aquires the acceleration repeatedly at a given interval.
+     *
+     * @param {Function} successCallback    The function to call each time the acceleration data is available
+     * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
+     * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
+     * @return String                       The watch id that must be passed to #clearWatch to stop watching.
+     */
+    watchAcceleration: function(successCallback, errorCallback, options) {
+
+        // Default interval (10 sec)
+        var frequency = (options !== undefined && options.frequency !== undefined)? options.frequency : 10000;
+
+        // successCallback required
+        if (typeof successCallback !== "function") {
+            console.log("Accelerometer Error: successCallback is not a function");
+            return;
+        }
+
+        // errorCallback optional
+        if (errorCallback && (typeof errorCallback !== "function")) {
+            console.log("Accelerometer Error: errorCallback is not a function");
+            return;
+        }
+
+        // Make sure accelerometer timeout > frequency + 10 sec
+        exec(
+            function(timeout) {
+                if (timeout < (frequency + 10000)) {
+                    exec(null, null, "Accelerometer", "setTimeout", [frequency + 10000]);
+                }
+            },
+            function(e) { }, "Accelerometer", "getTimeout", []);
+
+        // Start watch timer
+        var id = utils.createUUID();
+        timers[id] = window.setInterval(function() {
+            exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
+        }, (frequency ? frequency : 1));
+
+        return id;
+    },
+
+    /**
+     * Clears the specified accelerometer watch.
+     *
+     * @param {String} id       The id of the watch returned from #watchAcceleration.
+     */
+    clearWatch: function(id) {
+
+        // Stop javascript timer & remove from timer list
+        if (id && timers[id] !== undefined) {
+            window.clearInterval(timers[id]);
+            delete timers[id];
+        }
+    }
+};
+
+module.exports = accelerometer;
+});
+
+// file: lib\common\plugin\battery.js
+define("cordova/plugin/battery", function(require, exports, module) {
+/**
+ * This class contains information about the current battery status.
+ * @constructor
+ */
+var cordova = require('cordova'),
+    exec = require('cordova/exec');
+
+function handlers() {
+  return battery.channels.batterystatus.numHandlers +
+         battery.channels.batterylow.numHandlers +
+         battery.channels.batterycritical.numHandlers;
+}
+
+var Battery = function() {
+    this._level = null;
+    this._isPlugged = null;
+    // Create new event handlers on the window (returns a channel instance)
+    var subscriptionEvents = {
+      onSubscribe:this.onSubscribe,
+      onUnsubscribe:this.onUnsubscribe
+    };
+    this.channels = {
+      batterystatus:cordova.addWindowEventHandler("batterystatus", subscriptionEvents),
+      batterylow:cordova.addWindowEventHandler("batterylow", subscriptionEvents),
+      batterycritical:cordova.addWindowEventHandler("batterycritical", subscriptionEvents)
+    };
+};
+/**
+ * Event handlers for when callbacks get registered for the battery.
+ * Keep track of how many handlers we have so we can start and stop the native battery listener
+ * appropriately (and hopefully save on battery life!).
+ */
+Battery.prototype.onSubscribe = function() {
+  var me = battery;
+  // If we just registered the first handler, make sure native listener is started.
+  if (handlers() === 1) {
+    exec(me._status, me._error, "Battery", "start", []);
+  }
+};
+
+Battery.prototype.onUnsubscribe = function() {
+  var me = battery;
+
+  // If we just unregistered the last handler, make sure native listener is stopped.
+  if (handlers() === 0) {
+      exec(null, null, "Battery", "stop", []);
+  }
+};
+
+/**
+ * Callback for battery status
+ *
+ * @param {Object} info            keys: level, isPlugged
+ */
+Battery.prototype._status = function(info) {
+    if (info) {
+        var me = battery;
+    var level = info.level;
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
+};
+
+/**
+ * Error callback for battery start
+ */
+Battery.prototype._error = function(e) {
+    console.log("Error initializing Battery: " + e);
+};
+
+var battery = new Battery();
+
+module.exports = battery;
+});
+
+// file: lib\common\plugin\capture.js
+define("cordova/plugin/capture", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    MediaFile = require('cordova/plugin/MediaFile');
+
+/**
+ * Launches a capture of different types.
+ *
+ * @param (DOMString} type
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+function _capture(type, successCallback, errorCallback, options) {
+    var win = function(pluginResult) {
+        var mediaFiles = [];
+        var i;
+        for (i = 0; i < pluginResult.length; i++) {
+            var mediaFile = new MediaFile();
+            mediaFile.name = pluginResult[i].name;
+            mediaFile.fullPath = pluginResult[i].fullPath;
+            mediaFile.type = pluginResult[i].type;
+            mediaFile.lastModifiedDate = pluginResult[i].lastModifiedDate;
+            mediaFile.size = pluginResult[i].size;
+            mediaFiles.push(mediaFile);
+        }
+        successCallback(mediaFiles);
+    };
+    exec(win, errorCallback, "Capture", type, [options]);
+}
+/**
+ * The Capture interface exposes an interface to the camera and microphone of the hosting device.
+ */
+function Capture() {
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
+}
+
+/**
+ * Launch audio recorder application for recording audio clip(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureAudioOptions} options
+ */
+Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
+    _capture("captureAudio", successCallback, errorCallback, options);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype.captureImage = function(successCallback, errorCallback, options){
+    _capture("captureImage", successCallback, errorCallback, options);
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
+    _capture("captureVideo", successCallback, errorCallback, options);
+};
+
+
+module.exports = new Capture();
+
+});
+
+// file: lib\common\plugin\compass.js
+define("cordova/plugin/compass", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    utils = require('cordova/utils'),
+    CompassHeading = require('cordova/plugin/CompassHeading'),
+    CompassError = require('cordova/plugin/CompassError'),
+    timers = {},
+    compass = {
+        /**
+         * Asynchronously acquires the current heading.
+         * @param {Function} successCallback The function to call when the heading
+         * data is available
+         * @param {Function} errorCallback The function to call when there is an error
+         * getting the heading data.
+         * @param {CompassOptions} options The options for getting the heading data (not used).
+         */
+        getCurrentHeading:function(successCallback, errorCallback, options) {
+            // successCallback required
+            if (typeof successCallback !== "function") {
+              console.log("Compass Error: successCallback is not a function");
+              return;
+            }
+
+            // errorCallback optional
+            if (errorCallback && (typeof errorCallback !== "function")) {
+              console.log("Compass Error: errorCallback is not a function");
+              return;
+            }
+
+            var win = function(result) {
+                var ch = new CompassHeading(result.magneticHeading, result.trueHeading, result.headingAccuracy, result.timestamp);
+                successCallback(ch);
+            };
+            var fail = function(code) {
+                var ce = new CompassError(code);
+                errorCallback(ce);
+            };
+
+            // Get heading
+            exec(win, fail, "Compass", "getHeading", [options]);
+        },
+
+        /**
+         * Asynchronously acquires the heading repeatedly at a given interval.
+         * @param {Function} successCallback The function to call each time the heading
+         * data is available
+         * @param {Function} errorCallback The function to call when there is an error
+         * getting the heading data.
+         * @param {HeadingOptions} options The options for getting the heading data
+         * such as timeout and the frequency of the watch. For iOS, filter parameter
+         * specifies to watch via a distance filter rather than time.
+         */
+        watchHeading:function(successCallback, errorCallback, options) {
+            // Default interval (100 msec)
+            var frequency = (options !== undefined && options.frequency !== undefined) ? options.frequency : 100;
+            var filter = (options !== undefined && options.filter !== undefined) ? options.filter : 0;
+
+            // successCallback required
+            if (typeof successCallback !== "function") {
+              console.log("Compass Error: successCallback is not a function");
+              return;
+            }
+
+            // errorCallback optional
+            if (errorCallback && (typeof errorCallback !== "function")) {
+              console.log("Compass Error: errorCallback is not a function");
+              return;
+            }
+
+            var id = utils.createUUID();
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
+            return id;
+        },
+
+        /**
+         * Clears the specified heading watch.
+         * @param {String} watchId The ID of the watch returned from #watchHeading.
+         */
+        clearWatch:function(id) {
+            // Stop javascript timer & remove from timer list
+            if (id && timers[id]) {
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
+            }
+        }
+    };
+
+module.exports = compass;
+});
+
+// file: lib\common\plugin\contacts.js
+define("cordova/plugin/contacts", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    ContactError = require('cordova/plugin/ContactError'),
+    Contact = require('cordova/plugin/Contact');
+
+/**
+* Represents a group of Contacts.
+* @constructor
+*/
+var contacts = {
+    /**
+     * Returns an array of Contacts matching the search criteria.
+     * @param fields that should be searched
+     * @param successCB success callback
+     * @param errorCB error callback
+     * @param {ContactFindOptions} options that can be applied to contact searching
+     * @return array of Contacts matching search criteria
+     */
+    find:function(fields, successCB, errorCB, options) {
+        if (!successCB) {
+            throw new TypeError("You must specify a success callback for the find command.");
+        }
+        if (!fields || (fields instanceof Array && fields.length === 0)) {
+            if (typeof errorCB === "function") {
+                errorCB(new ContactError(ContactError.INVALID_ARGUMENT_ERROR));
+            }
+        } else {
+            var win = function(result) {
+                var cs = [];
+                for (var i = 0, l = result.length; i < l; i++) {
+                    cs.push(contacts.create(result[i]));
+                }
+                successCB(cs);
+            };
+            exec(win, errorCB, "Contacts", "search", [fields, options]);
+        }
+    },
+
+    /**
+     * This function creates a new contact, but it does not persist the contact
+     * to device storage. To persist the contact to device storage, invoke
+     * contact.save().
+     * @param properties an object who's properties will be examined to create a new Contact
+     * @returns new Contact object
+     */
+    create:function(properties) {
+        var i;
+        var contact = new Contact();
+        for (i in properties) {
+            if (typeof contact[i] !== 'undefined' && properties.hasOwnProperty(i)) {
+                contact[i] = properties[i];
+            }
+        }
+        return contact;
+    }
+};
+
+module.exports = contacts;
+});
+
+// file: lib\common\plugin\geolocation.js
+define("cordova/plugin/geolocation", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    PositionError = require('cordova/plugin/PositionError'),
+    Position = require('cordova/plugin/Position');
+
+var timers = {};   // list of timers in use
+
+// Returns default params, overrides if provided with values
+function parseParameters(options) {
+    var opt = {
+        maximumAge: 10000,
+        enableHighAccuracy: false,
+        timeout: 10000
+    };
+
+    if (options) {
+        if (options.maximumAge !== undefined) {
+            opt.maximumAge = options.maximumAge;
+        }
+        if (options.enableHighAccuracy !== undefined) {
+            opt.enableHighAccuracy = options.enableHighAccuracy;
+        }
+        if (options.timeout !== undefined) {
+            opt.timeout = options.timeout;
+        }
+    }
+
+    return opt;
+}
+
+var geolocation = {
+    /**
+   * Asynchronously aquires the current position.
+   *
+   * @param {Function} successCallback    The function to call when the position data is available
+   * @param {Function} errorCallback      The function to call when there is an error getting the heading position. (OPTIONAL)
+   * @param {PositionOptions} options     The options for getting the position data. (OPTIONAL)
+   */
+    getCurrentPosition:function(successCallback, errorCallback, options) {
+        options = parseParameters(options);
+
+        var win = function(p) {
+            successCallback(new Position(
+                {
+                    latitude:p.latitude,
+                    longitude:p.longitude,
+                    altitude:p.altitude,
+                    accuracy:p.accuracy,
+                    heading:p.heading,
+                    velocity:p.velocity,
+                    altitudeAccuracy:p.altitudeAccuracy
+                },
+                p.timestamp || new Date()
+            ));
+        };
+        var fail = function(e) {
+            errorCallback(new PositionError(e.code, e.message));
+        };
+
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
+    },
+    /**
+     * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
+     * the successCallback is called with the new location.
+     *
+     * @param {Function} successCallback    The function to call each time the location data is available
+     * @param {Function} errorCallback      The function to call when there is an error getting the location data. (OPTIONAL)
+     * @param {PositionOptions} options     The options for getting the location data such as frequency. (OPTIONAL)
+     * @return String                       The watch id that must be passed to #clearWatch to stop watching.
+     */
+    watchPosition:function(successCallback, errorCallback, options) {
+        options = parseParameters(options);
+
+        var id = utils.createUUID();
+        timers[id] = window.setInterval(function() {
+            geolocation.getCurrentPosition(successCallback, errorCallback, options);
+        }, options.timeout);
+
+        return id;
+    },
+    /**
+     * Clears the specified heading watch.
+     *
+     * @param {String} id       The ID of the watch returned from #watchPosition
+     */
+    clearWatch:function(id) {
+        if (id && timers[id] !== undefined) {
+            window.clearInterval(timers[id]);
+            delete timers[id];
+        }
+    }
+};
+
+module.exports = geolocation;
+});
+
+// file: lib\common\plugin\network.js
+define("cordova/plugin/network", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    cordova = require('cordova'),
+    channel = require('cordova/channel');
+
+var NetworkConnection = function () {
+    this.type = null;
+    this._firstRun = true;
+    this._timer = null;
+    this.timeout = 500;
+
+    var me = this;
+
+    channel.onCordovaReady.subscribeOnce(function() {
+        me.getInfo(function (info) {
+            me.type = info;
+            if (info === "none") {
+                // set a timer if still offline at the end of timer send the offline event
+                me._timer = setTimeout(function(){
+                    cordova.fireDocumentEvent("offline");
+                    me._timer = null;
+                    }, me.timeout);
+            } else {
+                // If there is a current offline event pending clear it
+                if (me._timer !== null) {
+                    clearTimeout(me._timer);
+                    me._timer = null;
+                }
+                cordova.fireDocumentEvent("online");
+            }
+
+            // should only fire this once
+            if (me._firstRun) {
+                me._firstRun = false;
+                channel.onCordovaConnectionReady.fire();
+            }
+        },
+        function (e) {
+            // If we can't get the network info we should still tell Cordova
+            // to fire the deviceready event.
+            if (me._firstRun) {
+                me._firstRun = false;
+                channel.onCordovaConnectionReady.fire();
+            }
+            console.log("Error initializing Network Connection: " + e);
+        });
+    });
+};
+
+/**
+ * Get connection info
+ *
+ * @param {Function} successCallback The function to call when the Connection data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
+ */
+NetworkConnection.prototype.getInfo = function (successCallback, errorCallback) {
+    // Get info
+    exec(successCallback, errorCallback, "NetworkStatus", "getConnectionInfo", []);
+};
+
+module.exports = new NetworkConnection();
+});
+
+// file: lib\common\plugin\notification.js
+define("cordova/plugin/notification", function(require, exports, module) {
+var exec = require('cordova/exec');
+
+/**
+ * Provides access to notifications on the device.
+ */
+
+module.exports = {
+
+    /**
+     * Open a native alert dialog, with a customizable title and button text.
+     *
+     * @param {String} message              Message to print in the body of the alert
+     * @param {Function} completeCallback   The callback that is called when user clicks on a button.
+     * @param {String} title                Title of the alert dialog (default: Alert)
+     * @param {String} buttonLabel          Label of the close button (default: OK)
+     */
+    alert: function(message, completeCallback, title, buttonLabel) {
+        var _title = (title || "Alert");
+        var _buttonLabel = (buttonLabel || "OK");
+        exec(completeCallback, null, "Notification", "alert", [message, _title, _buttonLabel]);
+    },
+
+    /**
+     * Open a native confirm dialog, with a customizable title and button text.
+     * The result that the user selects is returned to the result callback.
+     *
+     * @param {String} message              Message to print in the body of the alert
+     * @param {Function} resultCallback     The callback that is called when user clicks on a button.
+     * @param {String} title                Title of the alert dialog (default: Confirm)
+     * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
+     */
+    confirm: function(message, resultCallback, title, buttonLabels) {
+        var _title = (title || "Confirm");
+        var _buttonLabels = (buttonLabels || "OK,Cancel");
+        exec(resultCallback, null, "Notification", "confirm", [message, _title, _buttonLabels]);
+    },
+
+    /**
+     * Causes the device to vibrate.
+     *
+     * @param {Integer} mills       The number of milliseconds to vibrate for.
+     */
+    vibrate: function(mills) {
+        exec(null, null, "Notification", "vibrate", [mills]);
+    },
+
+    /**
+     * Causes the device to beep.
+     * On Android, the default notification ringtone is played "count" times.
+     *
+     * @param {Integer} count       The number of beeps.
+     */
+    beep: function(count) {
+        exec(null, null, "Notification", "beep", [count]);
+    }
+};
+});
+
+// file: lib\common\plugin\requestFileSystem.js
+define("cordova/plugin/requestFileSystem", function(require, exports, module) {
+var FileError = require('cordova/plugin/FileError'),
+    FileSystem = require('cordova/plugin/FileSystem'),
+    exec = require('cordova/exec');
+
+/**
+ * Request a file system in which to store application data.
+ * @param type  local file system type
+ * @param size  indicates how much storage space, in bytes, the application expects to need
+ * @param successCallback  invoked with a FileSystem object
+ * @param errorCallback  invoked if error occurs retrieving file system
+ */
+var requestFileSystem = function(type, size, successCallback, errorCallback) {
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+
+    if (type < 0 || type > 3) {
+        fail(FileError.SYNTAX_ERR);
+    } else {
+        // if successful, return a FileSystem object
+        var success = function(file_system) {
+            if (file_system) {
+                if (typeof successCallback === 'function') {
+                    // grab the name and root from the file system object
+                    var result = new FileSystem(file_system.name, file_system.root);
+                    successCallback(result);
+                }
+            }
+            else {
+                // no FileSystem object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+        exec(success, fail, "File", "requestFileSystem", [type, size]);
+    }
+};
+
+module.exports = requestFileSystem;
+});
+
+// file: lib\common\plugin\resolveLocalFileSystemURI.js
+define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
+var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
+    FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
+    exec = require('cordova/exec');
+
+/**
+ * Look up file system Entry referred to by local URI.
+ * @param {DOMString} uri  URI referring to a local file or directory
+ * @param successCallback  invoked with Entry object corresponding to URI
+ * @param errorCallback    invoked if error occurs retrieving file system entry
+ */
+module.exports = function(uri, successCallback, errorCallback) {
+    // error callback
+    var fail = function(error) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(error));
+        }
+    };
+    // if successful, return either a file or directory entry
+    var success = function(entry) {
+        var result;
+
+        if (entry) {
+            if (typeof successCallback === 'function') {
+                // create appropriate Entry object
+                result = (entry.isDirectory) ? new DirectoryEntry(entry.name, entry.fullPath) : new FileEntry(entry.name, entry.fullPath);
+                try {
+                    successCallback(result);
+                }
+                catch (e) {
+                    console.log('Error invoking callback: ' + e);
+                }
+            }
+        }
+        else {
+            // no Entry object returned
+            fail(FileError.NOT_FOUND_ERR);
+        }
+    };
+
+    exec(success, fail, "File", "resolveLocalFileSystemURI", [uri]);
+};
+
+});
+
+// file: lib\wp7\plugin\wp7\CordovaCommandResult.js
+define("cordova/plugin/wp7/CordovaCommandResult", function(require, exports, module) {
+
+var cordova = require('cordova');
+var channel = require('cordova/channel');
+
+// singular WP7 callback function attached to window, status is used to determin if it is a success or error
+module.exports = function(status,callbackId,args,cast) {
+
+    if(status === "backbutton") {
+        cordova.fireDocumentEvent("backbutton");
+        return "true";
+    }
+    else if(status === "resume") {
+        channel.onResume.fire();
+        return "true";
+    }
+    else if(status === "pause") {
+        channel.onPause.fire();
+        return "true";
+    }
+
+    var parsedArgs;
+    try
+    {
+        parsedArgs = JSON.parse(args);
+
+    }
+    catch(ex)
+    {
+        console.log("Parse error in CordovaCommandResult :: " + ex);
+        return;
+    }
+
+    try
+    {
+        // For some commands, the message is a JSON encoded string
+        // and other times, it is just a string, the try/catch handles the
+        // case where message was indeed, just a string.
+        parsedArgs.message = JSON.parse(parsedArgs.message);
+    }
+    catch(ex)
+    {
+
+    }
+    var safeStatus = parseInt(status, 10);
+    if(safeStatus === cordova.callbackStatus.NO_RESULT ||
+       safeStatus === cordova.callbackStatus.OK) {
+        cordova.callbackSuccess(callbackId,parsedArgs,cast);
+    }
+    else {
+        cordova.callbackError(callbackId,parsedArgs,cast);
+    }
+};
+});
+
+// file: lib\wp7\plugin\wp7\CordovaMediaonStatus.js
+define("cordova/plugin/wp7/CordovaMediaonStatus", function(require, exports, module) {
+
+var cordova = require('cordova');
+
+module.exports = function(args) {
+
+    console.log("media on status :: " + args);
+    //var res = JSON.parse(args);
+    //require("cordova/media").onStatus(res.id, res.msg, res.value);
+};
+});
+
+// file: lib\wp7\plugin\wp7\DOMStorage.js
+define("cordova/plugin/wp7/DOMStorage", function(require, exports, module) {
+(function() {
+
+    var DOMStorage = function(type) {
+        // default type is local
+        if(type == "sessionStorage") {
+            this._type = type;
+        }
+        Object.defineProperty( this, "length", {
+            configurable: true,
+            get: function(){ return this.getLength(); }
+        });
+    };
+
+    DOMStorage.prototype = {
+        _type:"localStorage",
+        _result:null,
+        keys:null,
+
+        onResult:function(key,valueStr) {
+            if(!this.keys) {
+                this.keys = [];
+            }
+            this._result = valueStr;
+        },
+
+        onKeysChanged:function(jsonKeys) {
+            this.keys = JSON.parse(jsonKeys);
+
+            var key;
+            for(var n = 0,len = this.keys.length; n < len; n++) {
+                key = this.keys[n];
+                if(!this.hasOwnProperty(key)) {
+                    Object.defineProperty( this, key, {
+                        configurable: true,
+                        get: function(){ return this.getItem(key); },
+                        set: function(val){ return this.setItem(key,val); }
+                    });
+                }
+            }
+
+        },
+
+        initialize:function() {
+            window.external.Notify("DOMStorage/" + this._type + "/load/keys");
+        },
+
+    /*
+        The length attribute must return the number of key/value pairs currently present in the list associated with the object.
+    */
+        getLength:function() {
+            if(!this.keys) {
+                this.initialize();
+            }
+            return this.keys.length;
+        },
+
+    /*
+        The key(n) method must return the name of the nth key in the list.
+        The order of keys is user-agent defined, but must be consistent within an object so long as the number of keys doesn't change.
+        (Thus, adding or removing a key may change the order of the keys, but merely changing the value of an existing key must not.)
+        If n is greater than or equal to the number of key/value pairs in the object, then this method must return null.
+    */
+        key:function(n) {
+            if(!this.keys) {
+                this.initialize();
+            }
+
+            if(n >= this.keys.length) {
+                return null;
+            } else {
+                return this.keys[n];
+            }
+        },
+
+    /*
+        The getItem(key) method must return the current value associated with the given key.
+        If the given key does not exist in the list associated with the object then this method must return null.
+    */
+        getItem:function(key) {
+            if(!this.keys) {
+                this.initialize();
+            }
+
+            var retVal = null;
+            if(this.keys.indexOf(key) > -1) {
+                window.external.Notify("DOMStorage/" + this._type + "/get/" + key);
+                retVal = this._result;
+                this._result = null;
+            }
+            return retVal;
+        },
+    /*
+        The setItem(key, value) method must first check if a key/value pair with the given key already exists
+        in the list associated with the object.
+        If it does not, then a new key/value pair must be added to the list, with the given key and with its value set to value.
+        If the given key does exist in the list, then it must have its value updated to value.
+        If it couldn't set the new value, the method must raise an QUOTA_EXCEEDED_ERR exception.
+        (Setting could fail if, e.g., the user has disabled storage for the site, or if the quota has been exceeded.)
+    */
+        setItem:function(key,value) {
+            if(!this.keys) {
+                this.initialize();
+            }
+            window.external.Notify("DOMStorage/" + this._type + "/set/" + key + "/" + value);
+        },
+
+    /*
+        The removeItem(key) method must cause the key/value pair with the given key to be removed from the list
+        associated with the object, if it exists.
+        If no item with that key exists, the method must do nothing.
+    */
+        removeItem:function(key) {
+            if(!this.keys) {
+                this.initialize();
+            }
+            var index = this.keys.indexOf(key);
+            if(index > -1) {
+                this.keys.splice(index,1);
+                // TODO: need sanity check for keys ? like 'clear','setItem', ...
+                window.external.Notify("DOMStorage/" + this._type + "/remove/" + key);
+                delete this[key];
+            }
+        },
+
+    /*
+        The clear() method must atomically cause the list associated with the object to be emptied of all
+        key/value pairs, if there are any.
+        If there are none, then the method must do nothing.
+    */
+        clear:function() {
+            if(!this.keys) {
+                this.initialize();
+            }
+
+            for(var n=0,len=this.keys.length; n < len;n++) {
+                // TODO: do we need a sanity check for keys ? like 'clear','setItem', ...
+                delete this[this.keys[n]];
+            }
+            this.keys = [];
+            window.external.Notify("DOMStorage/" + this._type + "/clear/");
+        }
+    };
+
+    // initialize DOMStorage
+
+    Object.defineProperty( window, "localStorage", {
+        writable: false,
+        configurable: false,
+        value:new DOMStorage("localStorage")
+    });
+    window.localStorage.initialize();
+
+    Object.defineProperty( window, "sessionStorage", {
+        writable: false,
+        configurable: false,
+        value:new DOMStorage("sessionStorage")
+    });
+    window.sessionStorage.initialize();
+
+
+})();
+
+module.exports = null;
+});
+
+// file: lib\wp7\plugin\wp7\XHRPatch.js
+define("cordova/plugin/wp7/XHRPatch", function(require, exports, module) {
+// TODO: the build process implicitly will wrap this in a define() call
+// with a closure of its own; do you need this extra closure?
+
+var LocalFileSystem = require('cordova/plugin/LocalFileSystem');
+
+(function (win, doc) {
+
+var docDomain = null;
+try {
+    docDomain = doc.domain;
+} catch (err) {
+    //console.log("caught exception trying to access document.domain");
+}
+
+if (!docDomain || docDomain.length === 0) {
+
+    var aliasXHR = win.XMLHttpRequest;
+
+    win.XMLHttpRequest = function () { };
+    win.XMLHttpRequest.noConflict = aliasXHR;
+    win.XMLHttpRequest.UNSENT = 0;
+    win.XMLHttpRequest.OPENED = 1;
+    win.XMLHttpRequest.HEADERS_RECEIVED = 2;
+    win.XMLHttpRequest.LOADING = 3;
+    win.XMLHttpRequest.DONE = 4;
+
+    win.XMLHttpRequest.prototype = {
+        UNSENT: 0,
+        OPENED: 1,
+        HEADERS_RECEIVED: 2,
+        LOADING: 3,
+        DONE: 4,
+
+        isAsync: false,
+        onreadystatechange: null,
+        readyState: 0,
+        _url: "",
+        timeout: 0,
+        withCredentials: false,
+        _requestHeaders: null,
+        open: function (reqType, uri, isAsync, user, password) {
+
+            if (uri && uri.indexOf("http") === 0) {
+                if (!this.wrappedXHR) {
+                    this.wrappedXHR = new aliasXHR();
+                    var self = this;
+
+                    // timeout
+                    if (this.timeout > 0) {
+                        this.wrappedXHR.timeout = this.timeout;
+                    }
+                    Object.defineProperty(this, "timeout", {
+                        set: function (val) {
+                            this.wrappedXHR.timeout = val;
+                        },
+                        get: function () {
+                            return this.wrappedXHR.timeout;
+                        }
+                    });
+
+
+
+                    if (this.withCredentials) {
+                        this.wrappedXHR.withCredentials = this.withCredentials;
+                    }
+                    Object.defineProperty(this, "withCredentials", {
+                        set: function (val) {
+                            this.wrappedXHR.withCredentials = val;
+                        },
+                        get: function () {
+                            return this.wrappedXHR.withCredentials;
+                        }
+                    });
+
+
+                    Object.defineProperty(this, "status", { get: function () {
+                        return this.wrappedXHR.status;
+                    }
+                    });
+                    Object.defineProperty(this, "responseText", { get: function () {
+                        return this.wrappedXHR.responseText;
+                    }
+                    });
+                    Object.defineProperty(this, "statusText", { get: function () {
+                        return this.wrappedXHR.statusText;
+                    }
+                    });
+
+                    Object.defineProperty(this, "responseXML", { get: function () {
+                        return this.wrappedXHR.responseXML;
+                    }
+                    });
+
+                    this.getResponseHeader = function (header) {
+                        return this.wrappedXHR.getResponseHeader(header);
+                    };
+                    this.getAllResponseHeaders = function () {
+                        return this.wrappedXHR.getAllResponseHeaders();
+                    };
+
+                    this.wrappedXHR.onreadystatechange = function () {
+                        self.changeReadyState(self.wrappedXHR.readyState);
+                    };
+                }
+                return this.wrappedXHR.open(reqType, uri, isAsync, user, password);
+            }
+            else {
+                // x-wmapp1://app/www/page2.html
+                // need to work some magic on the actual url/filepath
+                var newUrl = uri;
+                if (newUrl.indexOf(":/") > -1) {
+                    newUrl = newUrl.split(":/")[1];
+                }
+
+                if (newUrl.lastIndexOf("/") === newUrl.length - 1) {
+                    newUrl += "index.html"; // default page is index.html, when call is to a dir/ ( why not ...? )
+                }
+                this._url = newUrl;
+            }
+        },
+        statusText: "",
+        changeReadyState: function (newState) {
+            this.readyState = newState;
+            if (this.onreadystatechange) {
+                this.onreadystatechange();
+            }
+        },
+        setRequestHeader: function (header, value) {
+            if (this.wrappedXHR) {
+                this.wrappedXHR.setRequestHeader(header, value);
+            }
+        },
+        getResponseHeader: function (header) {
+            return this.wrappedXHR ? this.wrappedXHR.getResponseHeader(header) : "";
+        },
+        getAllResponseHeaders: function () {
+            return this.wrappedXHR ? this.wrappedXHR.getAllResponseHeaders() : "";
+        },
+        responseText: "",
+        responseXML: "",
+        onResult: function (res) {
+            this.status = 200;
+            this.responseText = res;
+            this.responseXML = res;
+            this.changeReadyState(this.DONE);
+        },
+        onError: function (err) {
+            this.status = 404;
+            this.changeReadyState(this.DONE);
+        },
+
+        abort: function () {
+            if (this.wrappedXHR) {
+                return this.wrappedXHR.abort();
+            }
+        },
+
+        send: function (data) {
+            if (this.wrappedXHR) {
+                return this.wrappedXHR.send(data);
+            }
+            else {
+                this.changeReadyState(this.OPENED);
+
+                var alias = this;
+
+                var fail = function fail(evt) {
+                    alias.onError(evt.code);
+                };
+
+                var gotFile = function gotFile(file) {
+                    var reader = new FileReader();
+                    reader.onloadend = function (evt) {
+                        alias.onResult.apply(alias,[evt.target.result]);
+                    };
+                    reader.readAsText(file);
+                };
+
+                var gotEntry = function gotEntry(entry) {
+                    entry.file(gotFile, fail);
+                };
+
+                var gotFS = function gotFS(fs) {
+                    fs.root.getFile(alias._url, null, gotEntry, fail);
+                };
+
+                window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, gotFS, fail);
+
+            }
+        },
+        status: 404
+    };
+} // if doc domain
+
+// end closure wrap
+})(window, document);
+
+module.exports = null;
+});
+
+// file: lib\wp7\plugin\wp7\console.js
+define("cordova/plugin/wp7/console", function(require, exports, module) {
+
+var exec = require('cordova/exec'),
+    channel = require('cordova/channel');
+var cordova = require("cordova");
+
+var debugConsole = {
+    log:function(msg){
+        exec(null,null,"DebugConsole","log",msg);
+    },
+    warn:function(msg){
+        exec(null,null,"DebugConsole","warn",msg);
+    },
+    error:function(msg){
+        exec(null,null,"DebugConsole","error",msg);
+    }
+};
+
+module.exports = debugConsole;
+});
+
+// file: lib\wp7\plugin\wp7\device.js
+define("cordova/plugin/wp7/device", function(require, exports, module) {
+var channel = require('cordova/channel'),
+    utils = require('cordova/utils'),
+    exec = require('cordova/exec');
+
+/**
+ * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
+ * phone, etc.
+ * @constructor
+ */
+function Device() {
+    this.available = false;
+    this.platform = null;
+    this.version = null;
+    this.name = null;
+    this.uuid = null;
+    this.cordova = null;
+
+    var me = this;
+
+    channel.onCordovaReady.subscribeOnce(function() {
+        me.getInfo(function(info) {
+            me.available = true;
+            me.platform = info.platform;
+            me.version = info.version;
+            me.name = info.name;
+            me.uuid = info.uuid;
+            me.cordova = info.cordova;
+            channel.onCordovaInfoReady.fire();
+        },function(e) {
+            me.available = false;
+            utils.alert("[ERROR] Error initializing Cordova: " + e);
+        });
+    });
+}
+
+/**
+ * Get device info
+ *
+ * @param {Function} successCallback The function to call when the heading data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
+ */
+Device.prototype.getInfo = function(successCallback, errorCallback) {
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Device Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Device Error: errorCallback is not a function");
+        return;
+    }
+
+    // Get info
+    exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
+};
+
+module.exports = new Device();
+});
+
+// file: lib\wp7\plugin\wp7\requestFileSystem.js
+define("cordova/plugin/wp7/requestFileSystem", function(require, exports, module) {
+
+var FileError = require('cordova/plugin/FileError'),
+    FileSystem = require('cordova/plugin/FileSystem'),
+    exec = require('cordova/exec');
+
+/**
+ * Request a file system in which to store application data.
+ * @param type  local file system type
+ * @param size  indicates how much storage space, in bytes, the application expects to need
+ * @param successCallback  invoked with a FileSystem object
+ * @param errorCallback  invoked if error occurs retrieving file system
+ */
+var requestFileSystem = function(type, size, successCallback, errorCallback) {
+    // wp7 custom imp
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+
+    if (type < 0 || type > 3) {
+        fail(FileError.SYNTAX_ERR);
+    } else {
+        // if successful, return a FileSystem object
+        var success = function(file_system) {
+            if (file_system) {
+                if (typeof successCallback === 'function') {
+                    // grab the name and root from the file system object
+                    var result = new FileSystem(file_system.name, file_system.root);
+                    successCallback(result);
+                }
+            }
+            else {
+                // no FileSystem object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+        exec(success, fail, "File", "requestFileSystem", {type:type,size:size});
+    }
+};
+
+module.exports = requestFileSystem;
+});
+
+// file: lib\wp7\plugin\wp7\resolveLocalFileSystemURI.js
+define("cordova/plugin/wp7/resolveLocalFileSystemURI", function(require, exports, module) {
+
+
+var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
+    FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
+    exec = require('cordova/exec');
+
+module.exports = function(uri, successCallback, errorCallback) {
+    // error callback
+    var fail = function(error) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(error));
+        }
+    };
+    // if successful, return either a file or directory entry
+    var success = function(entry) {
+        var result;
+
+        if (entry) {
+            if (typeof successCallback === 'function') {
+                // create appropriate Entry object
+                result = (entry.isDirectory) ? new DirectoryEntry(entry.name, entry.fullPath) : new FileEntry(entry.name, entry.fullPath);
+                try {
+                    successCallback(result);
+                }
+                catch (e) {
+                    console.log('Error invoking callback: ' + e);
+                }
+            }
+        }
+        else {
+            // no Entry object returned
+            fail(FileError.NOT_FOUND_ERR);
+        }
+    };
+
+    exec(success, fail, "File", "resolveLocalFileSystemURI", {uri:uri});
+};
+
+});
+
+// file: lib\common\utils.js
+define("cordova/utils", function(require, exports, module) {
+function UUIDcreatePart(length) {
+    var uuidpart = "";
+    for (var i=0; i<length; i++) {
+        var uuidchar = parseInt((Math.random() * 256), 10).toString(16);
+        if (uuidchar.length == 1) {
+            uuidchar = "0" + uuidchar;
+        }
+        uuidpart += uuidchar;
+    }
+    return uuidpart;
+}
+
+var _self = {
+    /**
+     * Does a deep clone of the object.
+     */
+    clone: function(obj) {
+        if(!obj) {
+            return obj;
+        }
+
+        var retVal, i;
+
+        if(obj instanceof Array){
+            retVal = [];
+            for(i = 0; i < obj.length; ++i){
+                retVal.push(_self.clone(obj[i]));
+            }
+            return retVal;
+        }
+
+        if (obj instanceof Function) {
+            return obj;
+        }
+
+        if(!(obj instanceof Object)){
+            return obj;
+        }
+
+        if(obj instanceof Date){
+            return obj;
+        }
+
+        retVal = {};
+        for(i in obj){
+            if(!(i in retVal) || retVal[i] != obj[i]) {
+                retVal[i] = _self.clone(obj[i]);
+            }
+        }
+        return retVal;
+    },
+
+    close: function(context, func, params) {
+        if (typeof params === 'undefined') {
+            return function() {
+                return func.apply(context, arguments);
+            };
+        } else {
+            return function() {
+                return func.apply(context, params);
+            };
+        }
+    },
+
+    /**
+     * Create a UUID
+     */
+    createUUID: function() {
+        return UUIDcreatePart(4) + '-' +
+            UUIDcreatePart(2) + '-' +
+            UUIDcreatePart(2) + '-' +
+            UUIDcreatePart(2) + '-' +
+            UUIDcreatePart(6);
+    },
+
+    /**
+     * Extends a child object from a parent object using classical inheritance
+     * pattern.
+     */
+    extend: (function() {
+        // proxy used to establish prototype chain
+        var F = function() {};
+        // extend Child from Parent
+        return function(Child, Parent) {
+            F.prototype = Parent.prototype;
+            Child.prototype = new F();
+            Child.__super__ = Parent.prototype;
+            Child.prototype.constructor = Child;
+        };
+    }()),
+
+    /**
+     * Alerts a message in any available way: alert or console.log.
+     */
+    alert:function(msg) {
+        if (alert) {
+            alert(msg);
+        } else if (console && console.log) {
+            console.log(msg);
+        }
+    }
+};
+
+module.exports = _self;
+});
+
+
+window.cordova = require('cordova');
+
+// file: lib\scripts\bootstrap.js
+(function (context) {
+    var channel = require("cordova/channel"),
+        _self = {
+            boot: function () {
+                /**
+                 * Create all cordova objects once page has fully loaded and native side is ready.
+                 */
+                channel.join(function() {
+                    var builder = require('cordova/builder'),
+                        base = require('cordova/common'),
+                        platform = require('cordova/platform');
+
+                    // Drop the common globals into the window object, but be nice and don't overwrite anything.
+                    builder.build(base.objects).intoButDontClobber(window);
+
+                    // Drop the platform-specific globals into the window object
+                    // and clobber any existing object.
+                    builder.build(platform.objects).intoAndClobber(window);
+
+                    // Merge the platform-specific overrides/enhancements into
+                    // the window object.
+                    if (typeof platform.merges !== 'undefined') {
+                        builder.build(platform.merges).intoAndMerge(window);
+                    }
+
+                    // Call the platform-specific initialization
+                    platform.initialize();
+
+                    // Fire event to notify that all objects are created
+                    channel.onCordovaReady.fire();
+
+                    // Fire onDeviceReady event once all constructors have run and
+                    // cordova info has been received from native side.
+                    channel.join(function() {
+                        channel.onDeviceReady.fire();
+                    }, channel.deviceReadyChannelsArray);
+
+                }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
+            }
+        };
+
+    // boot up once native side is ready
+    channel.onNativeReady.subscribeOnce(_self.boot);
+
+    // _nativeReady is global variable that the native side can set
+    // to signify that the native code is ready. It is a global since
+    // it may be called before any cordova JS is ready.
+    if (window._nativeReady) {
+        channel.onNativeReady.fire();
+    }
+
+}(window));
+
+})();
\ No newline at end of file
diff --git a/lib/windows/framework/Cordova/BrowserMouseHelper.cs b/lib/windows/framework/Cordova/BrowserMouseHelper.cs
new file mode 100644
index 00000000..3e029715
--- /dev/null
+++ b/lib/windows/framework/Cordova/BrowserMouseHelper.cs
@@ -0,0 +1,214 @@
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Phone.Controls;
+using System.Windows.Input;
+using System.Diagnostics;
+using System.Windows.Media;
+using System;
+
+namespace WP7CordovaClassLib
+{
+
+    /// <summary>
+    /// Suppresses pinch zoom and optionally scrolling of the WebBrowser control
+    /// </summary>
+    public class BrowserMouseHelper
+    {
+
+        /**
+         * 
+         * Full Script below, in use it is minified.
+        */
+
+        private static string mouseScript =
+        @"(function(win,doc){
+            Object.defineProperty( MouseEvent.prototype, 'pageX', {
+               configurable: true,
+               get: function(){ return this.clientX }
+            });
+            Object.defineProperty( MouseEvent.prototype, 'pageY', {
+               configurable: true,
+               get: function(){ return this.clientY }
+            });
+
+            win.onNativeMouseEvent = function(type,x,y){
+                try {
+                    var xMod = screen.logicalXDPI / screen.deviceXDPI;
+                    var yMod = screen.logicalYDPI / screen.deviceYDPI;
+                    var evt = doc.createEvent('MouseEvents');
+                    var xPos =  doc.body.scrollLeft + Math.round(xMod * x);
+                    var yPos =  doc.body.scrollTop + Math.round(yMod * y);
+                    var element = doc.elementFromPoint(xPos,yPos);
+                    evt.initMouseEvent(type, true, true, win, 1, xPos, yPos, xPos, yPos, false, false, false, false, 0, element);
+                    var canceled = element ? !element.dispatchEvent(evt) : !doc.dispatchEvent(evt);
+                    return canceled ? 'true' : 'false';
+                }
+                catch(e) { return e;}
+            }
+        })(window,document);";
+
+
+        private static string MinifiedMouseScript = "(function(f,a){Object.defineProperty(MouseEvent.prototype,'pageX',{configurable:!0,get:function(){return this.clientX}});Object.defineProperty(MouseEvent.prototype,'pageY',{configurable:!0,get:function(){return this.clientY}});f.onNativeMouseEvent=function(g,h,i)" 
+        + "{try{var j=screen.logicalXDPI/screen.deviceXDPI,k=screen.logicalYDPI/screen.deviceYDPI,b=a.createEvent('MouseEvents'),c=a.body.scrollLeft+Math.round(j*h),d=a.body.scrollTop+Math.round(k*i),e=a.elementFromPoint(c,d);b.initMouseEvent(g,!0,!0,"
+        + "f,1,c,d,c,d,!1,!1,!1,!1,0,e);return(e?!e.dispatchEvent(b):!a.dispatchEvent(b))?'true':'false'}catch(l){return l}}})(window,document);";
+
+
+        private WebBrowser _browser;
+
+        /// <summary>
+        /// Gets or sets whether to suppress the scrolling of
+        /// the WebBrowser control;
+        /// </summary>
+        public bool ScrollDisabled { get; set; }
+        public bool ZoomDisabled { get; set; }
+        protected Border border;
+
+        public BrowserMouseHelper(WebBrowser browser)
+        {
+            _browser = browser;
+            browser.Loaded += new RoutedEventHandler(browser_Loaded);
+        }
+
+        private void browser_Loaded(object sender, RoutedEventArgs e)
+        {
+            var border0 = VisualTreeHelper.GetChild(_browser, 0);
+            var border1 = VisualTreeHelper.GetChild(border0, 0);
+            var panZoom = VisualTreeHelper.GetChild(border1, 0);
+            var grid = VisualTreeHelper.GetChild(panZoom, 0);
+            border = VisualTreeHelper.GetChild(grid, 0) as Border;
+
+
+            if (border != null)
+            {
+                border.ManipulationStarted += Border_ManipulationStarted;
+                border.ManipulationDelta += Border_ManipulationDelta;
+                border.ManipulationCompleted += Border_ManipulationCompleted;
+                border.DoubleTap += Border_DoubleTap;
+                border.Hold += Border_Hold;
+                border.MouseLeftButtonDown += Border_MouseLeftButtonDown;
+            }
+
+            _browser.LoadCompleted += Browser_LoadCompleted;
+
+        }
+
+        void Browser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs e)
+        {
+            try
+            {
+                _browser.InvokeScript("execScript", MinifiedMouseScript);
+            }
+            catch (Exception)
+            {
+                Debug.WriteLine("BrowserHelper Failed to install mouse script in WebBrowser");
+            }
+
+        }
+
+        bool InvokeSimulatedMouseEvent(string eventName, Point pos)
+        {
+            bool bCancelled = false;
+            try
+            {
+                string strCancelled = _browser.InvokeScript("onNativeMouseEvent", new string[] { eventName, pos.X.ToString(), pos.Y.ToString() }) as string;                
+                if (bool.TryParse(strCancelled, out bCancelled))
+                {
+                    return bCancelled;
+                }
+
+            }
+            catch (Exception)
+            {
+                // script error
+            }
+
+            return bCancelled;
+        }
+
+        void Border_Hold(object sender, GestureEventArgs e)
+        {
+            e.Handled = true;
+        }
+
+        void Border_DoubleTap(object sender, GestureEventArgs e)
+        {
+            e.Handled = true;
+        }
+
+        void Border_ManipulationStarted(object sender, ManipulationStartedEventArgs e)
+        {
+            if (ScrollDisabled)
+            {
+                e.Handled = true;
+                e.Complete();
+            }
+        }
+
+        void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            border.MouseMove += new MouseEventHandler(Border_MouseMove);
+            border.MouseLeftButtonUp += new MouseButtonEventHandler(Border_MouseLeftButtonUp);
+
+            Point pos = e.GetPosition(_browser);
+
+            bool bCancelled = InvokeSimulatedMouseEvent("mousedown", pos);
+            e.Handled = bCancelled;
+            ScrollDisabled = bCancelled;
+        }
+
+        void Border_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            border.MouseMove -= new MouseEventHandler(Border_MouseMove);
+            border.MouseLeftButtonUp -= new MouseButtonEventHandler(Border_MouseLeftButtonUp);
+            Point pos = e.GetPosition(_browser);
+
+            bool bCancelled = InvokeSimulatedMouseEvent("mouseup", pos);
+            e.Handled = bCancelled;
+            ScrollDisabled = false;
+        }
+
+
+        void Border_MouseMove(object sender, MouseEventArgs e)
+        {
+            //Debug.WriteLine("Border_MouseMove");
+            Point pos = e.GetPosition(_browser);
+
+            bool bCancelled = InvokeSimulatedMouseEvent("mousemove", pos);
+            //ScrollDisabled = bCancelled;
+
+        }
+
+        private void Border_ManipulationCompleted(object sender, ManipulationCompletedEventArgs e)
+        {
+            
+            // suppress zoom
+            if (e.FinalVelocities != null)
+            {
+                if (e.FinalVelocities.ExpansionVelocity.X != 0.0 ||
+                   e.FinalVelocities.ExpansionVelocity.Y != 0.0)
+                {
+                    e.Handled = true;
+                }
+            }
+        }
+
+        private void Border_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
+        {
+
+            // optionally suppress zoom
+            if (ZoomDisabled && (e.DeltaManipulation.Scale.X != 0.0 || e.DeltaManipulation.Scale.Y != 0.0) )
+            {
+                e.Handled = true;
+                e.Complete();
+            }
+            // optionally suppress scrolling
+            if (ScrollDisabled && (e.DeltaManipulation.Translation.X != 0.0 || e.DeltaManipulation.Translation.Y != 0.0) )
+            {
+                e.Handled = true;
+                e.Complete();
+            }
+        }
+
+    }
+}
diff --git a/lib/windows/framework/Cordova/Commands/Contacts.cs b/lib/windows/framework/Cordova/Commands/Contacts.cs
index 1d260f21..7f30331b 100644
--- a/lib/windows/framework/Cordova/Commands/Contacts.cs
+++ b/lib/windows/framework/Cordova/Commands/Contacts.cs
@@ -158,9 +158,19 @@ public class JSONContact
         public JSONContactAddress[] addresses { get; set; }
     }
 
+
     public class Contacts : BaseCommand
     {
 
+        public const int UNKNOWN_ERROR = 0;
+        public const int INVALID_ARGUMENT_ERROR = 1;
+        public const int TIMEOUT_ERROR = 2;
+        public const int PENDING_OPERATION_ERROR = 3;
+        public const int IO_ERROR = 4;
+        public const int NOT_SUPPORTED_ERROR = 5;
+        public const int PERMISSION_DENIED_ERROR = 20;
+        public const int SYNTAX_ERR = 8;
+
         public Contacts()
         {
 
@@ -354,7 +364,12 @@ where contact.GetHashCode() == n
         }
 
 
-        // TODO: we need to be able to pass a search param in.
+        
+        public void remove(string id)
+        {
+            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, "{\"code\":" + NOT_SUPPORTED_ERROR + "}"));
+        }
+
         public void search(string searchCriteria)
         {
             ContactSearchParams searchParams = JSON.JsonHelper.Deserialize<ContactSearchParams>(searchCriteria);
@@ -457,7 +472,6 @@ where a.Contains(searchParams.options.filter)
             foreach (Contact contact in distinctContacts)
             {
                 strResult += FormatJSONContact(contact, null) + ",";
-
                 //contactList.Add(FormatJSONContact(contact, null));
                 if (!searchParams.options.multiple)
                 {
@@ -473,9 +487,15 @@ where a.Contains(searchParams.options.filter)
         private string FormatJSONPhoneNumbers(Contact con)
         {
             string retVal = "";
+            string contactFieldFormat = "\"type\":\"{0}\",\"value\":\"{1}\",\"pref\":\"false\"";
             foreach (ContactPhoneNumber number in con.PhoneNumbers)
             {
-                retVal += "\"" +  number.PhoneNumber + "\",";
+
+                string contactField = string.Format(contactFieldFormat,
+                                                    number.Kind.ToString(),
+                                                    number.PhoneNumber);
+
+                retVal += "{" + contactField + "},";
             }
             return retVal.TrimEnd(',');
         }
@@ -483,9 +503,14 @@ private string FormatJSONPhoneNumbers(Contact con)
         private string FormatJSONEmails(Contact con)
         {
             string retVal = "";
+            string contactFieldFormat = "\"type\":\"{0}\",\"value\":\"{1}\",\"pref\":\"false\"";
             foreach (ContactEmailAddress address in con.EmailAddresses)
             {
-                retVal += "\"" + address.EmailAddress + "\",";
+                string contactField = string.Format(contactFieldFormat,
+                                                    address.Kind.ToString(),
+                                                    address.EmailAddress);
+
+                retVal += "{" + contactField + "},";
             }
             return retVal.TrimEnd(',');
         }
@@ -493,19 +518,26 @@ private string FormatJSONEmails(Contact con)
         private string getFormattedJSONAddress(ContactAddress address, bool isPrefered)
         {
 
-            string addressFormatString = "pref:{0}," + // bool
-                          "type:'{1}'," +
-                          "formatted:'{2}'," +
-                          "streetAddress:'{3}'," +
-                          "locality:'{4}'," +
-                          "region:'{5}'," +
-                          "postalCode:'{6}'," +
-                          "country:'{7}'";
+            string addressFormatString = "\"pref\":{0}," + // bool
+                          "\"type\":\"{1}\"," +
+                          "\"formatted\":\"{2}\"," +
+                          "\"streetAddress\":\"{3}\"," +
+                          "\"locality\":\"{4}\"," +
+                          "\"region\":\"{5}\"," +
+                          "\"postalCode\":\"{6}\"," +
+                          "\"country\":\"{7}\"";
+
+            string formattedAddress = address.PhysicalAddress.AddressLine1 + " " 
+                                    + address.PhysicalAddress.AddressLine2 + " " 
+                                    + address.PhysicalAddress.City + " " 
+                                    + address.PhysicalAddress.StateProvince + " " 
+                                    + address.PhysicalAddress.CountryRegion + " " 
+                                    + address.PhysicalAddress.PostalCode;
 
             string jsonAddress = string.Format(addressFormatString,
-                                               isPrefered ? "true" : "false",
+                                               isPrefered ? "\"true\"" : "\"false\"",
                                                address.Kind.ToString(),
-                                               "formattedAddress",
+                                               formattedAddress,
                                                address.PhysicalAddress.AddressLine1 + " " + address.PhysicalAddress.AddressLine2,
                                                address.PhysicalAddress.City,
                                                address.PhysicalAddress.StateProvince,
@@ -513,7 +545,7 @@ private string getFormattedJSONAddress(ContactAddress address, bool isPrefered)
                                                address.PhysicalAddress.CountryRegion);
 
 
-
+            Debug.WriteLine("getFormattedJSONAddress returning :: " + jsonAddress);
 
             return "{" + jsonAddress + "}";
         }
@@ -525,7 +557,9 @@ private string FormatJSONAddresses(Contact con)
             {
                 retVal += this.getFormattedJSONAddress(address, false) + ",";
             }
-            return "[" + retVal.TrimEnd(',') + "]";
+
+            Debug.WriteLine("FormatJSONAddresses returning :: " + retVal);
+            return retVal.TrimEnd(',');
         }
 
         private string FormatJSONWebsites(Contact con)
@@ -538,24 +572,61 @@ private string FormatJSONWebsites(Contact con)
             return retVal.TrimEnd(',');
         }
 
+        /*
+         *  formatted: The complete name of the contact. (DOMString)
+            familyName: The contacts family name. (DOMString)
+            givenName: The contacts given name. (DOMString)
+            middleName: The contacts middle name. (DOMString)
+            honorificPrefix: The contacts prefix (example Mr. or Dr.) (DOMString)
+            honorificSuffix: The contacts suffix (example Esq.). (DOMString)
+         */
+        private string FormatJSONName(Contact con)
+        {
+            string retVal = "";
+            string formatStr = "\"formatted\":\"{0}\"," +
+                                "\"familyName\":\"{1}\"," +
+                                "\"givenName\":\"{2}\"," +
+                                "\"middleName\":\"{3}\"," +
+                                "\"honorificPrefix\":\"{4}\"," +
+                                "\"honorificSuffix\":\"{5}\"";
+
+            retVal = string.Format(formatStr,
+                                   con.CompleteName.FirstName, // TODO:
+                                   con.CompleteName.LastName,
+                                   con.CompleteName.FirstName,
+                                   con.CompleteName.MiddleName,
+                                   con.CompleteName.Title,
+                                   con.CompleteName.Suffix);
+
+            return "{" + retVal + "}";
+
+        }
+
         private string FormatJSONContact(Contact con, string[] fields)
         {
+            
             string contactFormatStr = "\"id\":\"{0}\"," +
                                       "\"displayName\":\"{1}\"," +
                                       "\"nickname\":\"{2}\"," +
                                       "\"phoneNumbers\":[{3}]," +
                                       "\"emails\":[{4}]," +
                                       "\"addresses\":[{5}]," +
-                                      "\"urls\":[{6}]";
+                                      "\"urls\":[{6}]," +
+                                      "\"name\":{7}," +
+                                      "\"note\":\"{8}\"";
 
             string jsonContact = String.Format(contactFormatStr, 
                                                con.GetHashCode(), 
                                                con.DisplayName, 
-                                               con.DisplayName, 
+                                               con.DisplayName,
                                                FormatJSONPhoneNumbers(con), 
-                                               FormatJSONEmails(con),
+                                               FormatJSONEmails(con), 
                                                FormatJSONAddresses(con),
-                                               FormatJSONWebsites(con));
+                                               FormatJSONWebsites(con),
+                                               FormatJSONName(con),
+                                               con.Notes.FirstOrDefault());
+
+            Debug.WriteLine("jsonContact = " + jsonContact);
 
             return "{" + jsonContact + "}";
         }
diff --git a/lib/windows/framework/Cordova/Commands/Device.cs b/lib/windows/framework/Cordova/Commands/Device.cs
index 30c411c6..eff34625 100644
--- a/lib/windows/framework/Cordova/Commands/Device.cs
+++ b/lib/windows/framework/Cordova/Commands/Device.cs
@@ -62,7 +62,7 @@ public string cordova
             get
             {
                 // TODO: should be able to dynamically read the Cordova version from somewhere...
-                return "1.6.1";
+                return "1.7.0";
             }
         }
 
diff --git a/lib/windows/framework/Cordova/Commands/FileTransfer.cs b/lib/windows/framework/Cordova/Commands/FileTransfer.cs
index 08bcd182..05a1ffff 100644
--- a/lib/windows/framework/Cordova/Commands/FileTransfer.cs
+++ b/lib/windows/framework/Cordova/Commands/FileTransfer.cs
@@ -406,6 +406,7 @@ private void WriteCallback(IAsyncResult asynchronousResult)
                             string headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"" + lineEnd + "Content-Type: {2}" + lineEnd + lineEnd;
                             string header = string.Format(headerTemplate, uploadOptions.FileKey, uploadOptions.FileName, uploadOptions.MimeType);
                             byte[] headerBytes = System.Text.Encoding.UTF8.GetBytes(header);
+                            requestStream.Write(boundaryBytes, 0, boundaryBytes.Length);
                             requestStream.Write(headerBytes, 0, headerBytes.Length);
                             byte[] buffer = new byte[4096];
                             int bytesRead = 0;
diff --git a/lib/windows/framework/Cordova/Commands/Media.cs b/lib/windows/framework/Cordova/Commands/Media.cs
index cae0b3f6..36b04f45 100644
--- a/lib/windows/framework/Cordova/Commands/Media.cs
+++ b/lib/windows/framework/Cordova/Commands/Media.cs
@@ -57,7 +57,7 @@ public class MediaOptions
         /// <summary>
         /// Releases the audio player instance to save memory.
         /// </summary>  
-        private void release(string options)
+        public void release(string options)
         {
             try
             {
diff --git a/lib/windows/framework/Cordova/NativeExecution.cs b/lib/windows/framework/Cordova/NativeExecution.cs
index 6bc52a5d..466c1d98 100644
--- a/lib/windows/framework/Cordova/NativeExecution.cs
+++ b/lib/windows/framework/Cordova/NativeExecution.cs
@@ -104,8 +104,9 @@ public void ProcessCommand(CordovaCommandCall commandCallParams)
                     {
                         bc.InvokeMethodNamed(commandCallParams.Action, commandCallParams.Args);
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
+                        Debug.WriteLine("Exception in ProcessCommand :: " + ex.Message);
                         bc.OnCommandResult -= OnCommandResultHandler;
                         bc.OnCustomScript -= OnCustomScriptHandler;
 
diff --git a/lib/windows/framework/CordovaView.xaml b/lib/windows/framework/CordovaView.xaml
index d24e68be..cab5b401 100644
--- a/lib/windows/framework/CordovaView.xaml
+++ b/lib/windows/framework/CordovaView.xaml
@@ -13,10 +13,12 @@
     <Grid x:Name="LayoutRoot" Background="Transparent">
         
         <phone:WebBrowser x:Name="CordovaBrowser" 
+                          Opacity="0"
                           HorizontalAlignment="Stretch"  
                           VerticalAlignment="Stretch" 
                           IsScriptEnabled="True" 
                           Foreground="White"
+                          Background="Black"
                           Navigated="GapBrowser_Navigated" 
                           Loaded="GapBrowser_Loaded" 
                           Unloaded="GapBrowser_Unloaded" 
@@ -24,7 +26,20 @@
                           LoadCompleted="GapBrowser_LoadCompleted" 
                           Navigating="GapBrowser_Navigating" 
                           NavigationFailed="GapBrowser_NavigationFailed" 
-                          IsGeolocationEnabled="True" />
+                          IsGeolocationEnabled="True">
+            <phone:WebBrowser.Projection>
+                <PlaneProjection x:Name="BrowserProjector" CenterOfRotationX="0" RotationY="-180"/>
+            </phone:WebBrowser.Projection>
+            <phone:WebBrowser.Resources>
+                <Storyboard x:Name="RotateIn" BeginTime="0:0:0.5">
+                    <DoubleAnimation
+                        Storyboard.TargetName="BrowserProjector"
+                        Storyboard.TargetProperty="RotationY"
+                        To="0" Duration="0:0:0.6"/>
+                </Storyboard>
+            </phone:WebBrowser.Resources>
+
+        </phone:WebBrowser>
         
     </Grid>
 </UserControl>
diff --git a/lib/windows/framework/CordovaView.xaml.cs b/lib/windows/framework/CordovaView.xaml.cs
index 5c30584b..776bf23a 100644
--- a/lib/windows/framework/CordovaView.xaml.cs
+++ b/lib/windows/framework/CordovaView.xaml.cs
@@ -71,6 +71,8 @@ public partial class CordovaView : UserControl
         /// </summary>
         private NativeExecution nativeExecution;
 
+        protected BrowserMouseHelper bmHelper;
+
         protected DOMStorageHelper domStorageHelper;
         protected OrientationHelper orientationHelper;
 
@@ -145,6 +147,7 @@ public CordovaView()
 
             // initializes native execution logic
             this.nativeExecution = new NativeExecution(ref this.CordovaBrowser);
+            this.bmHelper = new BrowserMouseHelper(this.CordovaBrowser);
         }
 
         
@@ -196,6 +199,8 @@ void GapBrowser_Loaded(object sender, RoutedEventArgs e)
             // prevents refreshing web control to initial state during pages transitions
             if (this.IsBrowserInitialized) return;
 
+            
+
             this.domStorageHelper = new DOMStorageHelper(this.CordovaBrowser);
 
             try
@@ -342,17 +347,21 @@ void page_BackKeyPress(object sender, CancelEventArgs e)
 
         void GapBrowser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs e)
         {
-            this.CordovaBrowser.Opacity = 1;
-
             string nativeReady = "(function(){ cordova.require('cordova/channel').onNativeReady.fire()})();";
 
             try
             {
                 CordovaBrowser.InvokeScript("execScript", new string[] { nativeReady });
             }
-            catch (Exception ex)
+            catch (Exception /*ex*/)
+            {
+                Debug.WriteLine("Error calling js to fire nativeReady event. Did you include cordova-x.x.x.js in your html script tag?");
+            }
+
+            if (this.CordovaBrowser.Opacity < 1)
             {
-                Debug.WriteLine("Error calling js to fire nativeReady event :: " + ex.Message);
+                this.CordovaBrowser.Opacity = 1;
+                RotateIn.Begin();
             }
         }
 
diff --git a/lib/windows/framework/Properties/AssemblyInfo.cs b/lib/windows/framework/Properties/AssemblyInfo.cs
index 04bf956f..c300955e 100644
--- a/lib/windows/framework/Properties/AssemblyInfo.cs
+++ b/lib/windows/framework/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.7.0")]
+[assembly: AssemblyFileVersion("1.7.0")]
diff --git a/lib/windows/framework/WP7CordovaClassLib.csproj b/lib/windows/framework/WP7CordovaClassLib.csproj
index e5d01261..e3a623ae 100644
--- a/lib/windows/framework/WP7CordovaClassLib.csproj
+++ b/lib/windows/framework/WP7CordovaClassLib.csproj
@@ -9,7 +9,7 @@
     <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WP7WP7CordovaClassLibClassLib</RootNamespace>
+    <RootNamespace>WP7CordovaClassLib</RootNamespace>
     <AssemblyName>WP7CordovaClassLib</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
@@ -59,6 +59,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Cordova\BrowserMouseHelper.cs" />
     <Compile Include="Cordova\Commands\Accelerometer.cs" />
     <Compile Include="Cordova\Commands\AudioPlayer.cs">
       <SubType>Code</SubType>
diff --git a/lib/windows/templates/description.txt b/lib/windows/templates/description.txt
index 85473249..ccee8c64 100644
--- a/lib/windows/templates/description.txt
+++ b/lib/windows/templates/description.txt
@@ -1,4 +1,4 @@
 CordovaStarter
 
-Starter project for building a Cordova app for Windows Phone v1.6.1 ( formerly PhoneGap )
+Starter project for building a Cordova app for Windows Phone version: 1.7.0.RC1 ( formerly PhoneGap )
 
diff --git a/lib/windows/templates/full/GapAppProj.csproj b/lib/windows/templates/full/GapAppProj.csproj
index 07992799..7eebb781 100644
--- a/lib/windows/templates/full/GapAppProj.csproj
+++ b/lib/windows/templates/full/GapAppProj.csproj
@@ -56,7 +56,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
     <Reference Include="System.Xml" />
-    <Reference Include="WP7CordovaClassLib, Version=1.6.1.0, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="WP7CordovaClassLib, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -81,7 +81,7 @@
     <Content Include="CordovaSourceDictionary.xml" />
     <None Include="BuildManifestProcessor.js" />
     <Content Include="GapLib\WP7CordovaClassLib.dll" />
-    <Content Include="www\cordova-1.6.1.js" />
+    <Content Include="www\cordova-1.7.0.js" />
     <Content Include="www\index.html">
       <SubType>Designer</SubType>
     </Content>
diff --git a/lib/windows/templates/full/GapLib/WP7CordovaClassLib.dll b/lib/windows/templates/full/GapLib/WP7CordovaClassLib.dll
index bae2c39c..b3f265fd 100644
Binary files a/lib/windows/templates/full/GapLib/WP7CordovaClassLib.dll and b/lib/windows/templates/full/GapLib/WP7CordovaClassLib.dll differ
diff --git a/lib/windows/templates/full/MainPage.xaml b/lib/windows/templates/full/MainPage.xaml
index 424acac3..57d76fb8 100644
--- a/lib/windows/templates/full/MainPage.xaml
+++ b/lib/windows/templates/full/MainPage.xaml
@@ -9,6 +9,7 @@
     mc:Ignorable="d" FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
+    Background="Black"
     SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
     shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480" 
     xmlns:my="clr-namespace:WP7CordovaClassLib;assembly=WP7CordovaClassLib">
@@ -20,6 +21,14 @@
                    Margin="0,0,0,0"  
                    Name="PGView" 
                    VerticalAlignment="Stretch" />
+        <Image Source="SplashScreenImage.jpg"
+          x:Name="SplashImage"
+          VerticalAlignment="Center"
+          HorizontalAlignment="Stretch">
+            <Image.Projection>
+                <PlaneProjection x:Name="SplashProjector"  CenterOfRotationX="0"/>
+            </Image.Projection>
+        </Image>
     </Grid>
 
-</phone:PhoneApplicationPage>
\ No newline at end of file
+</phone:PhoneApplicationPage>
diff --git a/lib/windows/templates/full/MainPage.xaml.cs b/lib/windows/templates/full/MainPage.xaml.cs
index 106331a2..9fc9a634 100644
--- a/lib/windows/templates/full/MainPage.xaml.cs
+++ b/lib/windows/templates/full/MainPage.xaml.cs
@@ -23,11 +23,30 @@ public partial class MainPage : PhoneApplicationPage
         public MainPage()
         {
             InitializeComponent();
+            this.PGView.Loaded += GapBrowser_Loaded;
         }
 
         private void GapBrowser_Loaded(object sender, RoutedEventArgs e)
         {
-            
+            this.PGView.Loaded -= GapBrowser_Loaded;
+            Storyboard _storyBoard = new Storyboard();
+            DoubleAnimation animation = new DoubleAnimation()
+            {
+                From = 0,
+                Duration = TimeSpan.FromSeconds(0.6),
+                To = 90
+            };
+            Storyboard.SetTarget(animation, SplashProjector);
+            Storyboard.SetTargetProperty(animation, new PropertyPath("RotationY"));
+            _storyBoard.Children.Add(animation);
+            _storyBoard.Begin();
+            _storyBoard.Completed += Splash_Completed;
+        }
+
+        void Splash_Completed(object sender, EventArgs e)
+        {
+            (sender as Storyboard).Completed -= Splash_Completed;
+            LayoutRoot.Children.Remove(SplashImage);
         }
     }
 }
\ No newline at end of file
diff --git a/lib/windows/templates/full/www/cordova-1.7.0.js b/lib/windows/templates/full/www/cordova-1.7.0.js
new file mode 100644
index 00000000..a2ff225c
--- /dev/null
+++ b/lib/windows/templates/full/www/cordova-1.7.0.js
@@ -0,0 +1,4774 @@
+// commit 1eb529fe62d3e542e155745696b2be0e1ae1d316
+
+// File generated at :: Mon Apr 23 2012 12:02:02 GMT-0700 (Pacific Daylight Time)
+
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+
+;(function() {
+
+// file: lib\scripts\require.js
+var require,
+    define;
+
+(function () {
+    var modules = {};
+
+    function build(module) {
+        var factory = module.factory;
+        module.exports = {};
+        delete module.factory;
+        factory(require, module.exports, module);
+        return module.exports;
+    }
+
+    require = function (id) {
+        if (!modules[id]) {
+            throw "module " + id + " not found";
+        }
+        return modules[id].factory ? build(modules[id]) : modules[id].exports;
+    };
+
+    define = function (id, factory) {
+        if (modules[id]) {
+            throw "module " + id + " already defined";
+        }
+
+        modules[id] = {
+            id: id,
+            factory: factory
+        };
+    };
+
+    define.remove = function (id) {
+        delete modules[id];
+    };
+
+})();
+
+//Export for use in node
+if (typeof module === "object" && typeof require === "function") {
+    module.exports.require = require;
+    module.exports.define = define;
+}
+// file: lib/cordova.js
+define("cordova", function(require, exports, module) {
+var channel = require('cordova/channel');
+
+/**
+ * Listen for DOMContentLoaded and notify our channel subscribers.
+ */
+document.addEventListener('DOMContentLoaded', function() {
+    channel.onDOMContentLoaded.fire();
+}, false);
+if (document.readyState == 'complete') {
+    channel.onDOMContentLoaded.fire();
+}
+
+/**
+ * Intercept calls to addEventListener + removeEventListener and handle deviceready,
+ * resume, and pause events.
+ */
+var m_document_addEventListener = document.addEventListener;
+var m_document_removeEventListener = document.removeEventListener;
+var m_window_addEventListener = window.addEventListener;
+var m_window_removeEventListener = window.removeEventListener;
+
+/**
+ * Houses custom event handlers to intercept on document + window event listeners.
+ */
+var documentEventHandlers = {},
+    windowEventHandlers = {};
+
+document.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    if (e == 'deviceready') {
+        channel.onDeviceReady.subscribeOnce(handler);
+    } else if (e == 'resume') {
+      channel.onResume.subscribe(handler);
+      // if subscribing listener after event has already fired, invoke the handler
+      if (channel.onResume.fired && handler instanceof Function) {
+          handler();
+      }
+    } else if (e == 'pause') {
+      channel.onPause.subscribe(handler);
+    } else if (typeof documentEventHandlers[e] != 'undefined') {
+      documentEventHandlers[e].subscribe(handler);
+    } else {
+      m_document_addEventListener.call(document, evt, handler, capture);
+    }
+};
+
+window.addEventListener = function(evt, handler, capture) {
+  var e = evt.toLowerCase();
+  if (typeof windowEventHandlers[e] != 'undefined') {
+    windowEventHandlers[e].subscribe(handler);
+  } else {
+    m_window_addEventListener.call(window, evt, handler, capture);
+  }
+};
+
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    // Check for pause/resume events first.
+    if (e == 'resume') {
+        channel.onResume.unsubscribe(handler);
+    } else if (e == 'pause') {
+        channel.onPause.unsubscribe(handler);
+    // If unsubcribing from an event that is handled by a plugin
+    } else if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
+};
+
+window.removeEventListener = function(evt, handler, capture) {
+  var e = evt.toLowerCase();
+  // If unsubcribing from an event that is handled by a plugin
+  if (typeof windowEventHandlers[e] != "undefined") {
+    windowEventHandlers[e].unsubscribe(handler);
+  } else {
+    m_window_removeEventListener.call(window, evt, handler, capture);
+  }
+};
+
+function createEvent(type, data) {
+  var event = document.createEvent('Events');
+  event.initEvent(type, false, false);
+  if (data) {
+    for (var i in data) {
+      if (data.hasOwnProperty(i)) {
+        event[i] = data[i];
+      }
+    }
+  }
+  return event;
+}
+
+if(typeof window.console === "undefined")
+{
+    window.console = {
+        log:function(){}
+    };
+}
+
+var cordova = {
+    define:define,
+    require:require,
+    /**
+     * Methods to add/remove your own addEventListener hijacking on document + window.
+     */
+    addWindowEventHandler:function(event, opts) {
+      return (windowEventHandlers[event] = channel.create(event, opts));
+    },
+    addDocumentEventHandler:function(event, opts) {
+      return (documentEventHandlers[event] = channel.create(event, opts));
+    },
+    removeWindowEventHandler:function(event) {
+      delete windowEventHandlers[event];
+    },
+    removeDocumentEventHandler:function(event) {
+      delete documentEventHandlers[event];
+    },
+    /**
+     * Retreive original event handlers that were replaced by Cordova
+     *
+     * @return object
+     */
+    getOriginalHandlers: function() {
+        return {'document': {'addEventListener': m_document_addEventListener, 'removeEventListener': m_document_removeEventListener},
+        'window': {'addEventListener': m_window_addEventListener, 'removeEventListener': m_window_removeEventListener}};
+    },
+    /**
+     * Method to fire event from native code
+     */
+    fireDocumentEvent: function(type, data) {
+      var evt = createEvent(type, data);
+      if (typeof documentEventHandlers[type] != 'undefined') {
+        documentEventHandlers[type].fire(evt);
+      } else {
+        document.dispatchEvent(evt);
+      }
+    },
+    fireWindowEvent: function(type, data) {
+      var evt = createEvent(type,data);
+      if (typeof windowEventHandlers[type] != 'undefined') {
+        windowEventHandlers[type].fire(evt);
+      } else {
+        window.dispatchEvent(evt);
+      }
+    },
+    // TODO: this is Android only; think about how to do this better
+    shuttingDown:false,
+    UsePolling:false,
+    // END TODO
+
+    // TODO: iOS only
+    // This queue holds the currently executing command and all pending
+    // commands executed with cordova.exec().
+    commandQueue:[],
+    // Indicates if we're currently in the middle of flushing the command
+    // queue on the native side.
+    commandQueueFlushing:false,
+    // END TODO
+    /**
+     * Plugin callback mechanism.
+     */
+    callbackId: 0,
+    callbacks:  {},
+    callbackStatus: {
+        NO_RESULT: 0,
+        OK: 1,
+        CLASS_NOT_FOUND_EXCEPTION: 2,
+        ILLEGAL_ACCESS_EXCEPTION: 3,
+        INSTANTIATION_EXCEPTION: 4,
+        MALFORMED_URL_EXCEPTION: 5,
+        IO_EXCEPTION: 6,
+        INVALID_ACTION: 7,
+        JSON_EXCEPTION: 8,
+        ERROR: 9
+    },
+
+    /**
+     * Called by native code when returning successful result from an action.
+     *
+     * @param callbackId
+     * @param args
+     */
+    callbackSuccess: function(callbackId, args) {
+        if (cordova.callbacks[callbackId]) {
+
+            // If result is to be sent to callback
+            if (args.status == cordova.callbackStatus.OK) {
+                try {
+                    if (cordova.callbacks[callbackId].success) {
+                        cordova.callbacks[callbackId].success(args.message);
+                    }
+                }
+                catch (e) {
+                    console.log("Error in success callback: "+callbackId+" = "+e);
+                }
+            }
+
+            // Clear callback if not expecting any more results
+            if (!args.keepCallback) {
+                delete cordova.callbacks[callbackId];
+            }
+        }
+    },
+
+    /**
+     * Called by native code when returning error result from an action.
+     *
+     * @param callbackId
+     * @param args
+     */
+    callbackError: function(callbackId, args) {
+        if (cordova.callbacks[callbackId]) {
+            try {
+                if (cordova.callbacks[callbackId].fail) {
+                    cordova.callbacks[callbackId].fail(args.message);
+                }
+            }
+            catch (e) {
+                console.log("Error in error callback: "+callbackId+" = "+e);
+            }
+
+            // Clear callback if not expecting any more results
+            if (!args.keepCallback) {
+                delete cordova.callbacks[callbackId];
+            }
+        }
+    },
+    // TODO: remove in 2.0.
+    addPlugin: function(name, obj) {
+        console.log("[DEPRECATION NOTICE] window.addPlugin and window.plugins will be removed in version 2.0.");
+        if (!window.plugins[name]) {
+            window.plugins[name] = obj;
+        }
+        else {
+            console.log("Error: Plugin "+name+" already exists.");
+        }
+    },
+
+    addConstructor: function(func) {
+        channel.onCordovaReady.subscribeOnce(function() {
+            try {
+                func();
+            } catch(e) {
+                console.log("Failed to run constructor: " + e);
+            }
+        });
+    }
+};
+
+/**
+ * Legacy variable for plugin support
+ * TODO: remove in 2.0.
+ */
+if (!window.PhoneGap) {
+    window.PhoneGap = cordova;
+}
+
+/**
+ * Plugins object
+ * TODO: remove in 2.0.
+ */
+if (!window.plugins) {
+    window.plugins = {};
+}
+
+module.exports = cordova;
+
+});
+
+// file: lib\common\builder.js
+define("cordova/builder", function(require, exports, module) {
+var utils = require('cordova/utils');
+
+function each(objects, func, context) {
+    for (var prop in objects) {
+        if (objects.hasOwnProperty(prop)) {
+            func.apply(context, [objects[prop], prop]);
+        }
+    }
+}
+
+function include(parent, objects, clobber, merge) {
+    each(objects, function (obj, key) {
+        try {
+          var result = obj.path ? require(obj.path) : {};
+
+          if (clobber) {
+              // Clobber if it doesn't exist.
+              if (typeof parent[key] === 'undefined') {
+                  parent[key] = result;
+              } else if (typeof obj.path !== 'undefined') {
+                  // If merging, merge properties onto parent, otherwise, clobber.
+                  if (merge) {
+                      recursiveMerge(parent[key], result);
+                  } else {
+                      parent[key] = result;
+                  }
+              }
+              result = parent[key];
+          } else {
+            // Overwrite if not currently defined.
+            if (typeof parent[key] == 'undefined') {
+              parent[key] = result;
+            } else if (merge && typeof obj.path !== 'undefined') {
+              // If merging, merge parent onto result
+              recursiveMerge(result, parent[key]);
+              parent[key] = result;
+            } else {
+              // Set result to what already exists, so we can build children into it if they exist.
+              result = parent[key];
+            }
+          }
+
+          if (obj.children) {
+            include(result, obj.children, clobber, merge);
+          }
+        } catch(e) {
+          utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
+        }
+    });
+}
+
+/**
+ * Merge properties from one object onto another recursively.  Properties from
+ * the src object will overwrite existing target property.
+ *
+ * @param target Object to merge properties into.
+ * @param src Object to merge properties from.
+ */
+function recursiveMerge(target, src) {
+    for (var prop in src) {
+        if (src.hasOwnProperty(prop)) {
+            if (typeof target.prototype !== 'undefined' && target.prototype.constructor === target) {
+                // If the target object is a constructor override off prototype.
+                target.prototype[prop] = src[prop];
+            } else {
+                target[prop] = typeof src[prop] === 'object' ? recursiveMerge(
+                        target[prop], src[prop]) : src[prop];
+            }
+        }
+    }
+    return target;
+}
+
+module.exports = {
+    build: function (objects) {
+        return {
+            intoButDontClobber: function (target) {
+                include(target, objects, false, false);
+            },
+            intoAndClobber: function(target) {
+                include(target, objects, true, false);
+            },
+            intoAndMerge: function(target) {
+                include(target, objects, true, true);
+            }
+        };
+    }
+};
+
+});
+
+// file: lib\common\channel.js
+define("cordova/channel", function(require, exports, module) {
+/**
+ * Custom pub-sub "channel" that can have functions subscribed to it
+ * This object is used to define and control firing of events for
+ * cordova initialization.
+ *
+ * The order of events during page load and Cordova startup is as follows:
+ *
+ * onDOMContentLoaded         Internal event that is received when the web page is loaded and parsed.
+ * onNativeReady              Internal event that indicates the Cordova native side is ready.
+ * onCordovaReady             Internal event fired when all Cordova JavaScript objects have been created.
+ * onCordovaInfoReady         Internal event fired when device properties are available.
+ * onCordovaConnectionReady   Internal event fired when the connection property has been set.
+ * onDeviceReady              User event fired to indicate that Cordova is ready
+ * onResume                   User event fired to indicate a start/resume lifecycle event
+ * onPause                    User event fired to indicate a pause lifecycle event
+ * onDestroy                  Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
+ *
+ * The only Cordova events that user code should register for are:
+ *      deviceready           Cordova native code is initialized and Cordova APIs can be called from JavaScript
+ *      pause                 App has moved to background
+ *      resume                App has returned to foreground
+ *
+ * Listeners can be registered as:
+ *      document.addEventListener("deviceready", myDeviceReadyListener, false);
+ *      document.addEventListener("resume", myResumeListener, false);
+ *      document.addEventListener("pause", myPauseListener, false);
+ *
+ * The DOM lifecycle events should be used for saving and restoring state
+ *      window.onload
+ *      window.onunload
+ *
+ */
+
+/**
+ * Channel
+ * @constructor
+ * @param type  String the channel name
+ * @param opts  Object options to pass into the channel, currently
+ *                     supports:
+ *                     onSubscribe: callback that fires when
+ *                       something subscribes to the Channel. Sets
+ *                       context to the Channel.
+ *                     onUnsubscribe: callback that fires when
+ *                       something unsubscribes to the Channel. Sets
+ *                       context to the Channel.
+ */
+var Channel = function(type, opts) {
+        this.type = type;
+        this.handlers = {};
+        this.numHandlers = 0;
+        this.guid = 0;
+        this.fired = false;
+        this.enabled = true;
+        this.events = {
+          onSubscribe:null,
+          onUnsubscribe:null
+        };
+        if (opts) {
+          if (opts.onSubscribe) this.events.onSubscribe = opts.onSubscribe;
+          if (opts.onUnsubscribe) this.events.onUnsubscribe = opts.onUnsubscribe;
+        }
+    },
+    channel = {
+        /**
+         * Calls the provided function only after all of the channels specified
+         * have been fired.
+         */
+        join: function (h, c) {
+            var i = c.length;
+            var len = i;
+            var f = function() {
+                if (!(--i)) h();
+            };
+            for (var j=0; j<len; j++) {
+                !c[j].fired?c[j].subscribeOnce(f):i--;
+            }
+            if (!i) h();
+        },
+        create: function (type, opts) {
+            channel[type] = new Channel(type, opts);
+            return channel[type];
+        },
+
+        /**
+         * cordova Channels that must fire before "deviceready" is fired.
+         */
+        deviceReadyChannelsArray: [],
+        deviceReadyChannelsMap: {},
+
+        /**
+         * Indicate that a feature needs to be initialized before it is ready to be used.
+         * This holds up Cordova's "deviceready" event until the feature has been initialized
+         * and Cordova.initComplete(feature) is called.
+         *
+         * @param feature {String}     The unique feature name
+         */
+        waitForInitialization: function(feature) {
+            if (feature) {
+                var c = null;
+                if (this[feature]) {
+                    c = this[feature];
+                }
+                else {
+                    c = this.create(feature);
+                }
+                this.deviceReadyChannelsMap[feature] = c;
+                this.deviceReadyChannelsArray.push(c);
+            }
+        },
+
+        /**
+         * Indicate that initialization code has completed and the feature is ready to be used.
+         *
+         * @param feature {String}     The unique feature name
+         */
+        initializationComplete: function(feature) {
+            var c = this.deviceReadyChannelsMap[feature];
+            if (c) {
+                c.fire();
+            }
+        }
+    },
+    utils = require('cordova/utils');
+
+/**
+ * Subscribes the given function to the channel. Any time that
+ * Channel.fire is called so too will the function.
+ * Optionally specify an execution context for the function
+ * and a guid that can be used to stop subscribing to the channel.
+ * Returns the guid.
+ */
+Channel.prototype.subscribe = function(f, c, g) {
+    // need a function to call
+    if (f === null || f === undefined) { return; }
+
+    var func = f;
+    if (typeof c == "object" && f instanceof Function) { func = utils.close(c, f); }
+
+    g = g || func.observer_guid || f.observer_guid || this.guid++;
+    func.observer_guid = g;
+    f.observer_guid = g;
+    this.handlers[g] = func;
+    this.numHandlers++;
+    if (this.events.onSubscribe) this.events.onSubscribe.call(this);
+    return g;
+};
+
+/**
+ * Like subscribe but the function is only called once and then it
+ * auto-unsubscribes itself.
+ */
+Channel.prototype.subscribeOnce = function(f, c) {
+    // need a function to call
+    if (f === null || f === undefined) { return; }
+
+    var g = null;
+    var _this = this;
+    var m = function() {
+        f.apply(c || null, arguments);
+        _this.unsubscribe(g);
+    };
+    if (this.fired) {
+        if (typeof c == "object" && f instanceof Function) { f = utils.close(c, f); }
+        f.apply(this, this.fireArgs);
+    } else {
+        g = this.subscribe(m);
+    }
+    return g;
+};
+
+/**
+ * Unsubscribes the function with the given guid from the channel.
+ */
+Channel.prototype.unsubscribe = function(g) {
+    // need a function to unsubscribe
+    if (g === null || g === undefined) { return; }
+
+    if (g instanceof Function) { g = g.observer_guid; }
+    this.handlers[g] = null;
+    delete this.handlers[g];
+    this.numHandlers--;
+    if (this.events.onUnsubscribe) this.events.onUnsubscribe.call(this);
+};
+
+/**
+ * Calls all functions subscribed to this channel.
+ */
+Channel.prototype.fire = function(e) {
+    if (this.enabled) {
+        var fail = false;
+        this.fired = true;
+        for (var item in this.handlers) {
+            var handler = this.handlers[item];
+            if (handler instanceof Function) {
+                var rv = (handler.apply(this, arguments)===false);
+                fail = fail || rv;
+            }
+        }
+        this.fireArgs = arguments;
+        return !fail;
+    }
+    return true;
+};
+
+// defining them here so they are ready super fast!
+// DOM event that is received when the web page is loaded and parsed.
+channel.create('onDOMContentLoaded');
+
+// Event to indicate the Cordova native side is ready.
+channel.create('onNativeReady');
+
+// Event to indicate that all Cordova JavaScript objects have been created
+// and it's time to run plugin constructors.
+channel.create('onCordovaReady');
+
+// Event to indicate that device properties are available
+channel.create('onCordovaInfoReady');
+
+// Event to indicate that the connection property has been set.
+channel.create('onCordovaConnectionReady');
+
+// Event to indicate that Cordova is ready
+channel.create('onDeviceReady');
+
+// Event to indicate a resume lifecycle event
+channel.create('onResume');
+
+// Event to indicate a pause lifecycle event
+channel.create('onPause');
+
+// Event to indicate a destroy lifecycle event
+channel.create('onDestroy');
+
+// Channels that must fire before "deviceready" is fired.
+channel.waitForInitialization('onCordovaReady');
+channel.waitForInitialization('onCordovaInfoReady');
+channel.waitForInitialization('onCordovaConnectionReady');
+
+module.exports = channel;
+});
+
+// file: lib\common\common.js
+define("cordova/common", function(require, exports, module) {
+module.exports = {
+    objects: {
+        cordova: {
+            path: 'cordova',
+            children: {
+                exec: {
+                    path: 'cordova/exec'
+                }
+            }
+        },
+        navigator: {
+            children: {
+                notification: {
+                    path: 'cordova/plugin/notification'
+                },
+                accelerometer: {
+                    path: 'cordova/plugin/accelerometer'
+                },
+                battery: {
+                    path: 'cordova/plugin/battery'
+                },
+                camera:{
+                    path: 'cordova/plugin/Camera'
+                },
+                compass:{
+                    path: 'cordova/plugin/compass'
+                },
+                contacts: {
+                    path: 'cordova/plugin/contacts'
+                },
+                device:{
+                    children:{
+                        capture: {
+                            path: 'cordova/plugin/capture'
+                        }
+                    }
+                },
+                geolocation: {
+                    path: 'cordova/plugin/geolocation'
+                },
+                network: {
+                    children: {
+                        connection: {
+                            path: 'cordova/plugin/network'
+                        }
+                    }
+                }
+            }
+        },
+        Acceleration: {
+            path: 'cordova/plugin/Acceleration'
+        },
+        Camera:{
+            path: 'cordova/plugin/CameraConstants'
+        },
+        CaptureError: {
+            path: 'cordova/plugin/CaptureError'
+        },
+        CaptureAudioOptions:{
+            path: 'cordova/plugin/CaptureAudioOptions'
+        },
+        CaptureImageOptions: {
+            path: 'cordova/plugin/CaptureImageOptions'
+        },
+        CaptureVideoOptions: {
+            path: 'cordova/plugin/CaptureVideoOptions'
+        },
+        CompassHeading:{
+            path: 'cordova/plugin/CompassHeading'
+        },
+        CompassError:{
+            path: 'cordova/plugin/CompassError'
+        },
+        ConfigurationData: {
+            path: 'cordova/plugin/ConfigurationData'
+        },
+        Connection: {
+            path: 'cordova/plugin/Connection'
+        },
+        Contact: {
+            path: 'cordova/plugin/Contact'
+        },
+        ContactAddress: {
+            path: 'cordova/plugin/ContactAddress'
+        },
+        ContactError: {
+            path: 'cordova/plugin/ContactError'
+        },
+        ContactField: {
+            path: 'cordova/plugin/ContactField'
+        },
+        ContactFindOptions: {
+            path: 'cordova/plugin/ContactFindOptions'
+        },
+        ContactName: {
+            path: 'cordova/plugin/ContactName'
+        },
+        ContactOrganization: {
+            path: 'cordova/plugin/ContactOrganization'
+        },
+        Coordinates: {
+            path: 'cordova/plugin/Coordinates'
+        },
+        DirectoryEntry: {
+            path: 'cordova/plugin/DirectoryEntry'
+        },
+        DirectoryReader: {
+            path: 'cordova/plugin/DirectoryReader'
+        },
+        Entry: {
+            path: 'cordova/plugin/Entry'
+        },
+        File: {
+            path: 'cordova/plugin/File'
+        },
+        FileEntry: {
+            path: 'cordova/plugin/FileEntry'
+        },
+        FileError: {
+            path: 'cordova/plugin/FileError'
+        },
+        FileReader: {
+            path: 'cordova/plugin/FileReader'
+        },
+        FileSystem: {
+            path: 'cordova/plugin/FileSystem'
+        },
+        FileTransfer: {
+            path: 'cordova/plugin/FileTransfer'
+        },
+        FileTransferError: {
+            path: 'cordova/plugin/FileTransferError'
+        },
+        FileUploadOptions: {
+            path: 'cordova/plugin/FileUploadOptions'
+        },
+        FileUploadResult: {
+            path: 'cordova/plugin/FileUploadResult'
+        },
+        FileWriter: {
+            path: 'cordova/plugin/FileWriter'
+        },
+        Flags: {
+            path: 'cordova/plugin/Flags'
+        },
+        LocalFileSystem: {
+            path: 'cordova/plugin/LocalFileSystem'
+        },
+        Media: {
+            path: 'cordova/plugin/Media'
+        },
+        MediaError: {
+            path: 'cordova/plugin/MediaError'
+        },
+        MediaFile: {
+            path: 'cordova/plugin/MediaFile'
+        },
+        MediaFileData:{
+            path: 'cordova/plugin/MediaFileData'
+        },
+        Metadata:{
+            path: 'cordova/plugin/Metadata'
+        },
+        Position: {
+            path: 'cordova/plugin/Position'
+        },
+        PositionError: {
+            path: 'cordova/plugin/PositionError'
+        },
+        ProgressEvent: {
+            path: 'cordova/plugin/ProgressEvent'
+        },
+        requestFileSystem:{
+            path: 'cordova/plugin/requestFileSystem'
+        },
+        resolveLocalFileSystemURI:{
+            path: 'cordova/plugin/resolveLocalFileSystemURI'
+        }
+    }
+};
+});
+
+// file: lib\wp7\exec.js
+define("cordova/exec", function(require, exports, module) {
+var cordova = require('cordova');
+
+
+ /* definition of named properties expected by the native side,
+    all arrays are stored in order of how they are received from common js code.
+    When other platforms evolve to using named args this will be removed.
+ */
+
+var NamedArgs =  {
+    File:{
+        getFileMetadata:["fullPath"],
+        readAsText:["fileName","encoding"],
+        readAsDataURL:["fileName"],
+        getDirectory:["fullPath","path","options"],
+        remove:["fullPath"],
+        removeRecursively:["fullPath"],
+        getFile:["fullPath","path","options"],
+        readEntries:["fullPath"],
+        write:["fileName","data","position"],
+        truncate:["fileName","size"]
+    },
+    FileTransfer:{
+        upload:["filePath", "server", "fileKey", "fileName", "mimeType", "params", "debug", "chunkedMode"]
+    },
+    Contacts:{
+        search:["fields","options"]
+    },
+    Media:{
+        create:["id","src"],
+        startPlayingAudio:["id","src","milliseconds"],
+        //stopPlayingAudio
+        seekToAudio:["id","milliseconds"],
+        //pausePlayingAudio
+        //getCurrentPositionAudio
+        startRecordingAudio:["id","src"],
+        stopRecordingAudio:["id"],
+        release:["id"],
+        setVolume:["id","volume"]
+    },
+    Notification: {
+        alert:["message","title","buttonLabel"],
+        confirm:["message","title","buttonLabel"]
+    },
+    Camera:{
+        takePicture:["quality", "destinationType", "sourceType", "targetWidth", "targetHeight", "encodingType"]
+    }
+};
+
+/**
+ * Execute a cordova command.  It is up to the native side whether this action
+ * is synchronous or asynchronous.  The native side can return:
+ *      Synchronous: PluginResult object as a JSON string
+ *      Asynchrounous: Empty string ""
+ * If async, the native side will cordova.callbackSuccess or cordova.callbackError,
+ * depending upon the result of the action.
+ *
+ * @param {Function} success    The success callback
+ * @param {Function} fail       The fail callback
+ * @param {String} service      The name of the service to use
+ * @param {String} action       Action to be run in cordova
+ * @param {String[]} [args]     Zero or more arguments to pass to the method
+
+ */
+
+module.exports = function(success, fail, service, action, args) {
+
+    var callbackId = service + cordova.callbackId++;
+    if (typeof success == "function" || typeof fail == "function")
+    {
+        cordova.callbacks[callbackId] = {success:success, fail:fail};
+    }
+
+    // generate a new command string, ex. DebugConsole/log/DebugConsole23/{"message":"wtf dude?"}
+
+    if(NamedArgs[service] && NamedArgs[service][action]) {
+        var argNames = NamedArgs[service][action];
+        var newArgs = {};
+        var len = Math.min(args.length,argNames.length);
+
+        for(var n = 0; n < len; n++) {
+            newArgs[argNames[n]] = args[n];
+        }
+
+        args = newArgs;
+    }
+    else if(args && args.length && args.length == 1) {
+        args = args[0];
+    }
+
+    var command = service + "/" + action + "/" + callbackId + "/" + JSON.stringify(args);
+    // pass it on to Notify
+    try {
+        if(window.external) {
+            window.external.Notify(command);
+        }
+        else {
+            console.log("window.external not available :: command=" + command);
+        }
+    }
+    catch(e) {
+        console.log("Exception calling native with command :: " + command + " :: exception=" + e);
+    }
+};
+
+
+});
+
+// file: lib\wp7\platform.js
+define("cordova/platform", function(require, exports, module) {
+var cordova = require('cordova'),
+      exec = require('cordova/exec');
+
+// specifically require the following patches :
+
+// localStorage+SessionStorage APIs
+require("cordova/plugin/wp7/DOMStorage");
+
+// Fix XHR calls to local file-system
+require("cordova/plugin/wp7/XHRPatch");
+
+
+module.exports = {
+    id: "wp7",
+    initialize:function() {
+
+
+
+
+    // INject a lsitener for the backbutton, and tell native to override the flag (true/false) when we have 1 or more, or 0, listeners
+    var backButtonChannel = cordova.addDocumentEventHandler('backbutton', {
+      onSubscribe:function() {
+        if (this.numHandlers === 1) {
+            exec(null, null, "CoreEvents", "overridebackbutton", [true]);
+        }
+      },
+      onUnsubscribe:function() {
+        if (this.numHandlers === 0) {
+          exec(null, null, "CoreEvents", "overridebackbutton", [false]);
+        }
+      }
+    });
+    },
+    objects: {
+        CordovaCommandResult: {
+            path:"cordova/plugin/wp7/CordovaCommandResult"
+        },
+        CordovaMediaonStatus: {
+            path:"cordova/plugin/wp7/CordovaMediaonStatus"
+        },
+        requestFileSystem: {
+            path:"cordova/plugin/wp7/requestFileSystem"
+        },
+        resolveLocalFileSystemURI: {
+            path:"cordova/plugin/wp7/resolveLocalFileSystemURI"
+        },
+        File: {
+            path: "cordova/plugin/File"
+        },
+        FileReader: {
+            path: "cordova/plugin/FileReader"
+        },
+        FileError: {
+            path: "cordova/plugin/FileError"
+        },
+        MediaError: {
+            path: "cordova/plugin/MediaError"
+        },
+        navigator: {
+            children: {
+                device: {
+                    path: "cordova/plugin/wp7/device",
+                    children:{
+                        capture:{
+                            path:"cordova/plugin/capture"
+                        }
+                    }
+                },
+                console: {
+                    path: "cordova/plugin/wp7/console"
+
+                }
+            }
+        },
+        device:{
+          path:"cordova/plugin/wp7/device"
+        },
+        console:{
+          path: "cordova/plugin/wp7/console"
+        }
+    }
+};
+});
+
+// file: lib\common\plugin\Acceleration.js
+define("cordova/plugin/Acceleration", function(require, exports, module) {
+var Acceleration = function(x, y, z, timestamp) {
+  this.x = x;
+  this.y = y;
+  this.z = z;
+  this.timestamp = timestamp || (new Date()).getTime();
+};
+
+module.exports = Acceleration;
+});
+
+// file: lib\common\plugin\Camera.js
+define("cordova/plugin/Camera", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    Camera = require('cordova/plugin/CameraConstants');
+
+var cameraExport = {};
+
+// Tack on the Camera Constants to the base camera plugin.
+for (var key in Camera) {
+    cameraExport[key] = Camera[key];
+}
+
+/**
+ * Gets a picture from source defined by "options.sourceType", and returns the
+ * image as defined by the "options.destinationType" option.
+
+ * The defaults are sourceType=CAMERA and destinationType=FILE_URL.
+ *
+ * @param {Function} successCallback
+ * @param {Function} errorCallback
+ * @param {Object} options
+ */
+cameraExport.getPicture = function(successCallback, errorCallback, options) {
+    // successCallback required
+    if (typeof successCallback != "function") {
+        console.log("Camera Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("Camera Error: errorCallback is not a function");
+        return;
+    }
+
+    var quality = 50;
+    if (options && typeof options.quality == "number") {
+        quality = options.quality;
+    } else if (options && typeof options.quality == "string") {
+        var qlity = parseInt(options.quality, 10);
+        if (isNaN(qlity) === false) {
+            quality = qlity.valueOf();
+        }
+    }
+
+    var destinationType = Camera.DestinationType.FILE_URI;
+    if (typeof options.destinationType == "number") {
+        destinationType = options.destinationType;
+    }
+
+    var sourceType = Camera.PictureSourceType.CAMERA;
+    if (typeof options.sourceType == "number") {
+        sourceType = options.sourceType;
+    }
+
+    var targetWidth = -1;
+    if (typeof options.targetWidth == "number") {
+        targetWidth = options.targetWidth;
+    } else if (typeof options.targetWidth == "string") {
+        var width = parseInt(options.targetWidth, 10);
+        if (isNaN(width) === false) {
+            targetWidth = width.valueOf();
+        }
+    }
+
+    var targetHeight = -1;
+    if (typeof options.targetHeight == "number") {
+        targetHeight = options.targetHeight;
+    } else if (typeof options.targetHeight == "string") {
+        var height = parseInt(options.targetHeight, 10);
+        if (isNaN(height) === false) {
+            targetHeight = height.valueOf();
+        }
+    }
+
+    var encodingType = Camera.EncodingType.JPEG;
+    if (typeof options.encodingType == "number") {
+        encodingType = options.encodingType;
+    }
+
+    var mediaType = Camera.MediaType.PICTURE;
+    if (typeof options.mediaType == "number") {
+        mediaType = options.mediaType;
+    }
+    var allowEdit = false;
+    if (typeof options.allowEdit == "boolean") {
+        allowEdit = options.allowEdit;
+    } else if (typeof options.allowEdit == "number") {
+        allowEdit = options.allowEdit <= 0 ? false : true;
+    }
+    var correctOrientation = false;
+    if (typeof options.correctOrientation == "boolean") {
+        correctOrientation = options.correctOrientation;
+    } else if (typeof options.correctOrientation == "number") {
+        correctOrientation = options.correctOrientation <=0 ? false : true;
+    }
+    var saveToPhotoAlbum = false;
+    if (typeof options.saveToPhotoAlbum == "boolean") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum;
+    } else if (typeof options.saveToPhotoAlbum == "number") {
+        saveToPhotoAlbum = options.saveToPhotoAlbum <=0 ? false : true;
+    }
+
+    exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType, allowEdit, correctOrientation, saveToPhotoAlbum]);
+};
+
+module.exports = cameraExport;
+});
+
+// file: lib\common\plugin\CameraConstants.js
+define("cordova/plugin/CameraConstants", function(require, exports, module) {
+module.exports = {
+  DestinationType:{
+    DATA_URL: 0,         // Return base64 encoded string
+    FILE_URI: 1          // Return file uri (content://media/external/images/media/2 for Android)
+  },
+  EncodingType:{
+    JPEG: 0,             // Return JPEG encoded image
+    PNG: 1               // Return PNG encoded image
+  },
+  MediaType:{
+    PICTURE: 0,          // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
+    VIDEO: 1,            // allow selection of video only, ONLY RETURNS URL
+    ALLMEDIA : 2         // allow selection from all media types
+  },
+  PictureSourceType:{
+    PHOTOLIBRARY : 0,    // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
+    CAMERA : 1,          // Take picture from camera
+    SAVEDPHOTOALBUM : 2  // Choose image from picture library (same as PHOTOLIBRARY for Android)
+  }
+};
+});
+
+// file: lib\common\plugin\CaptureAudioOptions.js
+define("cordova/plugin/CaptureAudioOptions", function(require, exports, module) {
+/**
+ * Encapsulates all audio capture operation configuration options.
+ */
+var CaptureAudioOptions = function(){
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
+};
+
+module.exports = CaptureAudioOptions;
+});
+
+// file: lib\common\plugin\CaptureError.js
+define("cordova/plugin/CaptureError", function(require, exports, module) {
+/**
+ * The CaptureError interface encapsulates all errors in the Capture API.
+ */
+var CaptureError = function(c) {
+   this.code = c || null;
+};
+
+// Camera or microphone failed to capture image or sound.
+CaptureError.CAPTURE_INTERNAL_ERR = 0;
+// Camera application or audio capture application is currently serving other capture request.
+CaptureError.CAPTURE_APPLICATION_BUSY = 1;
+// Invalid use of the API (e.g. limit parameter has value less than one).
+CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
+// User exited camera application or audio capture application before capturing anything.
+CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
+// The requested capture operation is not supported.
+CaptureError.CAPTURE_NOT_SUPPORTED = 20;
+
+module.exports = CaptureError;
+});
+
+// file: lib\common\plugin\CaptureImageOptions.js
+define("cordova/plugin/CaptureImageOptions", function(require, exports, module) {
+/**
+ * Encapsulates all image capture operation configuration options.
+ */
+var CaptureImageOptions = function(){
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1;
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null;
+};
+
+module.exports = CaptureImageOptions;
+});
+
+// file: lib\common\plugin\CaptureVideoOptions.js
+define("cordova/plugin/CaptureVideoOptions", function(require, exports, module) {
+/**
+ * Encapsulates all video capture operation configuration options.
+ */
+var CaptureVideoOptions = function(){
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
+};
+
+module.exports = CaptureVideoOptions;
+});
+
+// file: lib\common\plugin\CompassError.js
+define("cordova/plugin/CompassError", function(require, exports, module) {
+/**
+ *  CompassError.
+ *  An error code assigned by an implementation when an error has occured
+ * @constructor
+ */
+var CompassError = function(err) {
+    this.code = (err !== undefined ? err : null);
+};
+
+CompassError.COMPASS_INTERNAL_ERR = 0;
+CompassError.COMPASS_NOT_SUPPORTED = 20;
+
+module.exports = CompassError;
+});
+
+// file: lib\common\plugin\CompassHeading.js
+define("cordova/plugin/CompassHeading", function(require, exports, module) {
+var CompassHeading = function(magneticHeading, trueHeading, headingAccuracy, timestamp) {
+  this.magneticHeading = (magneticHeading !== undefined ? magneticHeading : null);
+  this.trueHeading = (trueHeading !== undefined ? trueHeading : null);
+  this.headingAccuracy = (headingAccuracy !== undefined ? headingAccuracy : null);
+  this.timestamp = (timestamp !== undefined ? timestamp : new Date().getTime());
+};
+
+module.exports = CompassHeading;
+});
+
+// file: lib\common\plugin\ConfigurationData.js
+define("cordova/plugin/ConfigurationData", function(require, exports, module) {
+/**
+ * Encapsulates a set of parameters that the capture device supports.
+ */
+function ConfigurationData() {
+    // The ASCII-encoded string in lower case representing the media type.
+    this.type = null;
+    // The height attribute represents height of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0.
+    this.height = 0;
+    // The width attribute represents width of the image or video in pixels.
+    // In the case of a sound clip this attribute has value 0
+    this.width = 0;
+}
+
+module.exports = ConfigurationData;
+});
+
+// file: lib\common\plugin\Connection.js
+define("cordova/plugin/Connection", function(require, exports, module) {
+/**
+ * Network status
+ */
+module.exports = {
+        UNKNOWN: "unknown",
+        ETHERNET: "ethernet",
+        WIFI: "wifi",
+        CELL_2G: "2g",
+        CELL_3G: "3g",
+        CELL_4G: "4g",
+        NONE: "none"
+};
+});
+
+// file: lib\common\plugin\Contact.js
+define("cordova/plugin/Contact", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    ContactError = require('cordova/plugin/ContactError'),
+    utils = require('cordova/utils');
+
+/**
+* Converts primitives into Complex Object
+* Currently only used for Date fields
+*/
+function convertIn(contact) {
+    var value = contact.birthday;
+    try {
+      contact.birthday = new Date(parseFloat(value));
+    } catch (exception){
+      console.log("Cordova Contact convertIn error: exception creating date.");
+    }
+    return contact;
+}
+
+/**
+* Converts Complex objects into primitives
+* Only conversion at present is for Dates.
+**/
+
+function convertOut(contact) {
+    var value = contact.birthday;
+    if (value !== null) {
+        // try to make it a Date object if it is not already
+        if (!value instanceof Date){
+            try {
+                value = new Date(value);
+            } catch(exception){
+                value = null;
+            }
+        }
+        if (value instanceof Date){
+            value = value.valueOf(); // convert to milliseconds
+        }
+        contact.birthday = value;
+    }
+    return contact;
+}
+
+/**
+* Contains information about a single contact.
+* @constructor
+* @param {DOMString} id unique identifier
+* @param {DOMString} displayName
+* @param {ContactName} name
+* @param {DOMString} nickname
+* @param {Array.<ContactField>} phoneNumbers array of phone numbers
+* @param {Array.<ContactField>} emails array of email addresses
+* @param {Array.<ContactAddress>} addresses array of addresses
+* @param {Array.<ContactField>} ims instant messaging user ids
+* @param {Array.<ContactOrganization>} organizations
+* @param {DOMString} birthday contact's birthday
+* @param {DOMString} note user notes about contact
+* @param {Array.<ContactField>} photos
+* @param {Array.<ContactField>} categories
+* @param {Array.<ContactField>} urls contact's web sites
+*/
+var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
+    ims, organizations, birthday, note, photos, categories, urls) {
+    this.id = id || null;
+    this.rawId = null;
+    this.displayName = displayName || null;
+    this.name = name || null; // ContactName
+    this.nickname = nickname || null;
+    this.phoneNumbers = phoneNumbers || null; // ContactField[]
+    this.emails = emails || null; // ContactField[]
+    this.addresses = addresses || null; // ContactAddress[]
+    this.ims = ims || null; // ContactField[]
+    this.organizations = organizations || null; // ContactOrganization[]
+    this.birthday = birthday || null;
+    this.note = note || null;
+    this.photos = photos || null; // ContactField[]
+    this.categories = categories || null; // ContactField[]
+    this.urls = urls || null; // ContactField[]
+};
+
+/**
+* Removes contact from device storage.
+* @param successCB success callback
+* @param errorCB error callback
+*/
+Contact.prototype.remove = function(successCB, errorCB) {
+    var fail = function(code) {
+        errorCB(new ContactError(code));
+    };
+    if (this.id === null) {
+        fail(ContactError.UNKNOWN_ERROR);
+    }
+    else {
+        exec(successCB, fail, "Contacts", "remove", [this.id]);
+    }
+};
+
+/**
+* Creates a deep copy of this Contact.
+* With the contact ID set to null.
+* @return copy of this Contact
+*/
+Contact.prototype.clone = function() {
+    var clonedContact = utils.clone(this);
+    var i;
+    clonedContact.id = null;
+    clonedContact.rawId = null;
+    // Loop through and clear out any id's in phones, emails, etc.
+    if (clonedContact.phoneNumbers) {
+        for (i = 0; i < clonedContact.phoneNumbers.length; i++) {
+            clonedContact.phoneNumbers[i].id = null;
+        }
+    }
+    if (clonedContact.emails) {
+        for (i = 0; i < clonedContact.emails.length; i++) {
+            clonedContact.emails[i].id = null;
+        }
+    }
+    if (clonedContact.addresses) {
+        for (i = 0; i < clonedContact.addresses.length; i++) {
+            clonedContact.addresses[i].id = null;
+        }
+    }
+    if (clonedContact.ims) {
+        for (i = 0; i < clonedContact.ims.length; i++) {
+            clonedContact.ims[i].id = null;
+        }
+    }
+    if (clonedContact.organizations) {
+        for (i = 0; i < clonedContact.organizations.length; i++) {
+            clonedContact.organizations[i].id = null;
+        }
+    }
+    if (clonedContact.categories) {
+        for (i = 0; i < clonedContact.categories.length; i++) {
+            clonedContact.categories[i].id = null;
+        }
+    }
+    if (clonedContact.photos) {
+        for (i = 0; i < clonedContact.photos.length; i++) {
+            clonedContact.photos[i].id = null;
+        }
+    }
+    if (clonedContact.urls) {
+        for (i = 0; i < clonedContact.urls.length; i++) {
+            clonedContact.urls[i].id = null;
+        }
+    }
+    return clonedContact;
+};
+
+/**
+* Persists contact to device storage.
+* @param successCB success callback
+* @param errorCB error callback
+*/
+Contact.prototype.save = function(successCB, errorCB) {
+  var fail = function(code) {
+      errorCB(new ContactError(code));
+  };
+    var success = function(result) {
+      if (result) {
+          if (typeof successCB === 'function') {
+              var fullContact = require('cordova/plugin/contacts').create(result);
+              successCB(convertIn(fullContact));
+          }
+      }
+      else {
+          // no Entry object returned
+          fail(ContactError.UNKNOWN_ERROR);
+      }
+  };
+    var dupContact = convertOut(utils.clone(this));
+    exec(success, fail, "Contacts", "save", [dupContact]);
+};
+
+
+module.exports = Contact;
+});
+
+// file: lib\common\plugin\ContactAddress.js
+define("cordova/plugin/ContactAddress", function(require, exports, module) {
+/**
+* Contact address.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code
+* @param formatted // NOTE: not a W3C standard
+* @param streetAddress
+* @param locality
+* @param region
+* @param postalCode
+* @param country
+*/
+
+var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) {
+    this.id = null;
+    this.pref = (typeof pref != 'undefined' ? pref : false);
+    this.type = type || null;
+    this.formatted = formatted || null;
+    this.streetAddress = streetAddress || null;
+    this.locality = locality || null;
+    this.region = region || null;
+    this.postalCode = postalCode || null;
+    this.country = country || null;
+};
+
+module.exports = ContactAddress;
+});
+
+// file: lib\common\plugin\ContactError.js
+define("cordova/plugin/ContactError", function(require, exports, module) {
+/**
+ *  ContactError.
+ *  An error code assigned by an implementation when an error has occured
+ * @constructor
+ */
+var ContactError = function(err) {
+    this.code = (typeof err != 'undefined' ? err : null);
+};
+
+/**
+ * Error codes
+ */
+ContactError.UNKNOWN_ERROR = 0;
+ContactError.INVALID_ARGUMENT_ERROR = 1;
+ContactError.TIMEOUT_ERROR = 2;
+ContactError.PENDING_OPERATION_ERROR = 3;
+ContactError.IO_ERROR = 4;
+ContactError.NOT_SUPPORTED_ERROR = 5;
+ContactError.PERMISSION_DENIED_ERROR = 20;
+
+module.exports = ContactError;
+});
+
+// file: lib\common\plugin\ContactField.js
+define("cordova/plugin/ContactField", function(require, exports, module) {
+/**
+* Generic contact field.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code // NOTE: not a W3C standard
+* @param type
+* @param value
+* @param pref
+*/
+var ContactField = function(type, value, pref) {
+    this.id = null;
+    this.type = type || null;
+    this.value = value || null;
+    this.pref = (typeof pref != 'undefined' ? pref : false);
+};
+
+module.exports = ContactField;
+});
+
+// file: lib\common\plugin\ContactFindOptions.js
+define("cordova/plugin/ContactFindOptions", function(require, exports, module) {
+/**
+ * ContactFindOptions.
+ * @constructor
+ * @param filter used to match contacts against
+ * @param multiple boolean used to determine if more than one contact should be returned
+ */
+
+var ContactFindOptions = function(filter, multiple) {
+    this.filter = filter || '';
+    this.multiple = (typeof multiple != 'undefined' ? multiple : false);
+};
+
+module.exports = ContactFindOptions;
+});
+
+// file: lib\common\plugin\ContactName.js
+define("cordova/plugin/ContactName", function(require, exports, module) {
+/**
+* Contact name.
+* @constructor
+* @param formatted // NOTE: not part of W3C standard
+* @param familyName
+* @param givenName
+* @param middle
+* @param prefix
+* @param suffix
+*/
+var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
+    this.formatted = formatted || null;
+    this.familyName = familyName || null;
+    this.givenName = givenName || null;
+    this.middleName = middle || null;
+    this.honorificPrefix = prefix || null;
+    this.honorificSuffix = suffix || null;
+};
+
+module.exports = ContactName;
+});
+
+// file: lib\common\plugin\ContactOrganization.js
+define("cordova/plugin/ContactOrganization", function(require, exports, module) {
+/**
+* Contact organization.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code // NOTE: not a W3C standard
+* @param name
+* @param dept
+* @param title
+* @param startDate
+* @param endDate
+* @param location
+* @param desc
+*/
+
+var ContactOrganization = function(pref, type, name, dept, title) {
+    this.id = null;
+    this.pref = (typeof pref != 'undefined' ? pref : false);
+    this.type = type || null;
+    this.name = name || null;
+    this.department = dept || null;
+    this.title = title || null;
+};
+
+module.exports = ContactOrganization;
+});
+
+// file: lib\common\plugin\Coordinates.js
+define("cordova/plugin/Coordinates", function(require, exports, module) {
+/**
+ * This class contains position information.
+ * @param {Object} lat
+ * @param {Object} lng
+ * @param {Object} alt
+ * @param {Object} acc
+ * @param {Object} head
+ * @param {Object} vel
+ * @param {Object} altacc
+ * @constructor
+ */
+var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
+    /**
+     * The latitude of the position.
+     */
+    this.latitude = lat;
+    /**
+     * The longitude of the position,
+     */
+    this.longitude = lng;
+    /**
+     * The accuracy of the position.
+     */
+    this.accuracy = acc;
+    /**
+     * The altitude of the position.
+     */
+    this.altitude = alt;
+    /**
+     * The direction the device is moving at the position.
+     */
+    this.heading = head;
+    /**
+     * The velocity with which the device is moving at the position.
+     */
+    this.speed = vel;
+    /**
+     * The altitude accuracy of the position.
+     */
+    this.altitudeAccuracy = (altacc !== undefined) ? altacc : null;
+};
+
+module.exports = Coordinates;
+});
+
+// file: lib\common\plugin\DirectoryEntry.js
+define("cordova/plugin/DirectoryEntry", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    Entry = require('cordova/plugin/Entry'),
+    FileError = require('cordova/plugin/FileError'),
+    DirectoryReader = require('cordova/plugin/DirectoryReader');
+
+/**
+ * An interface representing a directory on the file system.
+ *
+ * {boolean} isFile always false (readonly)
+ * {boolean} isDirectory always true (readonly)
+ * {DOMString} name of the directory, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the directory (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+var DirectoryEntry = function(name, fullPath) {
+     DirectoryEntry.__super__.constructor.apply(this, [false, true, name, fullPath]);
+};
+
+utils.extend(DirectoryEntry, Entry);
+
+/**
+ * Creates a new DirectoryReader to read entries from this directory
+ */
+DirectoryEntry.prototype.createReader = function() {
+    return new DirectoryReader(this.fullPath);
+};
+
+/**
+ * Creates or looks up a directory
+ *
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
+ * @param {Flags} options to create or excluively create the directory
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var entry = new DirectoryEntry(result.name, result.fullPath);
+        successCallback(entry);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getDirectory", [this.fullPath, path, options]);
+};
+
+/**
+ * Deletes a directory and all of it's contents
+ *
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(successCallback, fail, "File", "removeRecursively", [this.fullPath]);
+};
+
+/**
+ * Creates or looks up a file
+ *
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
+ * @param {Flags} options to create or excluively create the file
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var FileEntry = require('cordova/plugin/FileEntry');
+        var entry = new FileEntry(result.name, result.fullPath);
+        successCallback(entry);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getFile", [this.fullPath, path, options]);
+};
+
+module.exports = DirectoryEntry;
+
+});
+
+// file: lib\common\plugin\DirectoryReader.js
+define("cordova/plugin/DirectoryReader", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError') ;
+
+/**
+ * An interface that lists the files and directories in a directory.
+ */
+function DirectoryReader(path) {
+    this.path = path || null;
+}
+
+/**
+ * Returns a list of entries from a directory.
+ *
+ * @param {Function} successCallback is called with a list of entries
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var retVal = [];
+        for (var i=0; i<result.length; i++) {
+            var entry = null;
+            if (result[i].isDirectory) {
+                entry = new (require('cordova/plugin/DirectoryEntry'))();
+            }
+            else if (result[i].isFile) {
+                entry = new (require('cordova/plugin/FileEntry'))();
+            }
+            entry.isDirectory = result[i].isDirectory;
+            entry.isFile = result[i].isFile;
+            entry.name = result[i].name;
+            entry.fullPath = result[i].fullPath;
+            retVal.push(entry);
+        }
+        successCallback(retVal);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "readEntries", [this.path]);
+};
+
+module.exports = DirectoryReader;
+
+});
+
+// file: lib\common\plugin\Entry.js
+define("cordova/plugin/Entry", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError'),
+    Metadata = require('cordova/plugin/Metadata');
+
+/**
+ * Represents a file or directory on the local file system.
+ *
+ * @param isFile
+ *            {boolean} true if Entry is a file (readonly)
+ * @param isDirectory
+ *            {boolean} true if Entry is a directory (readonly)
+ * @param name
+ *            {DOMString} name of the file or directory, excluding the path
+ *            leading to it (readonly)
+ * @param fullPath
+ *            {DOMString} the absolute full path to the file or directory
+ *            (readonly)
+ */
+function Entry(isFile, isDirectory, name, fullPath, fileSystem) {
+    this.isFile = (typeof isFile != 'undefined'?isFile:false);
+    this.isDirectory = (typeof isDirectory != 'undefined'?isDirectory:false);
+    this.name = name || '';
+    this.fullPath = fullPath || '';
+    this.filesystem = fileSystem || null;
+}
+
+/**
+ * Look up the metadata of the entry.
+ *
+ * @param successCallback
+ *            {Function} is called with a Metadata object
+ * @param errorCallback
+ *            {Function} is called with a FileError
+ */
+Entry.prototype.getMetadata = function(successCallback, errorCallback) {
+  var success = typeof successCallback !== 'function' ? null : function(lastModified) {
+      var metadata = new Metadata(lastModified);
+      successCallback(metadata);
+  };
+  var fail = typeof errorCallback !== 'function' ? null : function(code) {
+      errorCallback(new FileError(code));
+  };
+
+  exec(success, fail, "File", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Move a file or directory to a new location.
+ *
+ * @param parent
+ *            {DirectoryEntry} the directory to which to move this entry
+ * @param newName
+ *            {DOMString} new name of the entry, defaults to the current name
+ * @param successCallback
+ *            {Function} called with the new DirectoryEntry object
+ * @param errorCallback
+ *            {Function} called with a FileError
+ */
+Entry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+    // user must specify parent Entry
+    if (!parent) {
+        fail(FileError.NOT_FOUND_ERR);
+        return;
+    }
+    // source path
+    var srcPath = this.fullPath,
+        // entry name
+        name = newName || this.name,
+        success = function(entry) {
+            if (entry) {
+                if (typeof successCallback === 'function') {
+                    // create appropriate Entry object
+                    var result = (entry.isDirectory) ? new (require('cordova/plugin/DirectoryEntry'))(entry.name, entry.fullPath) : new (require('cordova/plugin/FileEntry'))(entry.name, entry.fullPath);
+                    try {
+                        successCallback(result);
+                    }
+                    catch (e) {
+                        console.log('Error invoking callback: ' + e);
+                    }
+                }
+            }
+            else {
+                // no Entry object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+
+    // copy
+    exec(success, fail, "File", "moveTo", [srcPath, parent.fullPath, name]);
+};
+
+/**
+ * Copy a directory to a different location.
+ *
+ * @param parent
+ *            {DirectoryEntry} the directory to which to copy the entry
+ * @param newName
+ *            {DOMString} new name of the entry, defaults to the current name
+ * @param successCallback
+ *            {Function} called with the new Entry object
+ * @param errorCallback
+ *            {Function} called with a FileError
+ */
+Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+
+    // user must specify parent Entry
+    if (!parent) {
+        fail(FileError.NOT_FOUND_ERR);
+        return;
+    }
+
+        // source path
+    var srcPath = this.fullPath,
+        // entry name
+        name = newName || this.name,
+        // success callback
+        success = function(entry) {
+            if (entry) {
+                if (typeof successCallback === 'function') {
+                    // create appropriate Entry object
+                    var result = (entry.isDirectory) ? new (require('cordova/plugin/DirectoryEntry'))(entry.name, entry.fullPath) : new (require('cordova/plugin/FileEntry'))(entry.name, entry.fullPath);
+                    try {
+                        successCallback(result);
+                    }
+                    catch (e) {
+                        console.log('Error invoking callback: ' + e);
+                    }
+                }
+            }
+            else {
+                // no Entry object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+
+    // copy
+    exec(success, fail, "File", "copyTo", [srcPath, parent.fullPath, name]);
+};
+
+/**
+ * Return a URL that can be used to identify this entry.
+ */
+Entry.prototype.toURL = function() {
+    // fullPath attribute contains the full URL
+    return this.fullPath;
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ *
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @return uri
+ */
+Entry.prototype.toURI = function(mimeType) {
+    console.log("DEPRECATED: Update your code to use 'toURL'");
+    // fullPath attribute contains the full URI
+    return this.fullPath;
+};
+
+/**
+ * Remove a file or directory. It is an error to attempt to delete a
+ * directory that is not empty. It is an error to attempt to delete a
+ * root directory of a file system.
+ *
+ * @param successCallback {Function} called with no parameters
+ * @param errorCallback {Function} called with a FileError
+ */
+Entry.prototype.remove = function(successCallback, errorCallback) {
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(successCallback, fail, "File", "remove", [this.fullPath]);
+};
+
+/**
+ * Look up the parent DirectoryEntry of this entry.
+ *
+ * @param successCallback {Function} called with the parent DirectoryEntry object
+ * @param errorCallback {Function} called with a FileError
+ */
+Entry.prototype.getParent = function(successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(result) {
+        var DirectoryEntry = require('cordova/plugin/DirectoryEntry');
+        var entry = new DirectoryEntry(result.name, result.fullPath);
+        successCallback(entry);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getParent", [this.fullPath]);
+};
+
+module.exports = Entry;
+});
+
+// file: lib\common\plugin\File.js
+define("cordova/plugin/File", function(require, exports, module) {
+/**
+ * Constructor.
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+
+var File = function(name, fullPath, type, lastModifiedDate, size){
+    this.name = name || '';
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
+};
+
+module.exports = File;
+});
+
+// file: lib\common\plugin\FileEntry.js
+define("cordova/plugin/FileEntry", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    Entry = require('cordova/plugin/Entry'),
+    FileWriter = require('cordova/plugin/FileWriter'),
+    File = require('cordova/plugin/File'),
+    FileError = require('cordova/plugin/FileError');
+
+/**
+ * An interface representing a file on the file system.
+ *
+ * {boolean} isFile always true (readonly)
+ * {boolean} isDirectory always false (readonly)
+ * {DOMString} name of the file, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the file (readonly)
+ * {FileSystem} filesystem on which the file resides (readonly)
+ */
+var FileEntry = function(name, fullPath) {
+     FileEntry.__super__.constructor.apply(this, [true, false, name, fullPath]);
+};
+
+utils.extend(FileEntry, Entry);
+
+/**
+ * Creates a new FileWriter associated with the file that this FileEntry represents.
+ *
+ * @param {Function} successCallback is called with the new FileWriter
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
+    this.file(function(filePointer) {
+        var writer = new FileWriter(filePointer);
+
+        if (writer.fileName === null || writer.fileName === "") {
+            if (typeof errorCallback === "function") {
+                errorCallback(new FileError(FileError.INVALID_STATE_ERR));
+            }
+        } else {
+            if (typeof successCallback === "function") {
+                successCallback(writer);
+            }
+        }
+    }, errorCallback);
+};
+
+/**
+ * Returns a File that represents the current state of the file that this FileEntry represents.
+ *
+ * @param {Function} successCallback is called with the new File object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.file = function(successCallback, errorCallback) {
+    var win = typeof successCallback !== 'function' ? null : function(f) {
+        var file = new File(f.name, f.fullPath, f.type, f.lastModifiedDate, f.size);
+        successCallback(file);
+    };
+    var fail = typeof errorCallback !== 'function' ? null : function(code) {
+        errorCallback(new FileError(code));
+    };
+    exec(win, fail, "File", "getFileMetadata", [this.fullPath]);
+};
+
+
+module.exports = FileEntry;
+});
+
+// file: lib\common\plugin\FileError.js
+define("cordova/plugin/FileError", function(require, exports, module) {
+/**
+ * FileError
+ */
+function FileError(error) {
+  this.code = error || null;
+}
+
+// File error codes
+// Found in DOMException
+FileError.NOT_FOUND_ERR = 1;
+FileError.SECURITY_ERR = 2;
+FileError.ABORT_ERR = 3;
+
+// Added by File API specification
+FileError.NOT_READABLE_ERR = 4;
+FileError.ENCODING_ERR = 5;
+FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
+FileError.INVALID_STATE_ERR = 7;
+FileError.SYNTAX_ERR = 8;
+FileError.INVALID_MODIFICATION_ERR = 9;
+FileError.QUOTA_EXCEEDED_ERR = 10;
+FileError.TYPE_MISMATCH_ERR = 11;
+FileError.PATH_EXISTS_ERR = 12;
+
+module.exports = FileError;
+});
+
+// file: lib\common\plugin\FileReader.js
+define("cordova/plugin/FileReader", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError'),
+    ProgressEvent = require('cordova/plugin/ProgressEvent');
+
+/**
+ * This class reads the mobile device file system.
+ *
+ * For Android:
+ *      The root directory is the root of the file system.
+ *      To read from the SD card, the file name is "sdcard/my_file.txt"
+ * @constructor
+ */
+var FileReader = function() {
+    this.fileName = "";
+
+    this.readyState = 0; // FileReader.EMPTY
+
+    // File data
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onloadstart = null;    // When the read starts.
+    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
+    this.onload = null;         // When the read has successfully completed.
+    this.onerror = null;        // When the read has failed (see errors).
+    this.onloadend = null;      // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
+};
+
+// States
+FileReader.EMPTY = 0;
+FileReader.LOADING = 1;
+FileReader.DONE = 2;
+
+/**
+ * Abort reading file.
+ */
+FileReader.prototype.abort = function() {
+    this.result = null;
+
+    if (this.readyState == FileReader.DONE || this.readyState == FileReader.EMPTY) {
+      return;
+    }
+
+    this.readyState = FileReader.DONE;
+
+    // If abort callback
+    if (typeof this.onabort === 'function') {
+        this.onabort(new ProgressEvent('abort', {target:this}));
+    }
+    // If load end callback
+    if (typeof this.onloadend === 'function') {
+        this.onloadend(new ProgressEvent('loadend', {target:this}));
+    }
+};
+
+/**
+ * Read text file.
+ *
+ * @param file          {File} File object containing file properties
+ * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
+ */
+FileReader.prototype.readAsText = function(file, encoding) {
+    // Figure out pathing
+    this.fileName = '';
+    if (typeof file.fullPath === 'undefined') {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // Already loading something
+    if (this.readyState == FileReader.LOADING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        this.onloadstart(new ProgressEvent("loadstart", {target:this}));
+    }
+
+    // Default encoding is UTF-8
+    var enc = encoding ? encoding : "UTF-8";
+
+    var me = this;
+
+    // Read file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                me.onload(new ProgressEvent("load", {target:me}));
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // null result
+            me.result = null;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {target:me}));
+            }
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        }, "File", "readAsText", [this.fileName, enc]);
+};
+
+
+/**
+ * Read file and return data as a base64 encoded data url.
+ * A data url is of the form:
+ *      data:[<mediatype>][;base64],<data>
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsDataURL = function(file) {
+    this.fileName = "";
+    if (typeof file.fullPath === "undefined") {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // Already loading something
+    if (this.readyState == FileReader.LOADING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        this.onloadstart(new ProgressEvent("loadstart", {target:this}));
+    }
+
+    var me = this;
+
+    // Read file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                me.onload(new ProgressEvent("load", {target:me}));
+            }
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            me.result = null;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {target:me}));
+            }
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend(new ProgressEvent("loadend", {target:me}));
+            }
+        }, "File", "readAsDataURL", [this.fileName]);
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsBinaryString = function(file) {
+    // TODO - Can't return binary data to browser.
+    console.log('method "readAsBinaryString" is not supported at this time.');
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsArrayBuffer = function(file) {
+    // TODO - Can't return binary data to browser.
+    console.log('This method is not supported at this time.');
+};
+
+module.exports = FileReader;
+});
+
+// file: lib\common\plugin\FileSystem.js
+define("cordova/plugin/FileSystem", function(require, exports, module) {
+var DirectoryEntry = require('cordova/plugin/DirectoryEntry');
+
+/**
+ * An interface representing a file system
+ *
+ * @constructor
+ * {DOMString} name the unique name of the file system (readonly)
+ * {DirectoryEntry} root directory of the file system (readonly)
+ */
+var FileSystem = function(name, root) {
+    this.name = name || null;
+    if (root) {
+        this.root = new DirectoryEntry(root.name, root.fullPath);
+    }
+};
+
+module.exports = FileSystem;
+});
+
+// file: lib\common\plugin\FileTransfer.js
+define("cordova/plugin/FileTransfer", function(require, exports, module) {
+var exec = require('cordova/exec');
+
+/**
+ * FileTransfer uploads a file to a remote server.
+ * @constructor
+ */
+var FileTransfer = function() {};
+
+/**
+* Given an absolute file path, uploads a file on the device to a remote server
+* using a multipart HTTP request.
+* @param filePath {String}           Full path of the file on the device
+* @param server {String}             URL of the server to receive the file
+* @param successCallback (Function}  Callback to be invoked when upload has completed
+* @param errorCallback {Function}    Callback to be invoked upon error
+* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
+* @param trustAllHosts {Boolean} Optional trust all hosts (e.g. for self-signed certs), defaults to false
+*/
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) {
+    // check for options
+    var fileKey = null;
+    var fileName = null;
+    var mimeType = null;
+    var params = null;
+    var chunkedMode = true;
+    if (options) {
+        fileKey = options.fileKey;
+        fileName = options.fileName;
+        mimeType = options.mimeType;
+        if (options.chunkedMode !== null || typeof options.chunkedMode !== "undefined") {
+            chunkedMode = options.chunkedMode;
+        }
+        if (options.params) {
+            params = options.params;
+        }
+        else {
+            params = {};
+        }
+    }
+
+    exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode]);
+};
+
+/**
+ * Downloads a file form a given URL and saves it to the specified directory.
+ * @param source {String}          URL of the server to receive the file
+ * @param target {String}         Full path of the file on the device
+ * @param successCallback (Function}  Callback to be invoked when upload has completed
+ * @param errorCallback {Function}    Callback to be invoked upon error
+ */
+FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
+    var win = function(result) {
+        var entry = null;
+        if (result.isDirectory) {
+            entry = new (require('cordova/plugin/DirectoryEntry'))();
+        }
+        else if (result.isFile) {
+            entry = new (require('cordova/plugin/FileEntry'))();
+        }
+        entry.isDirectory = result.isDirectory;
+        entry.isFile = result.isFile;
+        entry.name = result.name;
+        entry.fullPath = result.fullPath;
+        successCallback(entry);
+    };
+    exec(win, errorCallback, 'FileTransfer', 'download', [source, target]);
+};
+
+module.exports = FileTransfer;
+
+});
+
+// file: lib\common\plugin\FileTransferError.js
+define("cordova/plugin/FileTransferError", function(require, exports, module) {
+/**
+ * FileTransferError
+ * @constructor
+ */
+var FileTransferError = function(code) {
+    this.code = code || null;
+};
+
+FileTransferError.FILE_NOT_FOUND_ERR = 1;
+FileTransferError.INVALID_URL_ERR = 2;
+FileTransferError.CONNECTION_ERR = 3;
+
+module.exports = FileTransferError;
+});
+
+// file: lib\common\plugin\FileUploadOptions.js
+define("cordova/plugin/FileUploadOptions", function(require, exports, module) {
+/**
+ * Options to customize the HTTP request used to upload files.
+ * @constructor
+ * @param fileKey {String}   Name of file request parameter.
+ * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
+ * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
+ * @param params {Object}    Object with key: value params to send to the server.
+ */
+var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
+    this.fileKey = fileKey || null;
+    this.fileName = fileName || null;
+    this.mimeType = mimeType || null;
+    this.params = params || null;
+};
+
+module.exports = FileUploadOptions;
+});
+
+// file: lib\common\plugin\FileUploadResult.js
+define("cordova/plugin/FileUploadResult", function(require, exports, module) {
+/**
+ * FileUploadResult
+ * @constructor
+ */
+var FileUploadResult = function() {
+    this.bytesSent = 0;
+    this.responseCode = null;
+    this.response = null;
+};
+
+module.exports = FileUploadResult;
+});
+
+// file: lib\common\plugin\FileWriter.js
+define("cordova/plugin/FileWriter", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    FileError = require('cordova/plugin/FileError'),
+    ProgressEvent = require('cordova/plugin/ProgressEvent');
+
+/**
+ * This class writes to the mobile device file system.
+ *
+ * For Android:
+ *      The root directory is the root of the file system.
+ *      To write to the SD card, the file name is "sdcard/my_file.txt"
+ *
+ * @constructor
+ * @param file {File} File object containing file properties
+ * @param append if true write to the end of the file, otherwise overwrite the file
+ */
+var FileWriter = function(file) {
+    this.fileName = "";
+    this.length = 0;
+    if (file) {
+        this.fileName = file.fullPath || file;
+        this.length = file.size || 0;
+    }
+    // default is to write at the beginning of the file
+    this.position = 0;
+
+    this.readyState = 0; // EMPTY
+
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onwritestart = null;   // When writing starts
+    this.onprogress = null;     // While writing the file, and reporting partial file data
+    this.onwrite = null;        // When the write has successfully completed.
+    this.onwriteend = null;     // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
+    this.onerror = null;        // When the write has failed (see errors).
+};
+
+// States
+FileWriter.INIT = 0;
+FileWriter.WRITING = 1;
+FileWriter.DONE = 2;
+
+/**
+ * Abort writing file.
+ */
+FileWriter.prototype.abort = function() {
+    // check for invalid state
+    if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // set error
+    this.error = new FileError(FileError.ABORT_ERR);
+
+    this.readyState = FileWriter.DONE;
+
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        this.onabort(new ProgressEvent("abort", {"target":this}));
+    }
+
+    // If write end callback
+    if (typeof this.onwriteend === "function") {
+        this.onwriteend(new ProgressEvent("writeend", {"target":this}));
+    }
+};
+
+/**
+ * Writes data to the file
+ *
+ * @param text to be written
+ */
+FileWriter.prototype.write = function(text) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        me.onwritestart(new ProgressEvent("writestart", {"target":me}));
+    }
+
+    // Write file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // position always increases by bytes written because file would be extended
+            me.position += r;
+            // The length of the file is now where we are done writing.
+
+            me.length = me.position;
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                me.onwrite(new ProgressEvent("write", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        }, "File", "write", [this.fileName, text, this.position]);
+};
+
+/**
+ * Moves the file pointer to the location specified.
+ *
+ * If the offset is a negative number the position of the file
+ * pointer is rewound.  If the offset is greater than the file
+ * size the position is set to the end of the file.
+ *
+ * @param offset is the location to move the file pointer to.
+ */
+FileWriter.prototype.seek = function(offset) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    if (!offset && offset !== 0) {
+        return;
+    }
+
+    // See back from end of file.
+    if (offset < 0) {
+        this.position = Math.max(offset + this.length, 0);
+    }
+    // Offset is bigger then file size so set position
+    // to the end of the file.
+    else if (offset > this.length) {
+        this.position = this.length;
+    }
+    // Offset is between 0 and file size so set the position
+    // to start writing.
+    else {
+        this.position = offset;
+    }
+};
+
+/**
+ * Truncates the file to the size specified.
+ *
+ * @param size to chop the file at.
+ */
+FileWriter.prototype.truncate = function(size) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw new FileError(FileError.INVALID_STATE_ERR);
+    }
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        me.onwritestart(new ProgressEvent("writestart", {"target":this}));
+    }
+
+    // Write file
+    exec(
+        // Success callback
+        function(r) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // Update the length of the file
+            me.length = r;
+            me.position = Math.min(me.position, r);
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                me.onwrite(new ProgressEvent("write", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        },
+        // Error callback
+        function(e) {
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // Save error
+            me.error = new FileError(e);
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror(new ProgressEvent("error", {"target":me}));
+            }
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend(new ProgressEvent("writeend", {"target":me}));
+            }
+        }, "File", "truncate", [this.fileName, size]);
+};
+
+module.exports = FileWriter;
+
+});
+
+// file: lib\common\plugin\Flags.js
+define("cordova/plugin/Flags", function(require, exports, module) {
+/**
+ * Supplies arguments to methods that lookup or create files and directories.
+ *
+ * @param create
+ *            {boolean} file or directory if it doesn't exist
+ * @param exclusive
+ *            {boolean} used with create; if true the command will fail if
+ *            target path exists
+ */
+function Flags(create, exclusive) {
+    this.create = create || false;
+    this.exclusive = exclusive || false;
+}
+
+module.exports = Flags;
+});
+
+// file: lib\common\plugin\LocalFileSystem.js
+define("cordova/plugin/LocalFileSystem", function(require, exports, module) {
+var exec = require('cordova/exec');
+
+/**
+ * Represents a local file system.
+ */
+var LocalFileSystem = function() {
+
+};
+
+LocalFileSystem.TEMPORARY = 0; //temporary, with no guarantee of persistence
+LocalFileSystem.PERSISTENT = 1; //persistent
+
+module.exports = LocalFileSystem;
+});
+
+// file: lib\common\plugin\Media.js
+define("cordova/plugin/Media", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec');
+
+var mediaObjects = {};
+
+/**
+ * This class provides access to the device media, interfaces to both sound and video
+ *
+ * @constructor
+ * @param src                   The file name or url to play
+ * @param successCallback       The callback to be called when the file is done playing or recording.
+ *                                  successCallback()
+ * @param errorCallback         The callback to be called if there is an error.
+ *                                  errorCallback(int errorCode) - OPTIONAL
+ * @param statusCallback        The callback to be called when media status has changed.
+ *                                  statusCallback(int statusCode) - OPTIONAL
+ */
+var Media = function(src, successCallback, errorCallback, statusCallback) {
+
+    // successCallback optional
+    if (successCallback && (typeof successCallback !== "function")) {
+        console.log("Media Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Media Error: errorCallback is not a function");
+        return;
+    }
+
+    // statusCallback optional
+    if (statusCallback && (typeof statusCallback !== "function")) {
+        console.log("Media Error: statusCallback is not a function");
+        return;
+    }
+
+    this.id = utils.createUUID();
+    mediaObjects[this.id] = this;
+    this.src = src;
+    this.successCallback = successCallback;
+    this.errorCallback = errorCallback;
+    this.statusCallback = statusCallback;
+    this._duration = -1;
+    this._position = -1;
+    exec(null, this.errorCallback, "Media", "create", [this.id, this.src]);
+};
+
+// Media messages
+Media.MEDIA_STATE = 1;
+Media.MEDIA_DURATION = 2;
+Media.MEDIA_POSITION = 3;
+Media.MEDIA_ERROR = 9;
+
+// Media states
+Media.MEDIA_NONE = 0;
+Media.MEDIA_STARTING = 1;
+Media.MEDIA_RUNNING = 2;
+Media.MEDIA_PAUSED = 3;
+Media.MEDIA_STOPPED = 4;
+Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
+
+// "static" function to return existing objs.
+Media.get = function(id) {
+    return mediaObjects[id];
+};
+
+/**
+ * Start or resume playing audio file.
+ */
+Media.prototype.play = function(options) {
+    exec(null, null, "Media", "startPlayingAudio", [this.id, this.src, options]);
+};
+
+/**
+ * Stop playing audio file.
+ */
+Media.prototype.stop = function() {
+    var me = this;
+    exec(function() {
+        me._position = 0;
+        me.successCallback();
+    }, this.errorCallback, "Media", "stopPlayingAudio", [this.id]);
+};
+
+/**
+ * Seek or jump to a new time in the track..
+ */
+Media.prototype.seekTo = function(milliseconds) {
+    var me = this;
+    exec(function(p) {
+        me._position = p;
+    }, this.errorCallback, "Media", "seekToAudio", [this.id, milliseconds]);
+};
+
+/**
+ * Pause playing audio file.
+ */
+Media.prototype.pause = function() {
+    exec(null, this.errorCallback, "Media", "pausePlayingAudio", [this.id]);
+};
+
+/**
+ * Get duration of an audio file.
+ * The duration is only set for audio that is playing, paused or stopped.
+ *
+ * @return      duration or -1 if not known.
+ */
+Media.prototype.getDuration = function() {
+    return this._duration;
+};
+
+/**
+ * Get position of audio.
+ */
+Media.prototype.getCurrentPosition = function(success, fail) {
+    var me = this;
+    exec(function(p) {
+        me._position = p;
+        success(p);
+    }, fail, "Media", "getCurrentPositionAudio", [this.id]);
+};
+
+/**
+ * Start recording audio file.
+ */
+Media.prototype.startRecord = function() {
+    exec(this.successCallback, this.errorCallback, "Media", "startRecordingAudio", [this.id, this.src]);
+};
+
+/**
+ * Stop recording audio file.
+ */
+Media.prototype.stopRecord = function() {
+    exec(this.successCallback, this.errorCallback, "Media", "stopRecordingAudio", [this.id]);
+};
+
+/**
+ * Release the resources.
+ */
+Media.prototype.release = function() {
+    exec(null, this.errorCallback, "Media", "release", [this.id]);
+};
+
+/**
+ * Adjust the volume.
+ */
+Media.prototype.setVolume = function(volume) {
+    exec(null, null, "Media", "setVolume", [this.id, volume]);
+};
+
+/**
+ * Audio has status update.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ * @param status        The status code (int)
+ * @param msg           The status message (string)
+ */
+Media.onStatus = function(id, msg, value) {
+    var media = mediaObjects[id];
+    // If state update
+    if (msg === Media.MEDIA_STATE) {
+        if (value === Media.MEDIA_STOPPED) {
+            if (media.successCallback) {
+                media.successCallback();
+            }
+        }
+        if (media.statusCallback) {
+            media.statusCallback(value);
+        }
+    }
+    else if (msg === Media.MEDIA_DURATION) {
+        media._duration = value;
+    }
+    else if (msg === Media.MEDIA_ERROR) {
+        if (media.errorCallback) {
+            // value should be a MediaError object when msg == MEDIA_ERROR
+            media.errorCallback(value);
+        }
+    }
+    else if (msg === Media.MEDIA_POSITION) {
+        media._position = value;
+    }
+};
+
+module.exports = Media;
+});
+
+// file: lib\common\plugin\MediaError.js
+define("cordova/plugin/MediaError", function(require, exports, module) {
+/**
+ * This class contains information about any Media errors.
+ * @constructor
+ */
+var MediaError = function(code, msg) {
+    this.code = (code !== undefined ? code : null);
+    this.message = msg || "";
+};
+
+MediaError.MEDIA_ERR_NONE_ACTIVE    = 0;
+MediaError.MEDIA_ERR_ABORTED        = 1;
+MediaError.MEDIA_ERR_NETWORK        = 2;
+MediaError.MEDIA_ERR_DECODE         = 3;
+MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
+
+module.exports = MediaError;
+});
+
+// file: lib\common\plugin\MediaFile.js
+define("cordova/plugin/MediaFile", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    File = require('cordova/plugin/File'),
+    CaptureError = require('cordova/plugin/CaptureError');
+/**
+ * Represents a single file.
+ *
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+var MediaFile = function(name, fullPath, type, lastModifiedDate, size){
+  MediaFile.__super__.constructor.apply(this, arguments);
+};
+
+utils.extend(MediaFile, File);
+
+/**
+ * Request capture format data for a specific file and type
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ */
+MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
+    if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+        errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+    } else {
+    exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
+    }
+};
+
+/**
+ * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
+ * (used in Objective-C and Android)
+ *
+ * @param {PluginResult} pluginResult
+ */
+MediaFile.cast = function(pluginResult) {
+  var mediaFiles = [];
+  var i;
+  for (i=0; i<pluginResult.message.length; i++) {
+    var mediaFile = new MediaFile();
+    mediaFile.name = pluginResult.message[i].name;
+    mediaFile.fullPath = pluginResult.message[i].fullPath;
+    mediaFile.type = pluginResult.message[i].type;
+    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
+    mediaFile.size = pluginResult.message[i].size;
+    mediaFiles.push(mediaFile);
+  }
+  pluginResult.message = mediaFiles;
+  return pluginResult;
+};
+
+module.exports = MediaFile;
+});
+
+// file: lib\common\plugin\MediaFileData.js
+define("cordova/plugin/MediaFileData", function(require, exports, module) {
+/**
+ * MediaFileData encapsulates format information of a media file.
+ *
+ * @param {DOMString} codecs
+ * @param {long} bitrate
+ * @param {long} height
+ * @param {long} width
+ * @param {float} duration
+ */
+var MediaFileData = function(codecs, bitrate, height, width, duration){
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
+};
+
+module.exports = MediaFileData;
+});
+
+// file: lib\common\plugin\Metadata.js
+define("cordova/plugin/Metadata", function(require, exports, module) {
+/**
+ * Information about the state of the file or directory
+ *
+ * {Date} modificationTime (readonly)
+ */
+var Metadata = function(time) {
+    this.modificationTime = (typeof time != 'undefined'?new Date(time):null);
+};
+
+module.exports = Metadata;
+});
+
+// file: lib\common\plugin\Position.js
+define("cordova/plugin/Position", function(require, exports, module) {
+var Coordinates = require('cordova/plugin/Coordinates');
+
+var Position = function(coords, timestamp) {
+    this.coords = new Coordinates(coords.latitude, coords.longitude, coords.altitude, coords.accuracy, coords.heading, coords.velocity, coords.altitudeAccuracy);
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
+};
+
+module.exports = Position;
+});
+
+// file: lib\common\plugin\PositionError.js
+define("cordova/plugin/PositionError", function(require, exports, module) {
+/**
+ * Position error object
+ *
+ * @constructor
+ * @param code
+ * @param message
+ */
+var PositionError = function(code, message) {
+    this.code = code || null;
+    this.message = message || '';
+};
+
+PositionError.PERMISSION_DENIED = 1;
+PositionError.POSITION_UNAVAILABLE = 2;
+PositionError.TIMEOUT = 3;
+
+module.exports = PositionError;
+});
+
+// file: lib\common\plugin\ProgressEvent.js
+define("cordova/plugin/ProgressEvent", function(require, exports, module) {
+// If ProgressEvent exists in global context, use it already, otherwise use our own polyfill
+// Feature test: See if we can instantiate a native ProgressEvent;
+// if so, use that approach,
+// otherwise fill-in with our own implementation.
+//
+// NOTE: right now we always fill in with our own. Down the road would be nice if we can use whatever is native in the webview.
+var ProgressEvent = (function() {
+    /*
+    var createEvent = function(data) {
+        var event = document.createEvent('Events');
+        event.initEvent('ProgressEvent', false, false);
+        if (data) {
+            for (var i in data) {
+                if (data.hasOwnProperty(i)) {
+                    event[i] = data[i];
+                }
+            }
+            if (data.target) {
+                // TODO: cannot call <some_custom_object>.dispatchEvent
+                // need to first figure out how to implement EventTarget
+            }
+        }
+        return event;
+    };
+    try {
+        var ev = createEvent({type:"abort",target:document});
+        return function ProgressEvent(type, data) {
+            data.type = type;
+            return createEvent(data);
+        };
+    } catch(e){
+    */
+        return function ProgressEvent(type, dict) {
+            this.type = type;
+            this.bubbles = false;
+            this.cancelBubble = false;
+            this.cancelable = false;
+            this.lengthComputable = false;
+            this.loaded = dict && dict.loaded ? dict.loaded : 0;
+            this.total = dict && dict.total ? dict.total : 0;
+            this.target = dict && dict.target ? dict.target : null;
+        };
+    //}
+})();
+
+module.exports = ProgressEvent;
+});
+
+// file: lib\common\plugin\accelerometer.js
+define("cordova/plugin/accelerometer", function(require, exports, module) {
+/**
+ * This class provides access to device accelerometer data.
+ * @constructor
+ */
+var utils = require("cordova/utils"),
+    exec = require("cordova/exec");
+
+// Local singleton variables.
+var timers = {};
+
+var accelerometer = {
+    /**
+     * Asynchronously aquires the current acceleration.
+     *
+     * @param {Function} successCallback    The function to call when the acceleration data is available
+     * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
+     * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
+     */
+    getCurrentAcceleration: function(successCallback, errorCallback, options) {
+
+        // successCallback required
+        if (typeof successCallback !== "function") {
+            console.log("Accelerometer Error: successCallback is not a function");
+            return;
+        }
+
+        // errorCallback optional
+        if (errorCallback && (typeof errorCallback !== "function")) {
+            console.log("Accelerometer Error: errorCallback is not a function");
+            return;
+        }
+
+        // Get acceleration
+        exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
+    },
+
+    /**
+     * Asynchronously aquires the acceleration repeatedly at a given interval.
+     *
+     * @param {Function} successCallback    The function to call each time the acceleration data is available
+     * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
+     * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
+     * @return String                       The watch id that must be passed to #clearWatch to stop watching.
+     */
+    watchAcceleration: function(successCallback, errorCallback, options) {
+
+        // Default interval (10 sec)
+        var frequency = (options !== undefined && options.frequency !== undefined)? options.frequency : 10000;
+
+        // successCallback required
+        if (typeof successCallback !== "function") {
+            console.log("Accelerometer Error: successCallback is not a function");
+            return;
+        }
+
+        // errorCallback optional
+        if (errorCallback && (typeof errorCallback !== "function")) {
+            console.log("Accelerometer Error: errorCallback is not a function");
+            return;
+        }
+
+        // Make sure accelerometer timeout > frequency + 10 sec
+        exec(
+            function(timeout) {
+                if (timeout < (frequency + 10000)) {
+                    exec(null, null, "Accelerometer", "setTimeout", [frequency + 10000]);
+                }
+            },
+            function(e) { }, "Accelerometer", "getTimeout", []);
+
+        // Start watch timer
+        var id = utils.createUUID();
+        timers[id] = window.setInterval(function() {
+            exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
+        }, (frequency ? frequency : 1));
+
+        return id;
+    },
+
+    /**
+     * Clears the specified accelerometer watch.
+     *
+     * @param {String} id       The id of the watch returned from #watchAcceleration.
+     */
+    clearWatch: function(id) {
+
+        // Stop javascript timer & remove from timer list
+        if (id && timers[id] !== undefined) {
+            window.clearInterval(timers[id]);
+            delete timers[id];
+        }
+    }
+};
+
+module.exports = accelerometer;
+});
+
+// file: lib\common\plugin\battery.js
+define("cordova/plugin/battery", function(require, exports, module) {
+/**
+ * This class contains information about the current battery status.
+ * @constructor
+ */
+var cordova = require('cordova'),
+    exec = require('cordova/exec');
+
+function handlers() {
+  return battery.channels.batterystatus.numHandlers +
+         battery.channels.batterylow.numHandlers +
+         battery.channels.batterycritical.numHandlers;
+}
+
+var Battery = function() {
+    this._level = null;
+    this._isPlugged = null;
+    // Create new event handlers on the window (returns a channel instance)
+    var subscriptionEvents = {
+      onSubscribe:this.onSubscribe,
+      onUnsubscribe:this.onUnsubscribe
+    };
+    this.channels = {
+      batterystatus:cordova.addWindowEventHandler("batterystatus", subscriptionEvents),
+      batterylow:cordova.addWindowEventHandler("batterylow", subscriptionEvents),
+      batterycritical:cordova.addWindowEventHandler("batterycritical", subscriptionEvents)
+    };
+};
+/**
+ * Event handlers for when callbacks get registered for the battery.
+ * Keep track of how many handlers we have so we can start and stop the native battery listener
+ * appropriately (and hopefully save on battery life!).
+ */
+Battery.prototype.onSubscribe = function() {
+  var me = battery;
+  // If we just registered the first handler, make sure native listener is started.
+  if (handlers() === 1) {
+    exec(me._status, me._error, "Battery", "start", []);
+  }
+};
+
+Battery.prototype.onUnsubscribe = function() {
+  var me = battery;
+
+  // If we just unregistered the last handler, make sure native listener is stopped.
+  if (handlers() === 0) {
+      exec(null, null, "Battery", "stop", []);
+  }
+};
+
+/**
+ * Callback for battery status
+ *
+ * @param {Object} info            keys: level, isPlugged
+ */
+Battery.prototype._status = function(info) {
+    if (info) {
+        var me = battery;
+    var level = info.level;
+        if (me._level !== level || me._isPlugged !== info.isPlugged) {
+            // Fire batterystatus event
+            cordova.fireWindowEvent("batterystatus", info);
+
+            // Fire low battery event
+            if (level === 20 || level === 5) {
+                if (level === 20) {
+                    cordova.fireWindowEvent("batterylow", info);
+                }
+                else {
+                    cordova.fireWindowEvent("batterycritical", info);
+                }
+            }
+        }
+        me._level = level;
+        me._isPlugged = info.isPlugged;
+    }
+};
+
+/**
+ * Error callback for battery start
+ */
+Battery.prototype._error = function(e) {
+    console.log("Error initializing Battery: " + e);
+};
+
+var battery = new Battery();
+
+module.exports = battery;
+});
+
+// file: lib\common\plugin\capture.js
+define("cordova/plugin/capture", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    MediaFile = require('cordova/plugin/MediaFile');
+
+/**
+ * Launches a capture of different types.
+ *
+ * @param (DOMString} type
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+function _capture(type, successCallback, errorCallback, options) {
+    var win = function(pluginResult) {
+        var mediaFiles = [];
+        var i;
+        for (i = 0; i < pluginResult.length; i++) {
+            var mediaFile = new MediaFile();
+            mediaFile.name = pluginResult[i].name;
+            mediaFile.fullPath = pluginResult[i].fullPath;
+            mediaFile.type = pluginResult[i].type;
+            mediaFile.lastModifiedDate = pluginResult[i].lastModifiedDate;
+            mediaFile.size = pluginResult[i].size;
+            mediaFiles.push(mediaFile);
+        }
+        successCallback(mediaFiles);
+    };
+    exec(win, errorCallback, "Capture", type, [options]);
+}
+/**
+ * The Capture interface exposes an interface to the camera and microphone of the hosting device.
+ */
+function Capture() {
+    this.supportedAudioModes = [];
+    this.supportedImageModes = [];
+    this.supportedVideoModes = [];
+}
+
+/**
+ * Launch audio recorder application for recording audio clip(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureAudioOptions} options
+ */
+Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
+    _capture("captureAudio", successCallback, errorCallback, options);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype.captureImage = function(successCallback, errorCallback, options){
+    _capture("captureImage", successCallback, errorCallback, options);
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
+    _capture("captureVideo", successCallback, errorCallback, options);
+};
+
+
+module.exports = new Capture();
+
+});
+
+// file: lib\common\plugin\compass.js
+define("cordova/plugin/compass", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    utils = require('cordova/utils'),
+    CompassHeading = require('cordova/plugin/CompassHeading'),
+    CompassError = require('cordova/plugin/CompassError'),
+    timers = {},
+    compass = {
+        /**
+         * Asynchronously acquires the current heading.
+         * @param {Function} successCallback The function to call when the heading
+         * data is available
+         * @param {Function} errorCallback The function to call when there is an error
+         * getting the heading data.
+         * @param {CompassOptions} options The options for getting the heading data (not used).
+         */
+        getCurrentHeading:function(successCallback, errorCallback, options) {
+            // successCallback required
+            if (typeof successCallback !== "function") {
+              console.log("Compass Error: successCallback is not a function");
+              return;
+            }
+
+            // errorCallback optional
+            if (errorCallback && (typeof errorCallback !== "function")) {
+              console.log("Compass Error: errorCallback is not a function");
+              return;
+            }
+
+            var win = function(result) {
+                var ch = new CompassHeading(result.magneticHeading, result.trueHeading, result.headingAccuracy, result.timestamp);
+                successCallback(ch);
+            };
+            var fail = function(code) {
+                var ce = new CompassError(code);
+                errorCallback(ce);
+            };
+
+            // Get heading
+            exec(win, fail, "Compass", "getHeading", [options]);
+        },
+
+        /**
+         * Asynchronously acquires the heading repeatedly at a given interval.
+         * @param {Function} successCallback The function to call each time the heading
+         * data is available
+         * @param {Function} errorCallback The function to call when there is an error
+         * getting the heading data.
+         * @param {HeadingOptions} options The options for getting the heading data
+         * such as timeout and the frequency of the watch. For iOS, filter parameter
+         * specifies to watch via a distance filter rather than time.
+         */
+        watchHeading:function(successCallback, errorCallback, options) {
+            // Default interval (100 msec)
+            var frequency = (options !== undefined && options.frequency !== undefined) ? options.frequency : 100;
+            var filter = (options !== undefined && options.filter !== undefined) ? options.filter : 0;
+
+            // successCallback required
+            if (typeof successCallback !== "function") {
+              console.log("Compass Error: successCallback is not a function");
+              return;
+            }
+
+            // errorCallback optional
+            if (errorCallback && (typeof errorCallback !== "function")) {
+              console.log("Compass Error: errorCallback is not a function");
+              return;
+            }
+
+            var id = utils.createUUID();
+            if (filter > 0) {
+                // is an iOS request for watch by filter, no timer needed
+                timers[id] = "iOS";
+                compass.getCurrentHeading(successCallback, errorCallback, options);
+            } else {
+                // Start watch timer to get headings
+                timers[id] = window.setInterval(function() {
+                    compass.getCurrentHeading(successCallback, errorCallback);
+                }, frequency);
+            }
+
+            return id;
+        },
+
+        /**
+         * Clears the specified heading watch.
+         * @param {String} watchId The ID of the watch returned from #watchHeading.
+         */
+        clearWatch:function(id) {
+            // Stop javascript timer & remove from timer list
+            if (id && timers[id]) {
+                if (timers[id] != "iOS") {
+                      clearInterval(timers[id]);
+                  } else {
+                    // is iOS watch by filter so call into device to stop
+                    exec(null, null, "Compass", "stopHeading", []);
+                }
+                delete timers[id];
+            }
+        }
+    };
+
+module.exports = compass;
+});
+
+// file: lib\common\plugin\contacts.js
+define("cordova/plugin/contacts", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    ContactError = require('cordova/plugin/ContactError'),
+    Contact = require('cordova/plugin/Contact');
+
+/**
+* Represents a group of Contacts.
+* @constructor
+*/
+var contacts = {
+    /**
+     * Returns an array of Contacts matching the search criteria.
+     * @param fields that should be searched
+     * @param successCB success callback
+     * @param errorCB error callback
+     * @param {ContactFindOptions} options that can be applied to contact searching
+     * @return array of Contacts matching search criteria
+     */
+    find:function(fields, successCB, errorCB, options) {
+        if (!successCB) {
+            throw new TypeError("You must specify a success callback for the find command.");
+        }
+        if (!fields || (fields instanceof Array && fields.length === 0)) {
+            if (typeof errorCB === "function") {
+                errorCB(new ContactError(ContactError.INVALID_ARGUMENT_ERROR));
+            }
+        } else {
+            var win = function(result) {
+                var cs = [];
+                for (var i = 0, l = result.length; i < l; i++) {
+                    cs.push(contacts.create(result[i]));
+                }
+                successCB(cs);
+            };
+            exec(win, errorCB, "Contacts", "search", [fields, options]);
+        }
+    },
+
+    /**
+     * This function creates a new contact, but it does not persist the contact
+     * to device storage. To persist the contact to device storage, invoke
+     * contact.save().
+     * @param properties an object who's properties will be examined to create a new Contact
+     * @returns new Contact object
+     */
+    create:function(properties) {
+        var i;
+        var contact = new Contact();
+        for (i in properties) {
+            if (typeof contact[i] !== 'undefined' && properties.hasOwnProperty(i)) {
+                contact[i] = properties[i];
+            }
+        }
+        return contact;
+    }
+};
+
+module.exports = contacts;
+});
+
+// file: lib\common\plugin\geolocation.js
+define("cordova/plugin/geolocation", function(require, exports, module) {
+var utils = require('cordova/utils'),
+    exec = require('cordova/exec'),
+    PositionError = require('cordova/plugin/PositionError'),
+    Position = require('cordova/plugin/Position');
+
+var timers = {};   // list of timers in use
+
+// Returns default params, overrides if provided with values
+function parseParameters(options) {
+    var opt = {
+        maximumAge: 10000,
+        enableHighAccuracy: false,
+        timeout: 10000
+    };
+
+    if (options) {
+        if (options.maximumAge !== undefined) {
+            opt.maximumAge = options.maximumAge;
+        }
+        if (options.enableHighAccuracy !== undefined) {
+            opt.enableHighAccuracy = options.enableHighAccuracy;
+        }
+        if (options.timeout !== undefined) {
+            opt.timeout = options.timeout;
+        }
+    }
+
+    return opt;
+}
+
+var geolocation = {
+    /**
+   * Asynchronously aquires the current position.
+   *
+   * @param {Function} successCallback    The function to call when the position data is available
+   * @param {Function} errorCallback      The function to call when there is an error getting the heading position. (OPTIONAL)
+   * @param {PositionOptions} options     The options for getting the position data. (OPTIONAL)
+   */
+    getCurrentPosition:function(successCallback, errorCallback, options) {
+        options = parseParameters(options);
+
+        var win = function(p) {
+            successCallback(new Position(
+                {
+                    latitude:p.latitude,
+                    longitude:p.longitude,
+                    altitude:p.altitude,
+                    accuracy:p.accuracy,
+                    heading:p.heading,
+                    velocity:p.velocity,
+                    altitudeAccuracy:p.altitudeAccuracy
+                },
+                p.timestamp || new Date()
+            ));
+        };
+        var fail = function(e) {
+            errorCallback(new PositionError(e.code, e.message));
+        };
+
+        exec(win, fail, "Geolocation", "getLocation", [options.enableHighAccuracy, options.timeout, options.maximumAge]);
+    },
+    /**
+     * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
+     * the successCallback is called with the new location.
+     *
+     * @param {Function} successCallback    The function to call each time the location data is available
+     * @param {Function} errorCallback      The function to call when there is an error getting the location data. (OPTIONAL)
+     * @param {PositionOptions} options     The options for getting the location data such as frequency. (OPTIONAL)
+     * @return String                       The watch id that must be passed to #clearWatch to stop watching.
+     */
+    watchPosition:function(successCallback, errorCallback, options) {
+        options = parseParameters(options);
+
+        var id = utils.createUUID();
+        timers[id] = window.setInterval(function() {
+            geolocation.getCurrentPosition(successCallback, errorCallback, options);
+        }, options.timeout);
+
+        return id;
+    },
+    /**
+     * Clears the specified heading watch.
+     *
+     * @param {String} id       The ID of the watch returned from #watchPosition
+     */
+    clearWatch:function(id) {
+        if (id && timers[id] !== undefined) {
+            window.clearInterval(timers[id]);
+            delete timers[id];
+        }
+    }
+};
+
+module.exports = geolocation;
+});
+
+// file: lib\common\plugin\network.js
+define("cordova/plugin/network", function(require, exports, module) {
+var exec = require('cordova/exec'),
+    cordova = require('cordova'),
+    channel = require('cordova/channel');
+
+var NetworkConnection = function () {
+    this.type = null;
+    this._firstRun = true;
+    this._timer = null;
+    this.timeout = 500;
+
+    var me = this;
+
+    channel.onCordovaReady.subscribeOnce(function() {
+        me.getInfo(function (info) {
+            me.type = info;
+            if (info === "none") {
+                // set a timer if still offline at the end of timer send the offline event
+                me._timer = setTimeout(function(){
+                    cordova.fireDocumentEvent("offline");
+                    me._timer = null;
+                    }, me.timeout);
+            } else {
+                // If there is a current offline event pending clear it
+                if (me._timer !== null) {
+                    clearTimeout(me._timer);
+                    me._timer = null;
+                }
+                cordova.fireDocumentEvent("online");
+            }
+
+            // should only fire this once
+            if (me._firstRun) {
+                me._firstRun = false;
+                channel.onCordovaConnectionReady.fire();
+            }
+        },
+        function (e) {
+            // If we can't get the network info we should still tell Cordova
+            // to fire the deviceready event.
+            if (me._firstRun) {
+                me._firstRun = false;
+                channel.onCordovaConnectionReady.fire();
+            }
+            console.log("Error initializing Network Connection: " + e);
+        });
+    });
+};
+
+/**
+ * Get connection info
+ *
+ * @param {Function} successCallback The function to call when the Connection data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
+ */
+NetworkConnection.prototype.getInfo = function (successCallback, errorCallback) {
+    // Get info
+    exec(successCallback, errorCallback, "NetworkStatus", "getConnectionInfo", []);
+};
+
+module.exports = new NetworkConnection();
+});
+
+// file: lib\common\plugin\notification.js
+define("cordova/plugin/notification", function(require, exports, module) {
+var exec = require('cordova/exec');
+
+/**
+ * Provides access to notifications on the device.
+ */
+
+module.exports = {
+
+    /**
+     * Open a native alert dialog, with a customizable title and button text.
+     *
+     * @param {String} message              Message to print in the body of the alert
+     * @param {Function} completeCallback   The callback that is called when user clicks on a button.
+     * @param {String} title                Title of the alert dialog (default: Alert)
+     * @param {String} buttonLabel          Label of the close button (default: OK)
+     */
+    alert: function(message, completeCallback, title, buttonLabel) {
+        var _title = (title || "Alert");
+        var _buttonLabel = (buttonLabel || "OK");
+        exec(completeCallback, null, "Notification", "alert", [message, _title, _buttonLabel]);
+    },
+
+    /**
+     * Open a native confirm dialog, with a customizable title and button text.
+     * The result that the user selects is returned to the result callback.
+     *
+     * @param {String} message              Message to print in the body of the alert
+     * @param {Function} resultCallback     The callback that is called when user clicks on a button.
+     * @param {String} title                Title of the alert dialog (default: Confirm)
+     * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
+     */
+    confirm: function(message, resultCallback, title, buttonLabels) {
+        var _title = (title || "Confirm");
+        var _buttonLabels = (buttonLabels || "OK,Cancel");
+        exec(resultCallback, null, "Notification", "confirm", [message, _title, _buttonLabels]);
+    },
+
+    /**
+     * Causes the device to vibrate.
+     *
+     * @param {Integer} mills       The number of milliseconds to vibrate for.
+     */
+    vibrate: function(mills) {
+        exec(null, null, "Notification", "vibrate", [mills]);
+    },
+
+    /**
+     * Causes the device to beep.
+     * On Android, the default notification ringtone is played "count" times.
+     *
+     * @param {Integer} count       The number of beeps.
+     */
+    beep: function(count) {
+        exec(null, null, "Notification", "beep", [count]);
+    }
+};
+});
+
+// file: lib\common\plugin\requestFileSystem.js
+define("cordova/plugin/requestFileSystem", function(require, exports, module) {
+var FileError = require('cordova/plugin/FileError'),
+    FileSystem = require('cordova/plugin/FileSystem'),
+    exec = require('cordova/exec');
+
+/**
+ * Request a file system in which to store application data.
+ * @param type  local file system type
+ * @param size  indicates how much storage space, in bytes, the application expects to need
+ * @param successCallback  invoked with a FileSystem object
+ * @param errorCallback  invoked if error occurs retrieving file system
+ */
+var requestFileSystem = function(type, size, successCallback, errorCallback) {
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+
+    if (type < 0 || type > 3) {
+        fail(FileError.SYNTAX_ERR);
+    } else {
+        // if successful, return a FileSystem object
+        var success = function(file_system) {
+            if (file_system) {
+                if (typeof successCallback === 'function') {
+                    // grab the name and root from the file system object
+                    var result = new FileSystem(file_system.name, file_system.root);
+                    successCallback(result);
+                }
+            }
+            else {
+                // no FileSystem object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+        exec(success, fail, "File", "requestFileSystem", [type, size]);
+    }
+};
+
+module.exports = requestFileSystem;
+});
+
+// file: lib\common\plugin\resolveLocalFileSystemURI.js
+define("cordova/plugin/resolveLocalFileSystemURI", function(require, exports, module) {
+var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
+    FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
+    exec = require('cordova/exec');
+
+/**
+ * Look up file system Entry referred to by local URI.
+ * @param {DOMString} uri  URI referring to a local file or directory
+ * @param successCallback  invoked with Entry object corresponding to URI
+ * @param errorCallback    invoked if error occurs retrieving file system entry
+ */
+module.exports = function(uri, successCallback, errorCallback) {
+    // error callback
+    var fail = function(error) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(error));
+        }
+    };
+    // if successful, return either a file or directory entry
+    var success = function(entry) {
+        var result;
+
+        if (entry) {
+            if (typeof successCallback === 'function') {
+                // create appropriate Entry object
+                result = (entry.isDirectory) ? new DirectoryEntry(entry.name, entry.fullPath) : new FileEntry(entry.name, entry.fullPath);
+                try {
+                    successCallback(result);
+                }
+                catch (e) {
+                    console.log('Error invoking callback: ' + e);
+                }
+            }
+        }
+        else {
+            // no Entry object returned
+            fail(FileError.NOT_FOUND_ERR);
+        }
+    };
+
+    exec(success, fail, "File", "resolveLocalFileSystemURI", [uri]);
+};
+
+});
+
+// file: lib\wp7\plugin\wp7\CordovaCommandResult.js
+define("cordova/plugin/wp7/CordovaCommandResult", function(require, exports, module) {
+
+var cordova = require('cordova');
+var channel = require('cordova/channel');
+
+// singular WP7 callback function attached to window, status is used to determin if it is a success or error
+module.exports = function(status,callbackId,args,cast) {
+
+    if(status === "backbutton") {
+        cordova.fireDocumentEvent("backbutton");
+        return "true";
+    }
+    else if(status === "resume") {
+        channel.onResume.fire();
+        return "true";
+    }
+    else if(status === "pause") {
+        channel.onPause.fire();
+        return "true";
+    }
+
+    var parsedArgs;
+    try
+    {
+        parsedArgs = JSON.parse(args);
+
+    }
+    catch(ex)
+    {
+        console.log("Parse error in CordovaCommandResult :: " + ex);
+        return;
+    }
+
+    try
+    {
+        // For some commands, the message is a JSON encoded string
+        // and other times, it is just a string, the try/catch handles the
+        // case where message was indeed, just a string.
+        parsedArgs.message = JSON.parse(parsedArgs.message);
+    }
+    catch(ex)
+    {
+
+    }
+    var safeStatus = parseInt(status, 10);
+    if(safeStatus === cordova.callbackStatus.NO_RESULT ||
+       safeStatus === cordova.callbackStatus.OK) {
+        cordova.callbackSuccess(callbackId,parsedArgs,cast);
+    }
+    else {
+        cordova.callbackError(callbackId,parsedArgs,cast);
+    }
+};
+});
+
+// file: lib\wp7\plugin\wp7\CordovaMediaonStatus.js
+define("cordova/plugin/wp7/CordovaMediaonStatus", function(require, exports, module) {
+
+var cordova = require('cordova');
+
+module.exports = function(args) {
+
+    console.log("media on status :: " + args);
+    //var res = JSON.parse(args);
+    //require("cordova/media").onStatus(res.id, res.msg, res.value);
+};
+});
+
+// file: lib\wp7\plugin\wp7\DOMStorage.js
+define("cordova/plugin/wp7/DOMStorage", function(require, exports, module) {
+(function() {
+
+    var DOMStorage = function(type) {
+        // default type is local
+        if(type == "sessionStorage") {
+            this._type = type;
+        }
+        Object.defineProperty( this, "length", {
+            configurable: true,
+            get: function(){ return this.getLength(); }
+        });
+    };
+
+    DOMStorage.prototype = {
+        _type:"localStorage",
+        _result:null,
+        keys:null,
+
+        onResult:function(key,valueStr) {
+            if(!this.keys) {
+                this.keys = [];
+            }
+            this._result = valueStr;
+        },
+
+        onKeysChanged:function(jsonKeys) {
+            this.keys = JSON.parse(jsonKeys);
+
+            var key;
+            for(var n = 0,len = this.keys.length; n < len; n++) {
+                key = this.keys[n];
+                if(!this.hasOwnProperty(key)) {
+                    Object.defineProperty( this, key, {
+                        configurable: true,
+                        get: function(){ return this.getItem(key); },
+                        set: function(val){ return this.setItem(key,val); }
+                    });
+                }
+            }
+
+        },
+
+        initialize:function() {
+            window.external.Notify("DOMStorage/" + this._type + "/load/keys");
+        },
+
+    /*
+        The length attribute must return the number of key/value pairs currently present in the list associated with the object.
+    */
+        getLength:function() {
+            if(!this.keys) {
+                this.initialize();
+            }
+            return this.keys.length;
+        },
+
+    /*
+        The key(n) method must return the name of the nth key in the list.
+        The order of keys is user-agent defined, but must be consistent within an object so long as the number of keys doesn't change.
+        (Thus, adding or removing a key may change the order of the keys, but merely changing the value of an existing key must not.)
+        If n is greater than or equal to the number of key/value pairs in the object, then this method must return null.
+    */
+        key:function(n) {
+            if(!this.keys) {
+                this.initialize();
+            }
+
+            if(n >= this.keys.length) {
+                return null;
+            } else {
+                return this.keys[n];
+            }
+        },
+
+    /*
+        The getItem(key) method must return the current value associated with the given key.
+        If the given key does not exist in the list associated with the object then this method must return null.
+    */
+        getItem:function(key) {
+            if(!this.keys) {
+                this.initialize();
+            }
+
+            var retVal = null;
+            if(this.keys.indexOf(key) > -1) {
+                window.external.Notify("DOMStorage/" + this._type + "/get/" + key);
+                retVal = this._result;
+                this._result = null;
+            }
+            return retVal;
+        },
+    /*
+        The setItem(key, value) method must first check if a key/value pair with the given key already exists
+        in the list associated with the object.
+        If it does not, then a new key/value pair must be added to the list, with the given key and with its value set to value.
+        If the given key does exist in the list, then it must have its value updated to value.
+        If it couldn't set the new value, the method must raise an QUOTA_EXCEEDED_ERR exception.
+        (Setting could fail if, e.g., the user has disabled storage for the site, or if the quota has been exceeded.)
+    */
+        setItem:function(key,value) {
+            if(!this.keys) {
+                this.initialize();
+            }
+            window.external.Notify("DOMStorage/" + this._type + "/set/" + key + "/" + value);
+        },
+
+    /*
+        The removeItem(key) method must cause the key/value pair with the given key to be removed from the list
+        associated with the object, if it exists.
+        If no item with that key exists, the method must do nothing.
+    */
+        removeItem:function(key) {
+            if(!this.keys) {
+                this.initialize();
+            }
+            var index = this.keys.indexOf(key);
+            if(index > -1) {
+                this.keys.splice(index,1);
+                // TODO: need sanity check for keys ? like 'clear','setItem', ...
+                window.external.Notify("DOMStorage/" + this._type + "/remove/" + key);
+                delete this[key];
+            }
+        },
+
+    /*
+        The clear() method must atomically cause the list associated with the object to be emptied of all
+        key/value pairs, if there are any.
+        If there are none, then the method must do nothing.
+    */
+        clear:function() {
+            if(!this.keys) {
+                this.initialize();
+            }
+
+            for(var n=0,len=this.keys.length; n < len;n++) {
+                // TODO: do we need a sanity check for keys ? like 'clear','setItem', ...
+                delete this[this.keys[n]];
+            }
+            this.keys = [];
+            window.external.Notify("DOMStorage/" + this._type + "/clear/");
+        }
+    };
+
+    // initialize DOMStorage
+
+    Object.defineProperty( window, "localStorage", {
+        writable: false,
+        configurable: false,
+        value:new DOMStorage("localStorage")
+    });
+    window.localStorage.initialize();
+
+    Object.defineProperty( window, "sessionStorage", {
+        writable: false,
+        configurable: false,
+        value:new DOMStorage("sessionStorage")
+    });
+    window.sessionStorage.initialize();
+
+
+})();
+
+module.exports = null;
+});
+
+// file: lib\wp7\plugin\wp7\XHRPatch.js
+define("cordova/plugin/wp7/XHRPatch", function(require, exports, module) {
+// TODO: the build process implicitly will wrap this in a define() call
+// with a closure of its own; do you need this extra closure?
+
+var LocalFileSystem = require('cordova/plugin/LocalFileSystem');
+
+(function (win, doc) {
+
+var docDomain = null;
+try {
+    docDomain = doc.domain;
+} catch (err) {
+    //console.log("caught exception trying to access document.domain");
+}
+
+if (!docDomain || docDomain.length === 0) {
+
+    var aliasXHR = win.XMLHttpRequest;
+
+    win.XMLHttpRequest = function () { };
+    win.XMLHttpRequest.noConflict = aliasXHR;
+    win.XMLHttpRequest.UNSENT = 0;
+    win.XMLHttpRequest.OPENED = 1;
+    win.XMLHttpRequest.HEADERS_RECEIVED = 2;
+    win.XMLHttpRequest.LOADING = 3;
+    win.XMLHttpRequest.DONE = 4;
+
+    win.XMLHttpRequest.prototype = {
+        UNSENT: 0,
+        OPENED: 1,
+        HEADERS_RECEIVED: 2,
+        LOADING: 3,
+        DONE: 4,
+
+        isAsync: false,
+        onreadystatechange: null,
+        readyState: 0,
+        _url: "",
+        timeout: 0,
+        withCredentials: false,
+        _requestHeaders: null,
+        open: function (reqType, uri, isAsync, user, password) {
+
+            if (uri && uri.indexOf("http") === 0) {
+                if (!this.wrappedXHR) {
+                    this.wrappedXHR = new aliasXHR();
+                    var self = this;
+
+                    // timeout
+                    if (this.timeout > 0) {
+                        this.wrappedXHR.timeout = this.timeout;
+                    }
+                    Object.defineProperty(this, "timeout", {
+                        set: function (val) {
+                            this.wrappedXHR.timeout = val;
+                        },
+                        get: function () {
+                            return this.wrappedXHR.timeout;
+                        }
+                    });
+
+
+
+                    if (this.withCredentials) {
+                        this.wrappedXHR.withCredentials = this.withCredentials;
+                    }
+                    Object.defineProperty(this, "withCredentials", {
+                        set: function (val) {
+                            this.wrappedXHR.withCredentials = val;
+                        },
+                        get: function () {
+                            return this.wrappedXHR.withCredentials;
+                        }
+                    });
+
+
+                    Object.defineProperty(this, "status", { get: function () {
+                        return this.wrappedXHR.status;
+                    }
+                    });
+                    Object.defineProperty(this, "responseText", { get: function () {
+                        return this.wrappedXHR.responseText;
+                    }
+                    });
+                    Object.defineProperty(this, "statusText", { get: function () {
+                        return this.wrappedXHR.statusText;
+                    }
+                    });
+
+                    Object.defineProperty(this, "responseXML", { get: function () {
+                        return this.wrappedXHR.responseXML;
+                    }
+                    });
+
+                    this.getResponseHeader = function (header) {
+                        return this.wrappedXHR.getResponseHeader(header);
+                    };
+                    this.getAllResponseHeaders = function () {
+                        return this.wrappedXHR.getAllResponseHeaders();
+                    };
+
+                    this.wrappedXHR.onreadystatechange = function () {
+                        self.changeReadyState(self.wrappedXHR.readyState);
+                    };
+                }
+                return this.wrappedXHR.open(reqType, uri, isAsync, user, password);
+            }
+            else {
+                // x-wmapp1://app/www/page2.html
+                // need to work some magic on the actual url/filepath
+                var newUrl = uri;
+                if (newUrl.indexOf(":/") > -1) {
+                    newUrl = newUrl.split(":/")[1];
+                }
+
+                if (newUrl.lastIndexOf("/") === newUrl.length - 1) {
+                    newUrl += "index.html"; // default page is index.html, when call is to a dir/ ( why not ...? )
+                }
+                this._url = newUrl;
+            }
+        },
+        statusText: "",
+        changeReadyState: function (newState) {
+            this.readyState = newState;
+            if (this.onreadystatechange) {
+                this.onreadystatechange();
+            }
+        },
+        setRequestHeader: function (header, value) {
+            if (this.wrappedXHR) {
+                this.wrappedXHR.setRequestHeader(header, value);
+            }
+        },
+        getResponseHeader: function (header) {
+            return this.wrappedXHR ? this.wrappedXHR.getResponseHeader(header) : "";
+        },
+        getAllResponseHeaders: function () {
+            return this.wrappedXHR ? this.wrappedXHR.getAllResponseHeaders() : "";
+        },
+        responseText: "",
+        responseXML: "",
+        onResult: function (res) {
+            this.status = 200;
+            this.responseText = res;
+            this.responseXML = res;
+            this.changeReadyState(this.DONE);
+        },
+        onError: function (err) {
+            this.status = 404;
+            this.changeReadyState(this.DONE);
+        },
+
+        abort: function () {
+            if (this.wrappedXHR) {
+                return this.wrappedXHR.abort();
+            }
+        },
+
+        send: function (data) {
+            if (this.wrappedXHR) {
+                return this.wrappedXHR.send(data);
+            }
+            else {
+                this.changeReadyState(this.OPENED);
+
+                var alias = this;
+
+                var fail = function fail(evt) {
+                    alias.onError(evt.code);
+                };
+
+                var gotFile = function gotFile(file) {
+                    var reader = new FileReader();
+                    reader.onloadend = function (evt) {
+                        alias.onResult.apply(alias,[evt.target.result]);
+                    };
+                    reader.readAsText(file);
+                };
+
+                var gotEntry = function gotEntry(entry) {
+                    entry.file(gotFile, fail);
+                };
+
+                var gotFS = function gotFS(fs) {
+                    fs.root.getFile(alias._url, null, gotEntry, fail);
+                };
+
+                window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, gotFS, fail);
+
+            }
+        },
+        status: 404
+    };
+} // if doc domain
+
+// end closure wrap
+})(window, document);
+
+module.exports = null;
+});
+
+// file: lib\wp7\plugin\wp7\console.js
+define("cordova/plugin/wp7/console", function(require, exports, module) {
+
+var exec = require('cordova/exec'),
+    channel = require('cordova/channel');
+var cordova = require("cordova");
+
+var debugConsole = {
+    log:function(msg){
+        exec(null,null,"DebugConsole","log",msg);
+    },
+    warn:function(msg){
+        exec(null,null,"DebugConsole","warn",msg);
+    },
+    error:function(msg){
+        exec(null,null,"DebugConsole","error",msg);
+    }
+};
+
+module.exports = debugConsole;
+});
+
+// file: lib\wp7\plugin\wp7\device.js
+define("cordova/plugin/wp7/device", function(require, exports, module) {
+var channel = require('cordova/channel'),
+    utils = require('cordova/utils'),
+    exec = require('cordova/exec');
+
+/**
+ * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
+ * phone, etc.
+ * @constructor
+ */
+function Device() {
+    this.available = false;
+    this.platform = null;
+    this.version = null;
+    this.name = null;
+    this.uuid = null;
+    this.cordova = null;
+
+    var me = this;
+
+    channel.onCordovaReady.subscribeOnce(function() {
+        me.getInfo(function(info) {
+            me.available = true;
+            me.platform = info.platform;
+            me.version = info.version;
+            me.name = info.name;
+            me.uuid = info.uuid;
+            me.cordova = info.cordova;
+            channel.onCordovaInfoReady.fire();
+        },function(e) {
+            me.available = false;
+            utils.alert("[ERROR] Error initializing Cordova: " + e);
+        });
+    });
+}
+
+/**
+ * Get device info
+ *
+ * @param {Function} successCallback The function to call when the heading data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
+ */
+Device.prototype.getInfo = function(successCallback, errorCallback) {
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Device Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Device Error: errorCallback is not a function");
+        return;
+    }
+
+    // Get info
+    exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
+};
+
+module.exports = new Device();
+});
+
+// file: lib\wp7\plugin\wp7\requestFileSystem.js
+define("cordova/plugin/wp7/requestFileSystem", function(require, exports, module) {
+
+var FileError = require('cordova/plugin/FileError'),
+    FileSystem = require('cordova/plugin/FileSystem'),
+    exec = require('cordova/exec');
+
+/**
+ * Request a file system in which to store application data.
+ * @param type  local file system type
+ * @param size  indicates how much storage space, in bytes, the application expects to need
+ * @param successCallback  invoked with a FileSystem object
+ * @param errorCallback  invoked if error occurs retrieving file system
+ */
+var requestFileSystem = function(type, size, successCallback, errorCallback) {
+    // wp7 custom imp
+    var fail = function(code) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(code));
+        }
+    };
+
+    if (type < 0 || type > 3) {
+        fail(FileError.SYNTAX_ERR);
+    } else {
+        // if successful, return a FileSystem object
+        var success = function(file_system) {
+            if (file_system) {
+                if (typeof successCallback === 'function') {
+                    // grab the name and root from the file system object
+                    var result = new FileSystem(file_system.name, file_system.root);
+                    successCallback(result);
+                }
+            }
+            else {
+                // no FileSystem object returned
+                fail(FileError.NOT_FOUND_ERR);
+            }
+        };
+        exec(success, fail, "File", "requestFileSystem", {type:type,size:size});
+    }
+};
+
+module.exports = requestFileSystem;
+});
+
+// file: lib\wp7\plugin\wp7\resolveLocalFileSystemURI.js
+define("cordova/plugin/wp7/resolveLocalFileSystemURI", function(require, exports, module) {
+
+
+var DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
+    FileEntry = require('cordova/plugin/FileEntry'),
+    FileError = require('cordova/plugin/FileError'),
+    exec = require('cordova/exec');
+
+module.exports = function(uri, successCallback, errorCallback) {
+    // error callback
+    var fail = function(error) {
+        if (typeof errorCallback === 'function') {
+            errorCallback(new FileError(error));
+        }
+    };
+    // if successful, return either a file or directory entry
+    var success = function(entry) {
+        var result;
+
+        if (entry) {
+            if (typeof successCallback === 'function') {
+                // create appropriate Entry object
+                result = (entry.isDirectory) ? new DirectoryEntry(entry.name, entry.fullPath) : new FileEntry(entry.name, entry.fullPath);
+                try {
+                    successCallback(result);
+                }
+                catch (e) {
+                    console.log('Error invoking callback: ' + e);
+                }
+            }
+        }
+        else {
+            // no Entry object returned
+            fail(FileError.NOT_FOUND_ERR);
+        }
+    };
+
+    exec(success, fail, "File", "resolveLocalFileSystemURI", {uri:uri});
+};
+
+});
+
+// file: lib\common\utils.js
+define("cordova/utils", function(require, exports, module) {
+function UUIDcreatePart(length) {
+    var uuidpart = "";
+    for (var i=0; i<length; i++) {
+        var uuidchar = parseInt((Math.random() * 256), 10).toString(16);
+        if (uuidchar.length == 1) {
+            uuidchar = "0" + uuidchar;
+        }
+        uuidpart += uuidchar;
+    }
+    return uuidpart;
+}
+
+var _self = {
+    /**
+     * Does a deep clone of the object.
+     */
+    clone: function(obj) {
+        if(!obj) {
+            return obj;
+        }
+
+        var retVal, i;
+
+        if(obj instanceof Array){
+            retVal = [];
+            for(i = 0; i < obj.length; ++i){
+                retVal.push(_self.clone(obj[i]));
+            }
+            return retVal;
+        }
+
+        if (obj instanceof Function) {
+            return obj;
+        }
+
+        if(!(obj instanceof Object)){
+            return obj;
+        }
+
+        if(obj instanceof Date){
+            return obj;
+        }
+
+        retVal = {};
+        for(i in obj){
+            if(!(i in retVal) || retVal[i] != obj[i]) {
+                retVal[i] = _self.clone(obj[i]);
+            }
+        }
+        return retVal;
+    },
+
+    close: function(context, func, params) {
+        if (typeof params === 'undefined') {
+            return function() {
+                return func.apply(context, arguments);
+            };
+        } else {
+            return function() {
+                return func.apply(context, params);
+            };
+        }
+    },
+
+    /**
+     * Create a UUID
+     */
+    createUUID: function() {
+        return UUIDcreatePart(4) + '-' +
+            UUIDcreatePart(2) + '-' +
+            UUIDcreatePart(2) + '-' +
+            UUIDcreatePart(2) + '-' +
+            UUIDcreatePart(6);
+    },
+
+    /**
+     * Extends a child object from a parent object using classical inheritance
+     * pattern.
+     */
+    extend: (function() {
+        // proxy used to establish prototype chain
+        var F = function() {};
+        // extend Child from Parent
+        return function(Child, Parent) {
+            F.prototype = Parent.prototype;
+            Child.prototype = new F();
+            Child.__super__ = Parent.prototype;
+            Child.prototype.constructor = Child;
+        };
+    }()),
+
+    /**
+     * Alerts a message in any available way: alert or console.log.
+     */
+    alert:function(msg) {
+        if (alert) {
+            alert(msg);
+        } else if (console && console.log) {
+            console.log(msg);
+        }
+    }
+};
+
+module.exports = _self;
+});
+
+
+window.cordova = require('cordova');
+
+// file: lib\scripts\bootstrap.js
+(function (context) {
+    var channel = require("cordova/channel"),
+        _self = {
+            boot: function () {
+                /**
+                 * Create all cordova objects once page has fully loaded and native side is ready.
+                 */
+                channel.join(function() {
+                    var builder = require('cordova/builder'),
+                        base = require('cordova/common'),
+                        platform = require('cordova/platform');
+
+                    // Drop the common globals into the window object, but be nice and don't overwrite anything.
+                    builder.build(base.objects).intoButDontClobber(window);
+
+                    // Drop the platform-specific globals into the window object
+                    // and clobber any existing object.
+                    builder.build(platform.objects).intoAndClobber(window);
+
+                    // Merge the platform-specific overrides/enhancements into
+                    // the window object.
+                    if (typeof platform.merges !== 'undefined') {
+                        builder.build(platform.merges).intoAndMerge(window);
+                    }
+
+                    // Call the platform-specific initialization
+                    platform.initialize();
+
+                    // Fire event to notify that all objects are created
+                    channel.onCordovaReady.fire();
+
+                    // Fire onDeviceReady event once all constructors have run and
+                    // cordova info has been received from native side.
+                    channel.join(function() {
+                        channel.onDeviceReady.fire();
+                    }, channel.deviceReadyChannelsArray);
+
+                }, [ channel.onDOMContentLoaded, channel.onNativeReady ]);
+            }
+        };
+
+    // boot up once native side is ready
+    channel.onNativeReady.subscribeOnce(_self.boot);
+
+    // _nativeReady is global variable that the native side can set
+    // to signify that the native code is ready. It is a global since
+    // it may be called before any cordova JS is ready.
+    if (window._nativeReady) {
+        channel.onNativeReady.fire();
+    }
+
+}(window));
+
+})();
\ No newline at end of file
diff --git a/lib/windows/templates/full/www/index.html b/lib/windows/templates/full/www/index.html
index 9d4e2448..d29bb1c6 100644
--- a/lib/windows/templates/full/www/index.html
+++ b/lib/windows/templates/full/www/index.html
@@ -8,7 +8,7 @@
     
 	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
             
-      <script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.7.0.js"></script>
        
       <script type="text/javascript">
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/BuildManifestProcessor.js b/lib/windows/tests/MobileSpecUnitTests/BuildManifestProcessor.js
new file mode 100644
index 00000000..e46fc3e6
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/BuildManifestProcessor.js
@@ -0,0 +1,63 @@
+
+var objArgs = WScript.Arguments;
+for (i = 0; i < objArgs.length; i++) {
+    WScript.Echo("Arg :: " + objArgs(i));
+}
+
+var projectFilePath = null;
+if (objArgs && objArgs.length > 0) {
+    projectFilePath = objArgs(0);
+}
+
+
+var fso = WScript.CreateObject("Scripting.FileSystemObject");
+var outFile = fso.CreateTextFile("..\\..\\CordovaSourceDictionary.xml", true);
+
+outFile.WriteLine('<?xml version="1.0" encoding="utf-8"?>');
+outFile.WriteLine('<!-- This file is auto-generated, do not edit! -jm -->');
+outFile.WriteLine('<CordovaSourceDictionary>');
+
+// We need to get any Linked files from the project
+
+WScript.Echo("Adding Source Files ...");
+if (projectFilePath != null) {
+    var projXml = WScript.CreateObject("Microsoft.XMLDOM");
+
+    projXml.async = false;
+    if (projXml.load(projectFilePath)) {
+
+        // add linked content ( windows shortcuts )
+        var nodes = projXml.selectNodes("/Project/ItemGroup/Content/Link");
+        WScript.Echo("/Project/ItemGroup/Content/Link nodes.length" + nodes.length);
+        for (var n = 0; n < nodes.length; n++) {
+            outFile.WriteLine('    <FilePath Value="' + nodes[n].text + '"/>');
+        }
+
+        // add files of type Resource
+        nodes = projXml.selectNodes("/Project/ItemGroup/Resource/Link");
+        WScript.Echo("/Project/ItemGroup/Resource/Link nodes.length" + nodes.length);
+        for (n = 0; n < nodes.length; n++) {
+            outFile.WriteLine('    <FilePath Value="' + nodes[n].text + '"/>');
+        }
+
+        // add Content files from www folder
+        nodes = projXml.selectNodes("/Project/ItemGroup/Content[@Include]");
+        WScript.Echo("/Project/ItemGroup/Content nodes.length" + nodes.length);
+        for (n = 0; n < nodes.length; n++) {
+            for (var i = 0; i < nodes[n].attributes.length; i++) {
+
+                if (nodes[n].attributes[i].name == "Include") {
+                    var val = nodes[n].attributes[i].value;
+                    if (val.indexOf("www") == 0) {
+                        WScript.Echo("adding value :: " + val);
+                        outFile.WriteLine('    <FilePath Value="' + val + '"/>');
+                    }
+                }
+            }
+            
+        }
+    }
+}
+
+outFile.WriteLine('</CordovaSourceDictionary>');
+
diff --git a/lib/windows/tests/MobileSpecUnitTests/ManifestProcessor.js b/lib/windows/tests/MobileSpecUnitTests/ManifestProcessor.js
deleted file mode 100644
index d794e70c..00000000
--- a/lib/windows/tests/MobileSpecUnitTests/ManifestProcessor.js
+++ /dev/null
@@ -1,65 +0,0 @@
-
-var objArgs = WScript.Arguments;
-for (i = 0; i < objArgs.length; i++)
-{
-   WScript.Echo("Arg :: " + objArgs(i));
-}
-
-var projectFilePath = null;
-if(objArgs && objArgs.length > 0)
-{
-    projectFilePath = objArgs(0);
-}
-
-
-var fso = WScript.CreateObject("Scripting.FileSystemObject");
-
-var folder = fso.GetFolder("..\\..\\www");
-
-var outFile = fso.CreateTextFile("..\\..\\CordovaSourceDictionary.xml", true);
-
-outFile.WriteLine('<?xml version="1.0" encoding="utf-8"?>');
-outFile.WriteLine('<!-- This file is auto-generated, do not edit! -jm -->');
-outFile.WriteLine('<CordovaSourceDictionary>');
-
-function enumerateFolder(folder,parentPath)
-{
-	var files = new Enumerator(folder.files);
-	while(!files.atEnd())
-	{
-		WScript.Echo(parentPath + "\\" + fso.GetFileName(files.item()));
-		outFile.WriteLine('    <FilePath Value="' + parentPath + "\\" + fso.GetFileName(files.item()) + '"/>');
-		files.moveNext();
-	}
-
-	var subFolders = new Enumerator(folder.SubFolders);
-	while(!subFolders.atEnd())
-	{
-		var item = subFolders.item();
-		enumerateFolder(item, parentPath + "\\" + fso.GetFileName(item));
-		subFolders.moveNext();
-	}
-}
-enumerateFolder(folder,"www");
-
-// Next we need to get any Linked files from the project
-
-WScript.Echo("Adding Linked Files ...");
-if(projectFilePath != null)
-{
-    var projXml =  WScript.CreateObject("Microsoft.XMLDOM");
-    
-    projXml.async = false;
-    if(projXml.load(projectFilePath))
-    {
-        var nodes = projXml.selectNodes("Project/ItemGroup/Content/Link");
-        WScript.Echo("nodes.length" + nodes.length);
-        for(var n = 0; n < nodes.length; n++)
-        {
-            outFile.WriteLine('    <FilePath Value="' + nodes[n].text + '"/>');
-        }
-    }
-}
-
-outFile.WriteLine('</CordovaSourceDictionary>');
-
diff --git a/lib/windows/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj b/lib/windows/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
index 3c13fafa..6aa0a414 100644
--- a/lib/windows/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
+++ b/lib/windows/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
@@ -79,12 +79,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Properties\AppManifest.xml" />
-    <None Include="Properties\WMAppManifest.xml" />
+    <None Include="Properties\WMAppManifest.xml">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\..\js\pkg\cordova.wp7.js">
-      <Link>www\cordova.wp7.js</Link>
-    </Content>
     <Content Include="ApplicationIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -94,7 +93,15 @@
     <Content Include="CordovaSourceDictionary.xml" />
     <Content Include="www\accelerometer\index.html" />
     <Content Include="www\audio\index.html" />
+    <Content Include="www\autotest\html\HtmlReporter.js" />
+    <Content Include="www\autotest\html\HtmlReporterHelpers.js" />
+    <Content Include="www\autotest\html\ReporterView.js" />
+    <Content Include="www\autotest\html\SpecView.js" />
+    <Content Include="www\autotest\html\SuiteView.js" />
+    <Content Include="www\autotest\html\TrivialReporter.js" />
     <Content Include="www\autotest\index.html" />
+    <Content Include="www\autotest\jasmine.css" />
+    <Content Include="www\autotest\jasmine.js" />
     <Content Include="www\autotest\pages\accelerometer.html" />
     <Content Include="www\autotest\pages\all.html" />
     <Content Include="www\autotest\pages\battery.html" />
@@ -121,6 +128,7 @@
     <Content Include="www\autotest\tests\contacts.tests.js" />
     <Content Include="www\autotest\tests\device.tests.js" />
     <Content Include="www\autotest\tests\file.tests.js" />
+    <Content Include="www\autotest\tests\filetransfer.tests.js" />
     <Content Include="www\autotest\tests\geolocation.tests.js" />
     <Content Include="www\autotest\tests\media.tests.js" />
     <Content Include="www\autotest\tests\network.tests.js" />
@@ -133,6 +141,7 @@
     <Content Include="www\camera\index.html" />
     <Content Include="www\compass\index.html" />
     <Content Include="www\contacts\index.html" />
+    <Content Include="www\cordova-1.6.1.js" />
     <Content Include="www\events\index.html" />
     <Content Include="www\index.html" />
     <Content Include="www\location\index.html" />
@@ -144,7 +153,6 @@
     <Content Include="www\phonegap.js" />
     <Content Include="www\sql\index.html" />
     <Content Include="www\storage\index.html" />
-    <None Include="ManifestProcessor.js" />
     <Content Include="SplashScreenImage.jpg" />
   </ItemGroup>
   <ItemGroup>
@@ -167,6 +175,6 @@
   -->
   <ProjectExtensions />
   <PropertyGroup>
-    <PreBuildEvent>CScript "$(ProjectDir)/ManifestProcessor.js" "$(ProjectPath)"</PreBuildEvent>
+    <PreBuildEvent>CScript "$(ProjectDir)/BuildManifestProcessor.js" "$(ProjectPath)"</PreBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/HtmlReporter.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/HtmlReporter.js
new file mode 100644
index 00000000..7d9d9240
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/HtmlReporter.js
@@ -0,0 +1,101 @@
+jasmine.HtmlReporter = function(_doc) {
+  var self = this;
+  var doc = _doc || window.document;
+
+  var reporterView;
+
+  var dom = {};
+
+  // Jasmine Reporter Public Interface
+  self.logRunningSpecs = false;
+
+  self.reportRunnerStarting = function(runner) {
+    var specs = runner.specs() || [];
+
+    if (specs.length == 0) {
+      return;
+    }
+
+    createReporterDom(runner.env.versionString());
+    doc.body.appendChild(dom.reporter);
+
+    reporterView = new jasmine.HtmlReporter.ReporterView(dom);
+    reporterView.addSpecs(specs, self.specFilter);
+  };
+
+  self.reportRunnerResults = function(runner) {
+    reporterView && reporterView.complete();
+  };
+
+  self.reportSuiteResults = function(suite) {
+    reporterView.suiteComplete(suite);
+  };
+
+  self.reportSpecStarting = function(spec) {
+    if (self.logRunningSpecs) {
+      self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+    }
+  };
+
+  self.reportSpecResults = function(spec) {
+    reporterView.specComplete(spec);
+  };
+
+  self.log = function() {
+    var console = jasmine.getGlobal().console;
+    if (console && console.log) {
+      if (console.log.apply) {
+        console.log.apply(console, arguments);
+      } else {
+        console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
+      }
+    }
+  };
+
+  self.specFilter = function(spec) {
+    if (!focusedSpecName()) {
+      return true;
+    }
+
+    return spec.getFullName().indexOf(focusedSpecName()) === 0;
+  };
+
+  return self;
+
+  function focusedSpecName() {
+    var specName;
+
+    (function memoizeFocusedSpec() {
+      if (specName) {
+        return;
+      }
+
+      var paramMap = [];
+      var params = doc.location.search.substring(1).split('&');
+
+      for (var i = 0; i < params.length; i++) {
+        var p = params[i].split('=');
+        paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
+      }
+
+      specName = paramMap.spec;
+    })();
+
+    return specName;
+  }
+
+  function createReporterDom(version) {
+    dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' },
+      dom.banner = self.createDom('div', { className: 'banner' },
+        self.createDom('span', { className: 'title' }, "Jasmine "),
+        self.createDom('span', { className: 'version' }, version)),
+
+      dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}),
+      dom.alert = self.createDom('div', {className: 'alert'}),
+      dom.results = self.createDom('div', {className: 'results'},
+        dom.summary = self.createDom('div', { className: 'summary' }),
+        dom.details = self.createDom('div', { id: 'details' }))
+    );
+  }
+};
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/HtmlReporterHelpers.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/HtmlReporterHelpers.js
new file mode 100644
index 00000000..745e1e09
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/HtmlReporterHelpers.js
@@ -0,0 +1,60 @@
+jasmine.HtmlReporterHelpers = {};
+
+jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
+  var el = document.createElement(type);
+
+  for (var i = 2; i < arguments.length; i++) {
+    var child = arguments[i];
+
+    if (typeof child === 'string') {
+      el.appendChild(document.createTextNode(child));
+    } else {
+      if (child) {
+        el.appendChild(child);
+      }
+    }
+  }
+
+  for (var attr in attrs) {
+    if (attr == "className") {
+      el[attr] = attrs[attr];
+    } else {
+      el.setAttribute(attr, attrs[attr]);
+    }
+  }
+
+  return el;
+};
+
+jasmine.HtmlReporterHelpers.getSpecStatus = function(child) {
+  var results = child.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.skipped) {
+    status = 'skipped';
+  }
+
+  return status;
+};
+
+jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) {
+  var parentDiv = this.dom.summary;
+  var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
+  var parent = child[parentSuite];
+
+  if (parent) {
+    if (typeof this.views.suites[parent.id] == 'undefined') {
+      this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views);
+    }
+    parentDiv = this.views.suites[parent.id].element;
+  }
+
+  parentDiv.appendChild(childElement);
+};
+
+
+jasmine.HtmlReporterHelpers.addHelpers = function(ctor) {
+  for(var fn in jasmine.HtmlReporterHelpers) {
+    ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn];
+  }
+};
+
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/ReporterView.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/ReporterView.js
new file mode 100644
index 00000000..6a6d0056
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/ReporterView.js
@@ -0,0 +1,164 @@
+jasmine.HtmlReporter.ReporterView = function(dom) {
+  this.startedAt = new Date();
+  this.runningSpecCount = 0;
+  this.completeSpecCount = 0;
+  this.passedCount = 0;
+  this.failedCount = 0;
+  this.skippedCount = 0;
+
+  this.createResultsMenu = function() {
+    this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'},
+      this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'),
+      ' | ',
+      this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing'));
+
+    this.summaryMenuItem.onclick = function() {
+      dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, '');
+    };
+
+    this.detailsMenuItem.onclick = function() {
+      showDetails();
+    };
+  };
+
+  this.addSpecs = function(specs, specFilter) {
+    this.totalSpecCount = specs.length;
+
+    this.views = {
+      specs: {},
+      suites: {}
+    };
+
+    for (var i = 0; i < specs.length; i++) {
+      var spec = specs[i];
+      this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views);
+      if (specFilter(spec)) {
+        this.runningSpecCount++;
+      }
+    }
+  };
+
+  this.specComplete = function(spec) {
+    this.completeSpecCount++;
+
+    if (isUndefined(this.views.specs[spec.id])) {
+      this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom);
+    }
+
+    var specView = this.views.specs[spec.id];
+
+    switch (specView.status()) {
+      case 'passed':
+        this.passedCount++;
+        break;
+
+      case 'failed':
+        this.failedCount++;
+        break;
+
+      case 'skipped':
+        this.skippedCount++;
+        break;
+    }
+
+    specView.refresh();
+    this.refresh();
+  };
+
+  this.suiteComplete = function(suite) {
+    var suiteView = this.views.suites[suite.id];
+    if (isUndefined(suiteView)) {
+      return;
+    }
+    suiteView.refresh();
+  };
+
+  this.refresh = function() {
+
+    if (isUndefined(this.resultsMenu)) {
+      this.createResultsMenu();
+    }
+
+    // currently running UI
+    if (isUndefined(this.runningAlert)) {
+      this.runningAlert = this.createDom('a', {href: "?", className: "runningAlert bar"});
+      dom.alert.appendChild(this.runningAlert);
+    }
+    this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount);
+
+    // skipped specs UI
+    if (isUndefined(this.skippedAlert)) {
+      this.skippedAlert = this.createDom('a', {href: "?", className: "skippedAlert bar"});
+    }
+
+    this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
+
+    if (this.skippedCount === 1 && isDefined(dom.alert)) {
+      dom.alert.appendChild(this.skippedAlert);
+    }
+
+    // passing specs UI
+    if (isUndefined(this.passedAlert)) {
+      this.passedAlert = this.createDom('span', {href: "?", className: "passingAlert bar"});
+    }
+    this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount);
+
+    // failing specs UI
+    if (isUndefined(this.failedAlert)) {
+      this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"});
+    }
+    this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount);
+
+    if (this.failedCount === 1 && isDefined(dom.alert)) {
+      dom.alert.appendChild(this.failedAlert);
+      dom.alert.appendChild(this.resultsMenu);
+    }
+
+    // summary info
+    this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount);
+    this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing";
+  };
+
+  this.complete = function() {
+    dom.alert.removeChild(this.runningAlert);
+
+    this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
+
+    if (this.failedCount === 0) {
+      dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount)));
+    } else {
+      showDetails();
+    }
+
+    dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"));
+  };
+
+  return this;
+
+  function showDetails() {
+    if (dom.reporter.className.search(/showDetails/) === -1) {
+      dom.reporter.className += " showDetails";
+    }
+  }
+
+  function isUndefined(obj) {
+    return typeof obj === 'undefined';
+  }
+
+  function isDefined(obj) {
+    return !isUndefined(obj);
+  }
+
+  function specPluralizedFor(count) {
+    var str = count + " spec";
+    if (count > 1) {
+      str += "s"
+    }
+    return str;
+  }
+
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView);
+
+
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/SpecView.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/SpecView.js
new file mode 100644
index 00000000..8769bb84
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/SpecView.js
@@ -0,0 +1,79 @@
+jasmine.HtmlReporter.SpecView = function(spec, dom, views) {
+  this.spec = spec;
+  this.dom = dom;
+  this.views = views;
+
+  this.symbol = this.createDom('li', { className: 'pending' });
+  this.dom.symbolSummary.appendChild(this.symbol);
+
+  this.summary = this.createDom('div', { className: 'specSummary' },
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
+        title: this.spec.getFullName()
+      }, this.spec.description)
+  );
+
+  this.detail = this.createDom('div', { className: 'specDetail' },
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
+        title: this.spec.getFullName()
+      }, this.spec.getFullName())
+  );
+};
+
+jasmine.HtmlReporter.SpecView.prototype.status = function() {
+  return this.getSpecStatus(this.spec);
+};
+
+jasmine.HtmlReporter.SpecView.prototype.refresh = function() {
+  this.symbol.className = this.status();
+
+  switch (this.status()) {
+    case 'skipped':
+      break;
+
+    case 'passed':
+      this.appendSummaryToSuiteDiv();
+      break;
+
+    case 'failed':
+      this.appendSummaryToSuiteDiv();
+      this.appendFailureDetail();
+      break;
+  }
+};
+
+jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() {
+  this.summary.className += ' ' + this.status();
+  this.appendToSummary(this.spec, this.summary);
+};
+
+jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() {
+  this.detail.className += ' ' + this.status();
+
+  var resultItems = this.spec.results().getItems();
+  var messagesDiv = this.createDom('div', { className: 'messages' });
+
+  for (var i = 0; i < resultItems.length; i++) {
+    var result = resultItems[i];
+
+    if (result.type == 'log') {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
+    } else if (result.type == 'expect' && result.passed && !result.passed()) {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
+
+      if (result.trace.stack) {
+        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
+      }
+    }
+  }
+
+  if (messagesDiv.childNodes.length > 0) {
+    this.detail.appendChild(messagesDiv);
+    this.dom.details.appendChild(this.detail);
+  }
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);
\ No newline at end of file
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/SuiteView.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/SuiteView.js
new file mode 100644
index 00000000..19a1efaf
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/SuiteView.js
@@ -0,0 +1,22 @@
+jasmine.HtmlReporter.SuiteView = function(suite, dom, views) {
+  this.suite = suite;
+  this.dom = dom;
+  this.views = views;
+
+  this.element = this.createDom('div', { className: 'suite' },
+      this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(this.suite.getFullName()) }, this.suite.description)
+  );
+
+  this.appendToSummary(this.suite, this.element);
+};
+
+jasmine.HtmlReporter.SuiteView.prototype.status = function() {
+  return this.getSpecStatus(this.suite);
+};
+
+jasmine.HtmlReporter.SuiteView.prototype.refresh = function() {
+  this.element.className += " " + this.status();
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView);
+
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/TrivialReporter.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/TrivialReporter.js
new file mode 100644
index 00000000..167ac506
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/html/TrivialReporter.js
@@ -0,0 +1,192 @@
+/* @deprecated Use jasmine.HtmlReporter instead
+ */
+jasmine.TrivialReporter = function(doc) {
+  this.document = doc || document;
+  this.suiteDivs = {};
+  this.logRunningSpecs = false;
+};
+
+jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
+  var el = document.createElement(type);
+
+  for (var i = 2; i < arguments.length; i++) {
+    var child = arguments[i];
+
+    if (typeof child === 'string') {
+      el.appendChild(document.createTextNode(child));
+    } else {
+      if (child) { el.appendChild(child); }
+    }
+  }
+
+  for (var attr in attrs) {
+    if (attr == "className") {
+      el[attr] = attrs[attr];
+    } else {
+      el.setAttribute(attr, attrs[attr]);
+    }
+  }
+
+  return el;
+};
+
+jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
+  var showPassed, showSkipped;
+
+  this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' },
+      this.createDom('div', { className: 'banner' },
+        this.createDom('div', { className: 'logo' },
+            this.createDom('span', { className: 'title' }, "Jasmine"),
+            this.createDom('span', { className: 'version' }, runner.env.versionString())),
+        this.createDom('div', { className: 'options' },
+            "Show ",
+            showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
+            this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
+            showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
+            this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
+            )
+          ),
+
+      this.runnerDiv = this.createDom('div', { className: 'runner running' },
+          this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
+          this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
+          this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
+      );
+
+  this.document.body.appendChild(this.outerDiv);
+
+  var suites = runner.suites();
+  for (var i = 0; i < suites.length; i++) {
+    var suite = suites[i];
+    var suiteDiv = this.createDom('div', { className: 'suite' },
+        this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
+        this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
+    this.suiteDivs[suite.id] = suiteDiv;
+    var parentDiv = this.outerDiv;
+    if (suite.parentSuite) {
+      parentDiv = this.suiteDivs[suite.parentSuite.id];
+    }
+    parentDiv.appendChild(suiteDiv);
+  }
+
+  this.startedAt = new Date();
+
+  var self = this;
+  showPassed.onclick = function(evt) {
+    if (showPassed.checked) {
+      self.outerDiv.className += ' show-passed';
+    } else {
+      self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
+    }
+  };
+
+  showSkipped.onclick = function(evt) {
+    if (showSkipped.checked) {
+      self.outerDiv.className += ' show-skipped';
+    } else {
+      self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
+    }
+  };
+};
+
+jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
+  var results = runner.results();
+  var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
+  this.runnerDiv.setAttribute("class", className);
+  //do it twice for IE
+  this.runnerDiv.setAttribute("className", className);
+  var specs = runner.specs();
+  var specCount = 0;
+  for (var i = 0; i < specs.length; i++) {
+    if (this.specFilter(specs[i])) {
+      specCount++;
+    }
+  }
+  var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
+  message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
+  this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
+
+  this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
+};
+
+jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
+  var results = suite.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.totalCount === 0) { // todo: change this to check results.skipped
+    status = 'skipped';
+  }
+  this.suiteDivs[suite.id].className += " " + status;
+};
+
+jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
+  if (this.logRunningSpecs) {
+    this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+  }
+};
+
+jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
+  var results = spec.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.skipped) {
+    status = 'skipped';
+  }
+  var specDiv = this.createDom('div', { className: 'spec '  + status },
+      this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(spec.getFullName()),
+        title: spec.getFullName()
+      }, spec.description));
+
+
+  var resultItems = results.getItems();
+  var messagesDiv = this.createDom('div', { className: 'messages' });
+  for (var i = 0; i < resultItems.length; i++) {
+    var result = resultItems[i];
+
+    if (result.type == 'log') {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
+    } else if (result.type == 'expect' && result.passed && !result.passed()) {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
+
+      if (result.trace.stack) {
+        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
+      }
+    }
+  }
+
+  if (messagesDiv.childNodes.length > 0) {
+    specDiv.appendChild(messagesDiv);
+  }
+
+  this.suiteDivs[spec.suite.id].appendChild(specDiv);
+};
+
+jasmine.TrivialReporter.prototype.log = function() {
+  var console = jasmine.getGlobal().console;
+  if (console && console.log) {
+    if (console.log.apply) {
+      console.log.apply(console, arguments);
+    } else {
+      console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
+    }
+  }
+};
+
+jasmine.TrivialReporter.prototype.getLocation = function() {
+  return this.document.location;
+};
+
+jasmine.TrivialReporter.prototype.specFilter = function(spec) {
+  var paramMap = {};
+  var params = this.getLocation().search.substring(1).split('&');
+  for (var i = 0; i < params.length; i++) {
+    var p = params[i].split('=');
+    paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
+  }
+
+  if (!paramMap.spec) {
+    return true;
+  }
+  return spec.getFullName().indexOf(paramMap.spec) === 0;
+};
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/jasmine.css b/lib/windows/tests/MobileSpecUnitTests/www/autotest/jasmine.css
new file mode 100644
index 00000000..826e5753
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/jasmine.css
@@ -0,0 +1,81 @@
+body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
+
+#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
+#HTMLReporter a { text-decoration: none; }
+#HTMLReporter a:hover { text-decoration: underline; }
+#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
+#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
+#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
+#HTMLReporter .version { color: #aaaaaa; }
+#HTMLReporter .banner { margin-top: 14px; }
+#HTMLReporter .duration { color: #aaaaaa; float: right; }
+#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
+#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
+#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
+#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; }
+#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
+#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
+#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
+#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
+#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
+#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
+#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
+#HTMLReporter .runningAlert { background-color: #666666; }
+#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
+#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
+#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
+#HTMLReporter .passingAlert { background-color: #a6b779; }
+#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; }
+#HTMLReporter .failingAlert { background-color: #cf867e; }
+#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
+#HTMLReporter .results { margin-top: 14px; }
+#HTMLReporter #details { display: none; }
+#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; }
+#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
+#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
+#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
+#HTMLReporter.showDetails .summary { display: none; }
+#HTMLReporter.showDetails #details { display: block; }
+#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
+#HTMLReporter .summary { margin-top: 14px; }
+#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
+#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; }
+#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
+#HTMLReporter .description + .suite { margin-top: 0; }
+#HTMLReporter .suite { margin-top: 14px; }
+#HTMLReporter .suite a { color: #333333; }
+#HTMLReporter #details .specDetail { margin-bottom: 28px; }
+#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
+#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; }
+#HTMLReporter .resultMessage span.result { display: block; }
+#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
+
+#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
+#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
+#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
+#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
+#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
+#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
+#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
+#TrivialReporter .runner.running { background-color: yellow; }
+#TrivialReporter .options { text-align: right; font-size: .8em; }
+#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
+#TrivialReporter .suite .suite { margin: 5px; }
+#TrivialReporter .suite.passed { background-color: #dfd; }
+#TrivialReporter .suite.failed { background-color: #fdd; }
+#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
+#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
+#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
+#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
+#TrivialReporter .spec.skipped { background-color: #bbb; }
+#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
+#TrivialReporter .passed { background-color: #cfc; display: none; }
+#TrivialReporter .failed { background-color: #fbb; }
+#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
+#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
+#TrivialReporter .resultMessage .mismatch { color: black; }
+#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
+#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
+#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
+#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
+#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/jasmine.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/jasmine.js
new file mode 100644
index 00000000..bccb66c3
--- /dev/null
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/jasmine.js
@@ -0,0 +1,2530 @@
+var isCommonJS = typeof window == "undefined";
+
+/**
+ * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.
+ *
+ * @namespace
+ */
+var jasmine = {};
+if (isCommonJS) exports.jasmine = jasmine;
+/**
+ * @private
+ */
+jasmine.unimplementedMethod_ = function() {
+  throw new Error("unimplemented method");
+};
+
+/**
+ * Use <code>jasmine.undefined</code> instead of <code>undefined</code>, since <code>undefined</code> is just
+ * a plain old variable and may be redefined by somebody else.
+ *
+ * @private
+ */
+jasmine.undefined = jasmine.___undefined___;
+
+/**
+ * Show diagnostic messages in the console if set to true
+ *
+ */
+jasmine.VERBOSE = false;
+
+/**
+ * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
+ *
+ */
+jasmine.DEFAULT_UPDATE_INTERVAL = 250;
+
+/**
+ * Default timeout interval in milliseconds for waitsFor() blocks.
+ */
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
+
+jasmine.getGlobal = function() {
+  function getGlobal() {
+    return this;
+  }
+
+  return getGlobal();
+};
+
+/**
+ * Allows for bound functions to be compared.  Internal use only.
+ *
+ * @ignore
+ * @private
+ * @param base {Object} bound 'this' for the function
+ * @param name {Function} function to find
+ */
+jasmine.bindOriginal_ = function(base, name) {
+  var original = base[name];
+  if (original.apply) {
+    return function() {
+      return original.apply(base, arguments);
+    };
+  } else {
+    // IE support
+    return jasmine.getGlobal()[name];
+  }
+};
+
+jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout');
+jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout');
+jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval');
+jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval');
+
+jasmine.MessageResult = function(values) {
+  this.type = 'log';
+  this.values = values;
+  this.trace = new Error(); // todo: test better
+};
+
+jasmine.MessageResult.prototype.toString = function() {
+  var text = "";
+  for (var i = 0; i < this.values.length; i++) {
+    if (i > 0) text += " ";
+    if (jasmine.isString_(this.values[i])) {
+      text += this.values[i];
+    } else {
+      text += jasmine.pp(this.values[i]);
+    }
+  }
+  return text;
+};
+
+jasmine.ExpectationResult = function(params) {
+  this.type = 'expect';
+  this.matcherName = params.matcherName;
+  this.passed_ = params.passed;
+  this.expected = params.expected;
+  this.actual = params.actual;
+  this.message = this.passed_ ? 'Passed.' : params.message;
+
+  var trace = (params.trace || new Error(this.message));
+  this.trace = this.passed_ ? '' : trace;
+};
+
+jasmine.ExpectationResult.prototype.toString = function () {
+  return this.message;
+};
+
+jasmine.ExpectationResult.prototype.passed = function () {
+  return this.passed_;
+};
+
+/**
+ * Getter for the Jasmine environment. Ensures one gets created
+ */
+jasmine.getEnv = function() {
+  var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env();
+  return env;
+};
+
+/**
+ * @ignore
+ * @private
+ * @param value
+ * @returns {Boolean}
+ */
+jasmine.isArray_ = function(value) {
+  return jasmine.isA_("Array", value);
+};
+
+/**
+ * @ignore
+ * @private
+ * @param value
+ * @returns {Boolean}
+ */
+jasmine.isString_ = function(value) {
+  return jasmine.isA_("String", value);
+};
+
+/**
+ * @ignore
+ * @private
+ * @param value
+ * @returns {Boolean}
+ */
+jasmine.isNumber_ = function(value) {
+  return jasmine.isA_("Number", value);
+};
+
+/**
+ * @ignore
+ * @private
+ * @param {String} typeName
+ * @param value
+ * @returns {Boolean}
+ */
+jasmine.isA_ = function(typeName, value) {
+  return Object.prototype.toString.apply(value) === '[object ' + typeName + ']';
+};
+
+/**
+ * Pretty printer for expecations.  Takes any object and turns it into a human-readable string.
+ *
+ * @param value {Object} an object to be outputted
+ * @returns {String}
+ */
+jasmine.pp = function(value) {
+  var stringPrettyPrinter = new jasmine.StringPrettyPrinter();
+  stringPrettyPrinter.format(value);
+  return stringPrettyPrinter.string;
+};
+
+/**
+ * Returns true if the object is a DOM Node.
+ *
+ * @param {Object} obj object to check
+ * @returns {Boolean}
+ */
+jasmine.isDomNode = function(obj) {
+  return obj.nodeType > 0;
+};
+
+/**
+ * Returns a matchable 'generic' object of the class type.  For use in expecations of type when values don't matter.
+ *
+ * @example
+ * // don't care about which function is passed in, as long as it's a function
+ * expect(mySpy).toHaveBeenCalledWith(jasmine.any(Function));
+ *
+ * @param {Class} clazz
+ * @returns matchable object of the type clazz
+ */
+jasmine.any = function(clazz) {
+  return new jasmine.Matchers.Any(clazz);
+};
+
+/**
+ * Returns a matchable subset of a JSON object. For use in expectations when you don't care about all of the
+ * attributes on the object.
+ *
+ * @example
+ * // don't care about any other attributes than foo.
+ * expect(mySpy).toHaveBeenCalledWith(jasmine.objectContaining({foo: "bar"});
+ *
+ * @param sample {Object} sample
+ * @returns matchable object for the sample
+ */
+jasmine.objectContaining = function (sample) {
+    return new jasmine.Matchers.ObjectContaining(sample);
+};
+
+/**
+ * Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks.
+ *
+ * Spies should be created in test setup, before expectations.  They can then be checked, using the standard Jasmine
+ * expectation syntax. Spies can be checked if they were called or not and what the calling params were.
+ *
+ * A Spy has the following fields: wasCalled, callCount, mostRecentCall, and argsForCall (see docs).
+ *
+ * Spies are torn down at the end of every spec.
+ *
+ * Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj.
+ *
+ * @example
+ * // a stub
+ * var myStub = jasmine.createSpy('myStub');  // can be used anywhere
+ *
+ * // spy example
+ * var foo = {
+ *   not: function(bool) { return !bool; }
+ * }
+ *
+ * // actual foo.not will not be called, execution stops
+ * spyOn(foo, 'not');
+
+ // foo.not spied upon, execution will continue to implementation
+ * spyOn(foo, 'not').andCallThrough();
+ *
+ * // fake example
+ * var foo = {
+ *   not: function(bool) { return !bool; }
+ * }
+ *
+ * // foo.not(val) will return val
+ * spyOn(foo, 'not').andCallFake(function(value) {return value;});
+ *
+ * // mock example
+ * foo.not(7 == 7);
+ * expect(foo.not).toHaveBeenCalled();
+ * expect(foo.not).toHaveBeenCalledWith(true);
+ *
+ * @constructor
+ * @see spyOn, jasmine.createSpy, jasmine.createSpyObj
+ * @param {String} name
+ */
+jasmine.Spy = function(name) {
+  /**
+   * The name of the spy, if provided.
+   */
+  this.identity = name || 'unknown';
+  /**
+   *  Is this Object a spy?
+   */
+  this.isSpy = true;
+  /**
+   * The actual function this spy stubs.
+   */
+  this.plan = function() {
+  };
+  /**
+   * Tracking of the most recent call to the spy.
+   * @example
+   * var mySpy = jasmine.createSpy('foo');
+   * mySpy(1, 2);
+   * mySpy.mostRecentCall.args = [1, 2];
+   */
+  this.mostRecentCall = {};
+
+  /**
+   * Holds arguments for each call to the spy, indexed by call count
+   * @example
+   * var mySpy = jasmine.createSpy('foo');
+   * mySpy(1, 2);
+   * mySpy(7, 8);
+   * mySpy.mostRecentCall.args = [7, 8];
+   * mySpy.argsForCall[0] = [1, 2];
+   * mySpy.argsForCall[1] = [7, 8];
+   */
+  this.argsForCall = [];
+  this.calls = [];
+};
+
+/**
+ * Tells a spy to call through to the actual implemenatation.
+ *
+ * @example
+ * var foo = {
+ *   bar: function() { // do some stuff }
+ * }
+ *
+ * // defining a spy on an existing property: foo.bar
+ * spyOn(foo, 'bar').andCallThrough();
+ */
+jasmine.Spy.prototype.andCallThrough = function() {
+  this.plan = this.originalValue;
+  return this;
+};
+
+/**
+ * For setting the return value of a spy.
+ *
+ * @example
+ * // defining a spy from scratch: foo() returns 'baz'
+ * var foo = jasmine.createSpy('spy on foo').andReturn('baz');
+ *
+ * // defining a spy on an existing property: foo.bar() returns 'baz'
+ * spyOn(foo, 'bar').andReturn('baz');
+ *
+ * @param {Object} value
+ */
+jasmine.Spy.prototype.andReturn = function(value) {
+  this.plan = function() {
+    return value;
+  };
+  return this;
+};
+
+/**
+ * For throwing an exception when a spy is called.
+ *
+ * @example
+ * // defining a spy from scratch: foo() throws an exception w/ message 'ouch'
+ * var foo = jasmine.createSpy('spy on foo').andThrow('baz');
+ *
+ * // defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch'
+ * spyOn(foo, 'bar').andThrow('baz');
+ *
+ * @param {String} exceptionMsg
+ */
+jasmine.Spy.prototype.andThrow = function(exceptionMsg) {
+  this.plan = function() {
+    throw exceptionMsg;
+  };
+  return this;
+};
+
+/**
+ * Calls an alternate implementation when a spy is called.
+ *
+ * @example
+ * var baz = function() {
+ *   // do some stuff, return something
+ * }
+ * // defining a spy from scratch: foo() calls the function baz
+ * var foo = jasmine.createSpy('spy on foo').andCall(baz);
+ *
+ * // defining a spy on an existing property: foo.bar() calls an anonymnous function
+ * spyOn(foo, 'bar').andCall(function() { return 'baz';} );
+ *
+ * @param {Function} fakeFunc
+ */
+jasmine.Spy.prototype.andCallFake = function(fakeFunc) {
+  this.plan = fakeFunc;
+  return this;
+};
+
+/**
+ * Resets all of a spy's the tracking variables so that it can be used again.
+ *
+ * @example
+ * spyOn(foo, 'bar');
+ *
+ * foo.bar();
+ *
+ * expect(foo.bar.callCount).toEqual(1);
+ *
+ * foo.bar.reset();
+ *
+ * expect(foo.bar.callCount).toEqual(0);
+ */
+jasmine.Spy.prototype.reset = function() {
+  this.wasCalled = false;
+  this.callCount = 0;
+  this.argsForCall = [];
+  this.calls = [];
+  this.mostRecentCall = {};
+};
+
+jasmine.createSpy = function(name) {
+
+  var spyObj = function() {
+    spyObj.wasCalled = true;
+    spyObj.callCount++;
+    var args = jasmine.util.argsToArray(arguments);
+    spyObj.mostRecentCall.object = this;
+    spyObj.mostRecentCall.args = args;
+    spyObj.argsForCall.push(args);
+    spyObj.calls.push({object: this, args: args});
+    return spyObj.plan.apply(this, arguments);
+  };
+
+  var spy = new jasmine.Spy(name);
+
+  for (var prop in spy) {
+    spyObj[prop] = spy[prop];
+  }
+
+  spyObj.reset();
+
+  return spyObj;
+};
+
+/**
+ * Determines whether an object is a spy.
+ *
+ * @param {jasmine.Spy|Object} putativeSpy
+ * @returns {Boolean}
+ */
+jasmine.isSpy = function(putativeSpy) {
+  return putativeSpy && putativeSpy.isSpy;
+};
+
+/**
+ * Creates a more complicated spy: an Object that has every property a function that is a spy.  Used for stubbing something
+ * large in one call.
+ *
+ * @param {String} baseName name of spy class
+ * @param {Array} methodNames array of names of methods to make spies
+ */
+jasmine.createSpyObj = function(baseName, methodNames) {
+  if (!jasmine.isArray_(methodNames) || methodNames.length === 0) {
+    throw new Error('createSpyObj requires a non-empty array of method names to create spies for');
+  }
+  var obj = {};
+  for (var i = 0; i < methodNames.length; i++) {
+    obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]);
+  }
+  return obj;
+};
+
+/**
+ * All parameters are pretty-printed and concatenated together, then written to the current spec's output.
+ *
+ * Be careful not to leave calls to <code>jasmine.log</code> in production code.
+ */
+jasmine.log = function() {
+  var spec = jasmine.getEnv().currentSpec;
+  spec.log.apply(spec, arguments);
+};
+
+/**
+ * Function that installs a spy on an existing object's method name.  Used within a Spec to create a spy.
+ *
+ * @example
+ * // spy example
+ * var foo = {
+ *   not: function(bool) { return !bool; }
+ * }
+ * spyOn(foo, 'not'); // actual foo.not will not be called, execution stops
+ *
+ * @see jasmine.createSpy
+ * @param obj
+ * @param methodName
+ * @returns a Jasmine spy that can be chained with all spy methods
+ */
+var spyOn = function(obj, methodName) {
+  return jasmine.getEnv().currentSpec.spyOn(obj, methodName);
+};
+if (isCommonJS) exports.spyOn = spyOn;
+
+/**
+ * Creates a Jasmine spec that will be added to the current suite.
+ *
+ * // TODO: pending tests
+ *
+ * @example
+ * it('should be true', function() {
+ *   expect(true).toEqual(true);
+ * });
+ *
+ * @param {String} desc description of this specification
+ * @param {Function} func defines the preconditions and expectations of the spec
+ */
+var it = function(desc, func) {
+  return jasmine.getEnv().it(desc, func);
+};
+if (isCommonJS) exports.it = it;
+
+/**
+ * Creates a <em>disabled</em> Jasmine spec.
+ *
+ * A convenience method that allows existing specs to be disabled temporarily during development.
+ *
+ * @param {String} desc description of this specification
+ * @param {Function} func defines the preconditions and expectations of the spec
+ */
+var xit = function(desc, func) {
+  return jasmine.getEnv().xit(desc, func);
+};
+if (isCommonJS) exports.xit = xit;
+
+/**
+ * Starts a chain for a Jasmine expectation.
+ *
+ * It is passed an Object that is the actual value and should chain to one of the many
+ * jasmine.Matchers functions.
+ *
+ * @param {Object} actual Actual value to test against and expected value
+ */
+var expect = function(actual) {
+  return jasmine.getEnv().currentSpec.expect(actual);
+};
+if (isCommonJS) exports.expect = expect;
+
+/**
+ * Defines part of a jasmine spec.  Used in cominbination with waits or waitsFor in asynchrnous specs.
+ *
+ * @param {Function} func Function that defines part of a jasmine spec.
+ */
+var runs = function(func) {
+  jasmine.getEnv().currentSpec.runs(func);
+};
+if (isCommonJS) exports.runs = runs;
+
+/**
+ * Waits a fixed time period before moving to the next block.
+ *
+ * @deprecated Use waitsFor() instead
+ * @param {Number} timeout milliseconds to wait
+ */
+var waits = function(timeout) {
+  jasmine.getEnv().currentSpec.waits(timeout);
+};
+if (isCommonJS) exports.waits = waits;
+
+/**
+ * Waits for the latchFunction to return true before proceeding to the next block.
+ *
+ * @param {Function} latchFunction
+ * @param {String} optional_timeoutMessage
+ * @param {Number} optional_timeout
+ */
+var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
+  jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments);
+};
+if (isCommonJS) exports.waitsFor = waitsFor;
+
+/**
+ * A function that is called before each spec in a suite.
+ *
+ * Used for spec setup, including validating assumptions.
+ *
+ * @param {Function} beforeEachFunction
+ */
+var beforeEach = function(beforeEachFunction) {
+  jasmine.getEnv().beforeEach(beforeEachFunction);
+};
+if (isCommonJS) exports.beforeEach = beforeEach;
+
+/**
+ * A function that is called after each spec in a suite.
+ *
+ * Used for restoring any state that is hijacked during spec execution.
+ *
+ * @param {Function} afterEachFunction
+ */
+var afterEach = function(afterEachFunction) {
+  jasmine.getEnv().afterEach(afterEachFunction);
+};
+if (isCommonJS) exports.afterEach = afterEach;
+
+/**
+ * Defines a suite of specifications.
+ *
+ * Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared
+ * are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization
+ * of setup in some tests.
+ *
+ * @example
+ * // TODO: a simple suite
+ *
+ * // TODO: a simple suite with a nested describe block
+ *
+ * @param {String} description A string, usually the class under test.
+ * @param {Function} specDefinitions function that defines several specs.
+ */
+var describe = function(description, specDefinitions) {
+  return jasmine.getEnv().describe(description, specDefinitions);
+};
+if (isCommonJS) exports.describe = describe;
+
+/**
+ * Disables a suite of specifications.  Used to disable some suites in a file, or files, temporarily during development.
+ *
+ * @param {String} description A string, usually the class under test.
+ * @param {Function} specDefinitions function that defines several specs.
+ */
+var xdescribe = function(description, specDefinitions) {
+  return jasmine.getEnv().xdescribe(description, specDefinitions);
+};
+if (isCommonJS) exports.xdescribe = xdescribe;
+
+
+// Provide the XMLHttpRequest class for IE 5.x-6.x:
+jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
+  function tryIt(f) {
+    try {
+      return f();
+    } catch(e) {
+    }
+    return null;
+  }
+
+  var xhr = tryIt(function() {
+    return new ActiveXObject("Msxml2.XMLHTTP.6.0");
+  }) ||
+    tryIt(function() {
+      return new ActiveXObject("Msxml2.XMLHTTP.3.0");
+    }) ||
+    tryIt(function() {
+      return new ActiveXObject("Msxml2.XMLHTTP");
+    }) ||
+    tryIt(function() {
+      return new ActiveXObject("Microsoft.XMLHTTP");
+    });
+
+  if (!xhr) throw new Error("This browser does not support XMLHttpRequest.");
+
+  return xhr;
+} : XMLHttpRequest;
+/**
+ * @namespace
+ */
+jasmine.util = {};
+
+/**
+ * Declare that a child class inherit it's prototype from the parent class.
+ *
+ * @private
+ * @param {Function} childClass
+ * @param {Function} parentClass
+ */
+jasmine.util.inherit = function(childClass, parentClass) {
+  /**
+   * @private
+   */
+  var subclass = function() {
+  };
+  subclass.prototype = parentClass.prototype;
+  childClass.prototype = new subclass();
+};
+
+jasmine.util.formatException = function(e) {
+  var lineNumber;
+  if (e.line) {
+    lineNumber = e.line;
+  }
+  else if (e.lineNumber) {
+    lineNumber = e.lineNumber;
+  }
+
+  var file;
+
+  if (e.sourceURL) {
+    file = e.sourceURL;
+  }
+  else if (e.fileName) {
+    file = e.fileName;
+  }
+
+  var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString();
+
+  if (file && lineNumber) {
+    message += ' in ' + file + ' (line ' + lineNumber + ')';
+  }
+
+  return message;
+};
+
+jasmine.util.htmlEscape = function(str) {
+  if (!str) return str;
+  return str.replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
+};
+
+jasmine.util.argsToArray = function(args) {
+  var arrayOfArgs = [];
+  for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
+  return arrayOfArgs;
+};
+
+jasmine.util.extend = function(destination, source) {
+  for (var property in source) destination[property] = source[property];
+  return destination;
+};
+
+/**
+ * Environment for Jasmine
+ *
+ * @constructor
+ */
+jasmine.Env = function() {
+  this.currentSpec = null;
+  this.currentSuite = null;
+  this.currentRunner_ = new jasmine.Runner(this);
+
+  this.reporter = new jasmine.MultiReporter();
+
+  this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL;
+  this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+  this.lastUpdate = 0;
+  this.specFilter = function() {
+    return true;
+  };
+
+  this.nextSpecId_ = 0;
+  this.nextSuiteId_ = 0;
+  this.equalityTesters_ = [];
+
+  // wrap matchers
+  this.matchersClass = function() {
+    jasmine.Matchers.apply(this, arguments);
+  };
+  jasmine.util.inherit(this.matchersClass, jasmine.Matchers);
+
+  jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass);
+};
+
+
+jasmine.Env.prototype.setTimeout = jasmine.setTimeout;
+jasmine.Env.prototype.clearTimeout = jasmine.clearTimeout;
+jasmine.Env.prototype.setInterval = jasmine.setInterval;
+jasmine.Env.prototype.clearInterval = jasmine.clearInterval;
+
+/**
+ * @returns an object containing jasmine version build info, if set.
+ */
+jasmine.Env.prototype.version = function () {
+  if (jasmine.version_) {
+    return jasmine.version_;
+  } else {
+    throw new Error('Version not set');
+  }
+};
+
+/**
+ * @returns string containing jasmine version build info, if set.
+ */
+jasmine.Env.prototype.versionString = function() {
+  if (!jasmine.version_) {
+    return "version unknown";
+  }
+
+  var version = this.version();
+  var versionString = version.major + "." + version.minor + "." + version.build;
+  if (version.release_candidate) {
+    versionString += ".rc" + version.release_candidate;
+  }
+  versionString += " revision " + version.revision;
+  return versionString;
+};
+
+/**
+ * @returns a sequential integer starting at 0
+ */
+jasmine.Env.prototype.nextSpecId = function () {
+  return this.nextSpecId_++;
+};
+
+/**
+ * @returns a sequential integer starting at 0
+ */
+jasmine.Env.prototype.nextSuiteId = function () {
+  return this.nextSuiteId_++;
+};
+
+/**
+ * Register a reporter to receive status updates from Jasmine.
+ * @param {jasmine.Reporter} reporter An object which will receive status updates.
+ */
+jasmine.Env.prototype.addReporter = function(reporter) {
+  this.reporter.addReporter(reporter);
+};
+
+jasmine.Env.prototype.execute = function() {
+  this.currentRunner_.execute();
+};
+
+jasmine.Env.prototype.describe = function(description, specDefinitions) {
+  var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite);
+
+  var parentSuite = this.currentSuite;
+  if (parentSuite) {
+    parentSuite.add(suite);
+  } else {
+    this.currentRunner_.add(suite);
+  }
+
+  this.currentSuite = suite;
+
+  var declarationError = null;
+  try {
+    specDefinitions.call(suite);
+  } catch(e) {
+    declarationError = e;
+  }
+
+  if (declarationError) {
+    this.it("encountered a declaration exception", function() {
+      throw declarationError;
+    });
+  }
+
+  this.currentSuite = parentSuite;
+
+  return suite;
+};
+
+jasmine.Env.prototype.beforeEach = function(beforeEachFunction) {
+  if (this.currentSuite) {
+    this.currentSuite.beforeEach(beforeEachFunction);
+  } else {
+    this.currentRunner_.beforeEach(beforeEachFunction);
+  }
+};
+
+jasmine.Env.prototype.currentRunner = function () {
+  return this.currentRunner_;
+};
+
+jasmine.Env.prototype.afterEach = function(afterEachFunction) {
+  if (this.currentSuite) {
+    this.currentSuite.afterEach(afterEachFunction);
+  } else {
+    this.currentRunner_.afterEach(afterEachFunction);
+  }
+
+};
+
+jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) {
+  return {
+    execute: function() {
+    }
+  };
+};
+
+jasmine.Env.prototype.it = function(description, func) {
+  var spec = new jasmine.Spec(this, this.currentSuite, description);
+  this.currentSuite.add(spec);
+  this.currentSpec = spec;
+
+  if (func) {
+    spec.runs(func);
+  }
+
+  return spec;
+};
+
+jasmine.Env.prototype.xit = function(desc, func) {
+  return {
+    id: this.nextSpecId(),
+    runs: function() {
+    }
+  };
+};
+
+jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) {
+  if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) {
+    return true;
+  }
+
+  a.__Jasmine_been_here_before__ = b;
+  b.__Jasmine_been_here_before__ = a;
+
+  var hasKey = function(obj, keyName) {
+    return obj !== null && obj[keyName] !== jasmine.undefined;
+  };
+
+  for (var property in b) {
+    if (!hasKey(a, property) && hasKey(b, property)) {
+      mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
+    }
+  }
+  for (property in a) {
+    if (!hasKey(b, property) && hasKey(a, property)) {
+      mismatchKeys.push("expected missing key '" + property + "', but present in actual.");
+    }
+  }
+  for (property in b) {
+    if (property == '__Jasmine_been_here_before__') continue;
+    if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) {
+      mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual.");
+    }
+  }
+
+  if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) {
+    mismatchValues.push("arrays were not the same length");
+  }
+
+  delete a.__Jasmine_been_here_before__;
+  delete b.__Jasmine_been_here_before__;
+  return (mismatchKeys.length === 0 && mismatchValues.length === 0);
+};
+
+jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) {
+  mismatchKeys = mismatchKeys || [];
+  mismatchValues = mismatchValues || [];
+
+  for (var i = 0; i < this.equalityTesters_.length; i++) {
+    var equalityTester = this.equalityTesters_[i];
+    var result = equalityTester(a, b, this, mismatchKeys, mismatchValues);
+    if (result !== jasmine.undefined) return result;
+  }
+
+  if (a === b) return true;
+
+  if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) {
+    return (a == jasmine.undefined && b == jasmine.undefined);
+  }
+
+  if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) {
+    return a === b;
+  }
+
+  if (a instanceof Date && b instanceof Date) {
+    return a.getTime() == b.getTime();
+  }
+
+  if (a.jasmineMatches) {
+    return a.jasmineMatches(b);
+  }
+
+  if (b.jasmineMatches) {
+    return b.jasmineMatches(a);
+  }
+
+  if (a instanceof jasmine.Matchers.ObjectContaining) {
+    return a.matches(b);
+  }
+
+  if (b instanceof jasmine.Matchers.ObjectContaining) {
+    return b.matches(a);
+  }
+
+  if (jasmine.isString_(a) && jasmine.isString_(b)) {
+    return (a == b);
+  }
+
+  if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) {
+    return (a == b);
+  }
+
+  if (typeof a === "object" && typeof b === "object") {
+    return this.compareObjects_(a, b, mismatchKeys, mismatchValues);
+  }
+
+  //Straight check
+  return (a === b);
+};
+
+jasmine.Env.prototype.contains_ = function(haystack, needle) {
+  if (jasmine.isArray_(haystack)) {
+    for (var i = 0; i < haystack.length; i++) {
+      if (this.equals_(haystack[i], needle)) return true;
+    }
+    return false;
+  }
+  return haystack.indexOf(needle) >= 0;
+};
+
+jasmine.Env.prototype.addEqualityTester = function(equalityTester) {
+  this.equalityTesters_.push(equalityTester);
+};
+/** No-op base class for Jasmine reporters.
+ *
+ * @constructor
+ */
+jasmine.Reporter = function() {
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.Reporter.prototype.reportRunnerStarting = function(runner) {
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.Reporter.prototype.reportRunnerResults = function(runner) {
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.Reporter.prototype.reportSuiteResults = function(suite) {
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.Reporter.prototype.reportSpecStarting = function(spec) {
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.Reporter.prototype.reportSpecResults = function(spec) {
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.Reporter.prototype.log = function(str) {
+};
+
+/**
+ * Blocks are functions with executable code that make up a spec.
+ *
+ * @constructor
+ * @param {jasmine.Env} env
+ * @param {Function} func
+ * @param {jasmine.Spec} spec
+ */
+jasmine.Block = function(env, func, spec) {
+  this.env = env;
+  this.func = func;
+  this.spec = spec;
+};
+
+jasmine.Block.prototype.execute = function(onComplete) {  
+  try {
+    this.func.apply(this.spec);
+  } catch (e) {
+    this.spec.fail(e);
+  }
+  onComplete();
+};
+/** JavaScript API reporter.
+ *
+ * @constructor
+ */
+jasmine.JsApiReporter = function() {
+  this.started = false;
+  this.finished = false;
+  this.suites_ = [];
+  this.results_ = {};
+};
+
+jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) {
+  this.started = true;
+  var suites = runner.topLevelSuites();
+  for (var i = 0; i < suites.length; i++) {
+    var suite = suites[i];
+    this.suites_.push(this.summarize_(suite));
+  }
+};
+
+jasmine.JsApiReporter.prototype.suites = function() {
+  return this.suites_;
+};
+
+jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
+  var isSuite = suiteOrSpec instanceof jasmine.Suite;
+  var summary = {
+    id: suiteOrSpec.id,
+    name: suiteOrSpec.description,
+    type: isSuite ? 'suite' : 'spec',
+    children: []
+  };
+  
+  if (isSuite) {
+    var children = suiteOrSpec.children();
+    for (var i = 0; i < children.length; i++) {
+      summary.children.push(this.summarize_(children[i]));
+    }
+  }
+  return summary;
+};
+
+jasmine.JsApiReporter.prototype.results = function() {
+  return this.results_;
+};
+
+jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) {
+  return this.results_[specId];
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) {
+  this.finished = true;
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) {
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) {
+  this.results_[spec.id] = {
+    messages: spec.results().getItems(),
+    result: spec.results().failedCount > 0 ? "failed" : "passed"
+  };
+};
+
+//noinspection JSUnusedLocalSymbols
+jasmine.JsApiReporter.prototype.log = function(str) {
+};
+
+jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){
+  var results = {};
+  for (var i = 0; i < specIds.length; i++) {
+    var specId = specIds[i];
+    results[specId] = this.summarizeResult_(this.results_[specId]);
+  }
+  return results;
+};
+
+jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
+  var summaryMessages = [];
+  var messagesLength = result.messages.length;
+  for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) {
+    var resultMessage = result.messages[messageIndex];
+    summaryMessages.push({
+      text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined,
+      passed: resultMessage.passed ? resultMessage.passed() : true,
+      type: resultMessage.type,
+      message: resultMessage.message,
+      trace: {
+        stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined
+      }
+    });
+  }
+
+  return {
+    result : result.result,
+    messages : summaryMessages
+  };
+};
+
+/**
+ * @constructor
+ * @param {jasmine.Env} env
+ * @param actual
+ * @param {jasmine.Spec} spec
+ */
+jasmine.Matchers = function(env, actual, spec, opt_isNot) {
+  this.env = env;
+  this.actual = actual;
+  this.spec = spec;
+  this.isNot = opt_isNot || false;
+  this.reportWasCalled_ = false;
+};
+
+// todo: @deprecated as of Jasmine 0.11, remove soon [xw]
+jasmine.Matchers.pp = function(str) {
+  throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!");
+};
+
+// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw]
+jasmine.Matchers.prototype.report = function(result, failing_message, details) {
+  throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
+};
+
+jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) {
+  for (var methodName in prototype) {
+    if (methodName == 'report') continue;
+    var orig = prototype[methodName];
+    matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig);
+  }
+};
+
+jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) {
+  return function() {
+    var matcherArgs = jasmine.util.argsToArray(arguments);
+    var result = matcherFunction.apply(this, arguments);
+
+    if (this.isNot) {
+      result = !result;
+    }
+
+    if (this.reportWasCalled_) return result;
+
+    var message;
+    if (!result) {
+      if (this.message) {
+        message = this.message.apply(this, arguments);
+        if (jasmine.isArray_(message)) {
+          message = message[this.isNot ? 1 : 0];
+        }
+      } else {
+        var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
+        message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate;
+        if (matcherArgs.length > 0) {
+          for (var i = 0; i < matcherArgs.length; i++) {
+            if (i > 0) message += ",";
+            message += " " + jasmine.pp(matcherArgs[i]);
+          }
+        }
+        message += ".";
+      }
+    }
+    var expectationResult = new jasmine.ExpectationResult({
+      matcherName: matcherName,
+      passed: result,
+      expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0],
+      actual: this.actual,
+      message: message
+    });
+    this.spec.addMatcherResult(expectationResult);
+    return jasmine.undefined;
+  };
+};
+
+
+
+
+/**
+ * toBe: compares the actual to the expected using ===
+ * @param expected
+ */
+jasmine.Matchers.prototype.toBe = function(expected) {
+  return this.actual === expected;
+};
+
+/**
+ * toNotBe: compares the actual to the expected using !==
+ * @param expected
+ * @deprecated as of 1.0. Use not.toBe() instead.
+ */
+jasmine.Matchers.prototype.toNotBe = function(expected) {
+  return this.actual !== expected;
+};
+
+/**
+ * toEqual: compares the actual to the expected using common sense equality. Handles Objects, Arrays, etc.
+ *
+ * @param expected
+ */
+jasmine.Matchers.prototype.toEqual = function(expected) {
+  return this.env.equals_(this.actual, expected);
+};
+
+/**
+ * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual
+ * @param expected
+ * @deprecated as of 1.0. Use not.toEqual() instead.
+ */
+jasmine.Matchers.prototype.toNotEqual = function(expected) {
+  return !this.env.equals_(this.actual, expected);
+};
+
+/**
+ * Matcher that compares the actual to the expected using a regular expression.  Constructs a RegExp, so takes
+ * a pattern or a String.
+ *
+ * @param expected
+ */
+jasmine.Matchers.prototype.toMatch = function(expected) {
+  return new RegExp(expected).test(this.actual);
+};
+
+/**
+ * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch
+ * @param expected
+ * @deprecated as of 1.0. Use not.toMatch() instead.
+ */
+jasmine.Matchers.prototype.toNotMatch = function(expected) {
+  return !(new RegExp(expected).test(this.actual));
+};
+
+/**
+ * Matcher that compares the actual to jasmine.undefined.
+ */
+jasmine.Matchers.prototype.toBeDefined = function() {
+  return (this.actual !== jasmine.undefined);
+};
+
+/**
+ * Matcher that compares the actual to jasmine.undefined.
+ */
+jasmine.Matchers.prototype.toBeUndefined = function() {
+  return (this.actual === jasmine.undefined);
+};
+
+/**
+ * Matcher that compares the actual to null.
+ */
+jasmine.Matchers.prototype.toBeNull = function() {
+  return (this.actual === null);
+};
+
+/**
+ * Matcher that boolean not-nots the actual.
+ */
+jasmine.Matchers.prototype.toBeTruthy = function() {
+  return !!this.actual;
+};
+
+
+/**
+ * Matcher that boolean nots the actual.
+ */
+jasmine.Matchers.prototype.toBeFalsy = function() {
+  return !this.actual;
+};
+
+
+/**
+ * Matcher that checks to see if the actual, a Jasmine spy, was called.
+ */
+jasmine.Matchers.prototype.toHaveBeenCalled = function() {
+  if (arguments.length > 0) {
+    throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
+  }
+
+  if (!jasmine.isSpy(this.actual)) {
+    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+  }
+
+  this.message = function() {
+    return [
+      "Expected spy " + this.actual.identity + " to have been called.",
+      "Expected spy " + this.actual.identity + " not to have been called."
+    ];
+  };
+
+  return this.actual.wasCalled;
+};
+
+/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
+jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled;
+
+/**
+ * Matcher that checks to see if the actual, a Jasmine spy, was not called.
+ *
+ * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead
+ */
+jasmine.Matchers.prototype.wasNotCalled = function() {
+  if (arguments.length > 0) {
+    throw new Error('wasNotCalled does not take arguments');
+  }
+
+  if (!jasmine.isSpy(this.actual)) {
+    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+  }
+
+  this.message = function() {
+    return [
+      "Expected spy " + this.actual.identity + " to not have been called.",
+      "Expected spy " + this.actual.identity + " to have been called."
+    ];
+  };
+
+  return !this.actual.wasCalled;
+};
+
+/**
+ * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters.
+ *
+ * @example
+ *
+ */
+jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
+  var expectedArgs = jasmine.util.argsToArray(arguments);
+  if (!jasmine.isSpy(this.actual)) {
+    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+  }
+  this.message = function() {
+    if (this.actual.callCount === 0) {
+      // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
+      return [
+        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
+        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
+      ];
+    } else {
+      return [
+        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
+        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
+      ];
+    }
+  };
+
+  return this.env.contains_(this.actual.argsForCall, expectedArgs);
+};
+
+/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
+jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith;
+
+/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
+jasmine.Matchers.prototype.wasNotCalledWith = function() {
+  var expectedArgs = jasmine.util.argsToArray(arguments);
+  if (!jasmine.isSpy(this.actual)) {
+    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+  }
+
+  this.message = function() {
+    return [
+      "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was",
+      "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was"
+    ];
+  };
+
+  return !this.env.contains_(this.actual.argsForCall, expectedArgs);
+};
+
+/**
+ * Matcher that checks that the expected item is an element in the actual Array.
+ *
+ * @param {Object} expected
+ */
+jasmine.Matchers.prototype.toContain = function(expected) {
+  return this.env.contains_(this.actual, expected);
+};
+
+/**
+ * Matcher that checks that the expected item is NOT an element in the actual Array.
+ *
+ * @param {Object} expected
+ * @deprecated as of 1.0. Use not.toContain() instead.
+ */
+jasmine.Matchers.prototype.toNotContain = function(expected) {
+  return !this.env.contains_(this.actual, expected);
+};
+
+jasmine.Matchers.prototype.toBeLessThan = function(expected) {
+  return this.actual < expected;
+};
+
+jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
+  return this.actual > expected;
+};
+
+/**
+ * Matcher that checks that the expected item is equal to the actual item
+ * up to a given level of decimal precision (default 2).
+ *
+ * @param {Number} expected
+ * @param {Number} precision
+ */
+jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
+  if (!(precision === 0)) {
+    precision = precision || 2;
+  }
+  var multiplier = Math.pow(10, precision);
+  var actual = Math.round(this.actual * multiplier);
+  expected = Math.round(expected * multiplier);
+  return expected == actual;
+};
+
+/**
+ * Matcher that checks that the expected exception was thrown by the actual.
+ *
+ * @param {String} expected
+ */
+jasmine.Matchers.prototype.toThrow = function(expected) {
+  var result = false;
+  var exception;
+  if (typeof this.actual != 'function') {
+    throw new Error('Actual is not a function');
+  }
+  try {
+    this.actual();
+  } catch (e) {
+    exception = e;
+  }
+  if (exception) {
+    result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
+  }
+
+  var not = this.isNot ? "not " : "";
+
+  this.message = function() {
+    if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
+      return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
+    } else {
+      return "Expected function to throw an exception.";
+    }
+  };
+
+  return result;
+};
+
+jasmine.Matchers.Any = function(expectedClass) {
+  this.expectedClass = expectedClass;
+};
+
+jasmine.Matchers.Any.prototype.jasmineMatches = function(other) {
+  if (this.expectedClass == String) {
+    return typeof other == 'string' || other instanceof String;
+  }
+
+  if (this.expectedClass == Number) {
+    return typeof other == 'number' || other instanceof Number;
+  }
+
+  if (this.expectedClass == Function) {
+    return typeof other == 'function' || other instanceof Function;
+  }
+
+  if (this.expectedClass == Object) {
+    return typeof other == 'object';
+  }
+
+  return other instanceof this.expectedClass;
+};
+
+jasmine.Matchers.Any.prototype.jasmineToString = function() {
+  return '<jasmine.any(' + this.expectedClass + ')>';
+};
+
+jasmine.Matchers.ObjectContaining = function (sample) {
+  this.sample = sample;
+};
+
+jasmine.Matchers.ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) {
+  mismatchKeys = mismatchKeys || [];
+  mismatchValues = mismatchValues || [];
+
+  var env = jasmine.getEnv();
+
+  var hasKey = function(obj, keyName) {
+    return obj != null && obj[keyName] !== jasmine.undefined;
+  };
+
+  for (var property in this.sample) {
+    if (!hasKey(other, property) && hasKey(this.sample, property)) {
+      mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
+    }
+    else if (!env.equals_(this.sample[property], other[property], mismatchKeys, mismatchValues)) {
+      mismatchValues.push("'" + property + "' was '" + (other[property] ? jasmine.util.htmlEscape(other[property].toString()) : other[property]) + "' in expected, but was '" + (this.sample[property] ? jasmine.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in actual.");
+    }
+  }
+
+  return (mismatchKeys.length === 0 && mismatchValues.length === 0);
+};
+
+jasmine.Matchers.ObjectContaining.prototype.jasmineToString = function () {
+  return "<jasmine.objectContaining(" + jasmine.pp(this.sample) + ")>";
+};
+// Mock setTimeout, clearTimeout
+// Contributed by Pivotal Computer Systems, www.pivotalsf.com
+
+jasmine.FakeTimer = function() {
+  this.reset();
+
+  var self = this;
+  self.setTimeout = function(funcToCall, millis) {
+    self.timeoutsMade++;
+    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
+    return self.timeoutsMade;
+  };
+
+  self.setInterval = function(funcToCall, millis) {
+    self.timeoutsMade++;
+    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
+    return self.timeoutsMade;
+  };
+
+  self.clearTimeout = function(timeoutKey) {
+    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+  };
+
+  self.clearInterval = function(timeoutKey) {
+    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+  };
+
+};
+
+jasmine.FakeTimer.prototype.reset = function() {
+  this.timeoutsMade = 0;
+  this.scheduledFunctions = {};
+  this.nowMillis = 0;
+};
+
+jasmine.FakeTimer.prototype.tick = function(millis) {
+  var oldMillis = this.nowMillis;
+  var newMillis = oldMillis + millis;
+  this.runFunctionsWithinRange(oldMillis, newMillis);
+  this.nowMillis = newMillis;
+};
+
+jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
+  var scheduledFunc;
+  var funcsToRun = [];
+  for (var timeoutKey in this.scheduledFunctions) {
+    scheduledFunc = this.scheduledFunctions[timeoutKey];
+    if (scheduledFunc != jasmine.undefined &&
+        scheduledFunc.runAtMillis >= oldMillis &&
+        scheduledFunc.runAtMillis <= nowMillis) {
+      funcsToRun.push(scheduledFunc);
+      this.scheduledFunctions[timeoutKey] = jasmine.undefined;
+    }
+  }
+
+  if (funcsToRun.length > 0) {
+    funcsToRun.sort(function(a, b) {
+      return a.runAtMillis - b.runAtMillis;
+    });
+    for (var i = 0; i < funcsToRun.length; ++i) {
+      try {
+        var funcToRun = funcsToRun[i];
+        this.nowMillis = funcToRun.runAtMillis;
+        funcToRun.funcToCall();
+        if (funcToRun.recurring) {
+          this.scheduleFunction(funcToRun.timeoutKey,
+              funcToRun.funcToCall,
+              funcToRun.millis,
+              true);
+        }
+      } catch(e) {
+      }
+    }
+    this.runFunctionsWithinRange(oldMillis, nowMillis);
+  }
+};
+
+jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
+  this.scheduledFunctions[timeoutKey] = {
+    runAtMillis: this.nowMillis + millis,
+    funcToCall: funcToCall,
+    recurring: recurring,
+    timeoutKey: timeoutKey,
+    millis: millis
+  };
+};
+
+/**
+ * @namespace
+ */
+jasmine.Clock = {
+  defaultFakeTimer: new jasmine.FakeTimer(),
+
+  reset: function() {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.defaultFakeTimer.reset();
+  },
+
+  tick: function(millis) {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.defaultFakeTimer.tick(millis);
+  },
+
+  runFunctionsWithinRange: function(oldMillis, nowMillis) {
+    jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
+  },
+
+  scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
+    jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
+  },
+
+  useMock: function() {
+    if (!jasmine.Clock.isInstalled()) {
+      var spec = jasmine.getEnv().currentSpec;
+      spec.after(jasmine.Clock.uninstallMock);
+
+      jasmine.Clock.installMock();
+    }
+  },
+
+  installMock: function() {
+    jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
+  },
+
+  uninstallMock: function() {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.installed = jasmine.Clock.real;
+  },
+
+  real: {
+    setTimeout: jasmine.getGlobal().setTimeout,
+    clearTimeout: jasmine.getGlobal().clearTimeout,
+    setInterval: jasmine.getGlobal().setInterval,
+    clearInterval: jasmine.getGlobal().clearInterval
+  },
+
+  assertInstalled: function() {
+    if (!jasmine.Clock.isInstalled()) {
+      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
+    }
+  },
+
+  isInstalled: function() {
+    return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
+  },
+
+  installed: null
+};
+jasmine.Clock.installed = jasmine.Clock.real;
+
+//else for IE support
+jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
+  if (jasmine.Clock.installed.setTimeout.apply) {
+    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
+  }
+};
+
+jasmine.getGlobal().setInterval = function(funcToCall, millis) {
+  if (jasmine.Clock.installed.setInterval.apply) {
+    return jasmine.Clock.installed.setInterval.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setInterval(funcToCall, millis);
+  }
+};
+
+jasmine.getGlobal().clearTimeout = function(timeoutKey) {
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.clearTimeout(timeoutKey);
+  }
+};
+
+jasmine.getGlobal().clearInterval = function(timeoutKey) {
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.clearInterval(timeoutKey);
+  }
+};
+
+/**
+ * @constructor
+ */
+jasmine.MultiReporter = function() {
+  this.subReporters_ = [];
+};
+jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter);
+
+jasmine.MultiReporter.prototype.addReporter = function(reporter) {
+  this.subReporters_.push(reporter);
+};
+
+(function() {
+  var functionNames = [
+    "reportRunnerStarting",
+    "reportRunnerResults",
+    "reportSuiteResults",
+    "reportSpecStarting",
+    "reportSpecResults",
+    "log"
+  ];
+  for (var i = 0; i < functionNames.length; i++) {
+    var functionName = functionNames[i];
+    jasmine.MultiReporter.prototype[functionName] = (function(functionName) {
+      return function() {
+        for (var j = 0; j < this.subReporters_.length; j++) {
+          var subReporter = this.subReporters_[j];
+          if (subReporter[functionName]) {
+            subReporter[functionName].apply(subReporter, arguments);
+          }
+        }
+      };
+    })(functionName);
+  }
+})();
+/**
+ * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults
+ *
+ * @constructor
+ */
+jasmine.NestedResults = function() {
+  /**
+   * The total count of results
+   */
+  this.totalCount = 0;
+  /**
+   * Number of passed results
+   */
+  this.passedCount = 0;
+  /**
+   * Number of failed results
+   */
+  this.failedCount = 0;
+  /**
+   * Was this suite/spec skipped?
+   */
+  this.skipped = false;
+  /**
+   * @ignore
+   */
+  this.items_ = [];
+};
+
+/**
+ * Roll up the result counts.
+ *
+ * @param result
+ */
+jasmine.NestedResults.prototype.rollupCounts = function(result) {
+  this.totalCount += result.totalCount;
+  this.passedCount += result.passedCount;
+  this.failedCount += result.failedCount;
+};
+
+/**
+ * Adds a log message.
+ * @param values Array of message parts which will be concatenated later.
+ */
+jasmine.NestedResults.prototype.log = function(values) {
+  this.items_.push(new jasmine.MessageResult(values));
+};
+
+/**
+ * Getter for the results: message & results.
+ */
+jasmine.NestedResults.prototype.getItems = function() {
+  return this.items_;
+};
+
+/**
+ * Adds a result, tracking counts (total, passed, & failed)
+ * @param {jasmine.ExpectationResult|jasmine.NestedResults} result
+ */
+jasmine.NestedResults.prototype.addResult = function(result) {
+  if (result.type != 'log') {
+    if (result.items_) {
+      this.rollupCounts(result);
+    } else {
+      this.totalCount++;
+      if (result.passed()) {
+        this.passedCount++;
+      } else {
+        this.failedCount++;
+      }
+    }
+  }
+  this.items_.push(result);
+};
+
+/**
+ * @returns {Boolean} True if <b>everything</b> below passed
+ */
+jasmine.NestedResults.prototype.passed = function() {
+  return this.passedCount === this.totalCount;
+};
+/**
+ * Base class for pretty printing for expectation results.
+ */
+jasmine.PrettyPrinter = function() {
+  this.ppNestLevel_ = 0;
+};
+
+/**
+ * Formats a value in a nice, human-readable string.
+ *
+ * @param value
+ */
+jasmine.PrettyPrinter.prototype.format = function(value) {
+  if (this.ppNestLevel_ > 40) {
+    throw new Error('jasmine.PrettyPrinter: format() nested too deeply!');
+  }
+
+  this.ppNestLevel_++;
+  try {
+    if (value === jasmine.undefined) {
+      this.emitScalar('undefined');
+    } else if (value === null) {
+      this.emitScalar('null');
+    } else if (value === jasmine.getGlobal()) {
+      this.emitScalar('<global>');
+    } else if (value.jasmineToString) {
+      this.emitScalar(value.jasmineToString());
+    } else if (typeof value === 'string') {
+      this.emitString(value);
+    } else if (jasmine.isSpy(value)) {
+      this.emitScalar("spy on " + value.identity);
+    } else if (value instanceof RegExp) {
+      this.emitScalar(value.toString());
+    } else if (typeof value === 'function') {
+      this.emitScalar('Function');
+    } else if (typeof value.nodeType === 'number') {
+      this.emitScalar('HTMLNode');
+    } else if (value instanceof Date) {
+      this.emitScalar('Date(' + value + ')');
+    } else if (value.__Jasmine_been_here_before__) {
+      this.emitScalar('<circular reference: ' + (jasmine.isArray_(value) ? 'Array' : 'Object') + '>');
+    } else if (jasmine.isArray_(value) || typeof value == 'object') {
+      value.__Jasmine_been_here_before__ = true;
+      if (jasmine.isArray_(value)) {
+        this.emitArray(value);
+      } else {
+        this.emitObject(value);
+      }
+      delete value.__Jasmine_been_here_before__;
+    } else {
+      this.emitScalar(value.toString());
+    }
+  } finally {
+    this.ppNestLevel_--;
+  }
+};
+
+jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) {
+  for (var property in obj) {
+    if (property == '__Jasmine_been_here_before__') continue;
+    fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && 
+                                         obj.__lookupGetter__(property) !== null) : false);
+  }
+};
+
+jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_;
+jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_;
+jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_;
+jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_;
+
+jasmine.StringPrettyPrinter = function() {
+  jasmine.PrettyPrinter.call(this);
+
+  this.string = '';
+};
+jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter);
+
+jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) {
+  this.append(value);
+};
+
+jasmine.StringPrettyPrinter.prototype.emitString = function(value) {
+  this.append("'" + value + "'");
+};
+
+jasmine.StringPrettyPrinter.prototype.emitArray = function(array) {
+  this.append('[ ');
+  for (var i = 0; i < array.length; i++) {
+    if (i > 0) {
+      this.append(', ');
+    }
+    this.format(array[i]);
+  }
+  this.append(' ]');
+};
+
+jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) {
+  var self = this;
+  this.append('{ ');
+  var first = true;
+
+  this.iterateObject(obj, function(property, isGetter) {
+    if (first) {
+      first = false;
+    } else {
+      self.append(', ');
+    }
+
+    self.append(property);
+    self.append(' : ');
+    if (isGetter) {
+      self.append('<getter>');
+    } else {
+      self.format(obj[property]);
+    }
+  });
+
+  this.append(' }');
+};
+
+jasmine.StringPrettyPrinter.prototype.append = function(value) {
+  this.string += value;
+};
+jasmine.Queue = function(env) {
+  this.env = env;
+  this.blocks = [];
+  this.running = false;
+  this.index = 0;
+  this.offset = 0;
+  this.abort = false;
+};
+
+jasmine.Queue.prototype.addBefore = function(block) {
+  this.blocks.unshift(block);
+};
+
+jasmine.Queue.prototype.add = function(block) {
+  this.blocks.push(block);
+};
+
+jasmine.Queue.prototype.insertNext = function(block) {
+  this.blocks.splice((this.index + this.offset + 1), 0, block);
+  this.offset++;
+};
+
+jasmine.Queue.prototype.start = function(onComplete) {
+  this.running = true;
+  this.onComplete = onComplete;
+  this.next_();
+};
+
+jasmine.Queue.prototype.isRunning = function() {
+  return this.running;
+};
+
+jasmine.Queue.LOOP_DONT_RECURSE = true;
+
+jasmine.Queue.prototype.next_ = function() {
+  var self = this;
+  var goAgain = true;
+
+  while (goAgain) {
+    goAgain = false;
+    
+    if (self.index < self.blocks.length && !this.abort) {
+      var calledSynchronously = true;
+      var completedSynchronously = false;
+
+      var onComplete = function () {
+        if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) {
+          completedSynchronously = true;
+          return;
+        }
+
+        if (self.blocks[self.index].abort) {
+          self.abort = true;
+        }
+
+        self.offset = 0;
+        self.index++;
+
+        var now = new Date().getTime();
+        if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) {
+          self.env.lastUpdate = now;
+          self.env.setTimeout(function() {
+            self.next_();
+          }, 0);
+        } else {
+          if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) {
+            goAgain = true;
+          } else {
+            self.next_();
+          }
+        }
+      };
+      self.blocks[self.index].execute(onComplete);
+
+      calledSynchronously = false;
+      if (completedSynchronously) {
+        onComplete();
+      }
+      
+    } else {
+      self.running = false;
+      if (self.onComplete) {
+        self.onComplete();
+      }
+    }
+  }
+};
+
+jasmine.Queue.prototype.results = function() {
+  var results = new jasmine.NestedResults();
+  for (var i = 0; i < this.blocks.length; i++) {
+    if (this.blocks[i].results) {
+      results.addResult(this.blocks[i].results());
+    }
+  }
+  return results;
+};
+
+
+/**
+ * Runner
+ *
+ * @constructor
+ * @param {jasmine.Env} env
+ */
+jasmine.Runner = function(env) {
+  var self = this;
+  self.env = env;
+  self.queue = new jasmine.Queue(env);
+  self.before_ = [];
+  self.after_ = [];
+  self.suites_ = [];
+};
+
+jasmine.Runner.prototype.execute = function() {
+  var self = this;
+  if (self.env.reporter.reportRunnerStarting) {
+    self.env.reporter.reportRunnerStarting(this);
+  }
+  self.queue.start(function () {
+    self.finishCallback();
+  });
+};
+
+jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) {
+  beforeEachFunction.typeName = 'beforeEach';
+  this.before_.splice(0,0,beforeEachFunction);
+};
+
+jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
+  afterEachFunction.typeName = 'afterEach';
+  this.after_.splice(0,0,afterEachFunction);
+};
+
+
+jasmine.Runner.prototype.finishCallback = function() {
+  this.env.reporter.reportRunnerResults(this);
+};
+
+jasmine.Runner.prototype.addSuite = function(suite) {
+  this.suites_.push(suite);
+};
+
+jasmine.Runner.prototype.add = function(block) {
+  if (block instanceof jasmine.Suite) {
+    this.addSuite(block);
+  }
+  this.queue.add(block);
+};
+
+jasmine.Runner.prototype.specs = function () {
+  var suites = this.suites();
+  var specs = [];
+  for (var i = 0; i < suites.length; i++) {
+    specs = specs.concat(suites[i].specs());
+  }
+  return specs;
+};
+
+jasmine.Runner.prototype.suites = function() {
+  return this.suites_;
+};
+
+jasmine.Runner.prototype.topLevelSuites = function() {
+  var topLevelSuites = [];
+  for (var i = 0; i < this.suites_.length; i++) {
+    if (!this.suites_[i].parentSuite) {
+      topLevelSuites.push(this.suites_[i]);
+    }
+  }
+  return topLevelSuites;
+};
+
+jasmine.Runner.prototype.results = function() {
+  return this.queue.results();
+};
+/**
+ * Internal representation of a Jasmine specification, or test.
+ *
+ * @constructor
+ * @param {jasmine.Env} env
+ * @param {jasmine.Suite} suite
+ * @param {String} description
+ */
+jasmine.Spec = function(env, suite, description) {
+  if (!env) {
+    throw new Error('jasmine.Env() required');
+  }
+  if (!suite) {
+    throw new Error('jasmine.Suite() required');
+  }
+  var spec = this;
+  spec.id = env.nextSpecId ? env.nextSpecId() : null;
+  spec.env = env;
+  spec.suite = suite;
+  spec.description = description;
+  spec.queue = new jasmine.Queue(env);
+
+  spec.afterCallbacks = [];
+  spec.spies_ = [];
+
+  spec.results_ = new jasmine.NestedResults();
+  spec.results_.description = description;
+  spec.matchersClass = null;
+};
+
+jasmine.Spec.prototype.getFullName = function() {
+  return this.suite.getFullName() + ' ' + this.description + '.';
+};
+
+
+jasmine.Spec.prototype.results = function() {
+  return this.results_;
+};
+
+/**
+ * All parameters are pretty-printed and concatenated together, then written to the spec's output.
+ *
+ * Be careful not to leave calls to <code>jasmine.log</code> in production code.
+ */
+jasmine.Spec.prototype.log = function() {
+  return this.results_.log(arguments);
+};
+
+jasmine.Spec.prototype.runs = function (func) {
+  var block = new jasmine.Block(this.env, func, this);
+  this.addToQueue(block);
+  return this;
+};
+
+jasmine.Spec.prototype.addToQueue = function (block) {
+  if (this.queue.isRunning()) {
+    this.queue.insertNext(block);
+  } else {
+    this.queue.add(block);
+  }
+};
+
+/**
+ * @param {jasmine.ExpectationResult} result
+ */
+jasmine.Spec.prototype.addMatcherResult = function(result) {
+  this.results_.addResult(result);
+};
+
+jasmine.Spec.prototype.expect = function(actual) {
+  var positive = new (this.getMatchersClass_())(this.env, actual, this);
+  positive.not = new (this.getMatchersClass_())(this.env, actual, this, true);
+  return positive;
+};
+
+/**
+ * Waits a fixed time period before moving to the next block.
+ *
+ * @deprecated Use waitsFor() instead
+ * @param {Number} timeout milliseconds to wait
+ */
+jasmine.Spec.prototype.waits = function(timeout) {
+  var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
+  this.addToQueue(waitsFunc);
+  return this;
+};
+
+/**
+ * Waits for the latchFunction to return true before proceeding to the next block.
+ *
+ * @param {Function} latchFunction
+ * @param {String} optional_timeoutMessage
+ * @param {Number} optional_timeout
+ */
+jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
+  var latchFunction_ = null;
+  var optional_timeoutMessage_ = null;
+  var optional_timeout_ = null;
+
+  for (var i = 0; i < arguments.length; i++) {
+    var arg = arguments[i];
+    switch (typeof arg) {
+      case 'function':
+        latchFunction_ = arg;
+        break;
+      case 'string':
+        optional_timeoutMessage_ = arg;
+        break;
+      case 'number':
+        optional_timeout_ = arg;
+        break;
+    }
+  }
+
+  var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
+  this.addToQueue(waitsForFunc);
+  return this;
+};
+
+jasmine.Spec.prototype.fail = function (e) {
+  var expectationResult = new jasmine.ExpectationResult({
+    passed: false,
+    message: e ? jasmine.util.formatException(e) : 'Exception',
+    trace: { stack: e.stack }
+  });
+  this.results_.addResult(expectationResult);
+};
+
+jasmine.Spec.prototype.getMatchersClass_ = function() {
+  return this.matchersClass || this.env.matchersClass;
+};
+
+jasmine.Spec.prototype.addMatchers = function(matchersPrototype) {
+  var parent = this.getMatchersClass_();
+  var newMatchersClass = function() {
+    parent.apply(this, arguments);
+  };
+  jasmine.util.inherit(newMatchersClass, parent);
+  jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass);
+  this.matchersClass = newMatchersClass;
+};
+
+jasmine.Spec.prototype.finishCallback = function() {
+  this.env.reporter.reportSpecResults(this);
+};
+
+jasmine.Spec.prototype.finish = function(onComplete) {
+  this.removeAllSpies();
+  this.finishCallback();
+  if (onComplete) {
+    onComplete();
+  }
+};
+
+jasmine.Spec.prototype.after = function(doAfter) {
+  if (this.queue.isRunning()) {
+    this.queue.add(new jasmine.Block(this.env, doAfter, this));
+  } else {
+    this.afterCallbacks.unshift(doAfter);
+  }
+};
+
+jasmine.Spec.prototype.execute = function(onComplete) {
+  var spec = this;
+  if (!spec.env.specFilter(spec)) {
+    spec.results_.skipped = true;
+    spec.finish(onComplete);
+    return;
+  }
+
+  this.env.reporter.reportSpecStarting(this);
+
+  spec.env.currentSpec = spec;
+
+  spec.addBeforesAndAftersToQueue();
+
+  spec.queue.start(function () {
+    spec.finish(onComplete);
+  });
+};
+
+jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {
+  var runner = this.env.currentRunner();
+  var i;
+
+  for (var suite = this.suite; suite; suite = suite.parentSuite) {
+    for (i = 0; i < suite.before_.length; i++) {
+      this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this));
+    }
+  }
+  for (i = 0; i < runner.before_.length; i++) {
+    this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this));
+  }
+  for (i = 0; i < this.afterCallbacks.length; i++) {
+    this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this));
+  }
+  for (suite = this.suite; suite; suite = suite.parentSuite) {
+    for (i = 0; i < suite.after_.length; i++) {
+      this.queue.add(new jasmine.Block(this.env, suite.after_[i], this));
+    }
+  }
+  for (i = 0; i < runner.after_.length; i++) {
+    this.queue.add(new jasmine.Block(this.env, runner.after_[i], this));
+  }
+};
+
+jasmine.Spec.prototype.explodes = function() {
+  throw 'explodes function should not have been called';
+};
+
+jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) {
+  if (obj == jasmine.undefined) {
+    throw "spyOn could not find an object to spy upon for " + methodName + "()";
+  }
+
+  if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) {
+    throw methodName + '() method does not exist';
+  }
+
+  if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) {
+    throw new Error(methodName + ' has already been spied upon');
+  }
+
+  var spyObj = jasmine.createSpy(methodName);
+
+  this.spies_.push(spyObj);
+  spyObj.baseObj = obj;
+  spyObj.methodName = methodName;
+  spyObj.originalValue = obj[methodName];
+
+  obj[methodName] = spyObj;
+
+  return spyObj;
+};
+
+jasmine.Spec.prototype.removeAllSpies = function() {
+  for (var i = 0; i < this.spies_.length; i++) {
+    var spy = this.spies_[i];
+    spy.baseObj[spy.methodName] = spy.originalValue;
+  }
+  this.spies_ = [];
+};
+
+/**
+ * Internal representation of a Jasmine suite.
+ *
+ * @constructor
+ * @param {jasmine.Env} env
+ * @param {String} description
+ * @param {Function} specDefinitions
+ * @param {jasmine.Suite} parentSuite
+ */
+jasmine.Suite = function(env, description, specDefinitions, parentSuite) {
+  var self = this;
+  self.id = env.nextSuiteId ? env.nextSuiteId() : null;
+  self.description = description;
+  self.queue = new jasmine.Queue(env);
+  self.parentSuite = parentSuite;
+  self.env = env;
+  self.before_ = [];
+  self.after_ = [];
+  self.children_ = [];
+  self.suites_ = [];
+  self.specs_ = [];
+};
+
+jasmine.Suite.prototype.getFullName = function() {
+  var fullName = this.description;
+  for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
+    fullName = parentSuite.description + ' ' + fullName;
+  }
+  return fullName;
+};
+
+jasmine.Suite.prototype.finish = function(onComplete) {
+  this.env.reporter.reportSuiteResults(this);
+  this.finished = true;
+  if (typeof(onComplete) == 'function') {
+    onComplete();
+  }
+};
+
+jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) {
+  beforeEachFunction.typeName = 'beforeEach';
+  this.before_.unshift(beforeEachFunction);
+};
+
+jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
+  afterEachFunction.typeName = 'afterEach';
+  this.after_.unshift(afterEachFunction);
+};
+
+jasmine.Suite.prototype.results = function() {
+  return this.queue.results();
+};
+
+jasmine.Suite.prototype.add = function(suiteOrSpec) {
+  this.children_.push(suiteOrSpec);
+  if (suiteOrSpec instanceof jasmine.Suite) {
+    this.suites_.push(suiteOrSpec);
+    this.env.currentRunner().addSuite(suiteOrSpec);
+  } else {
+    this.specs_.push(suiteOrSpec);
+  }
+  this.queue.add(suiteOrSpec);
+};
+
+jasmine.Suite.prototype.specs = function() {
+  return this.specs_;
+};
+
+jasmine.Suite.prototype.suites = function() {
+  return this.suites_;
+};
+
+jasmine.Suite.prototype.children = function() {
+  return this.children_;
+};
+
+jasmine.Suite.prototype.execute = function(onComplete) {
+  var self = this;
+  this.queue.start(function () {
+    self.finish(onComplete);
+  });
+};
+jasmine.WaitsBlock = function(env, timeout, spec) {
+  this.timeout = timeout;
+  jasmine.Block.call(this, env, null, spec);
+};
+
+jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
+
+jasmine.WaitsBlock.prototype.execute = function (onComplete) {
+  if (jasmine.VERBOSE) {
+    this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
+  }
+  this.env.setTimeout(function () {
+    onComplete();
+  }, this.timeout);
+};
+/**
+ * A block which waits for some condition to become true, with timeout.
+ *
+ * @constructor
+ * @extends jasmine.Block
+ * @param {jasmine.Env} env The Jasmine environment.
+ * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true.
+ * @param {Function} latchFunction A function which returns true when the desired condition has been met.
+ * @param {String} message The message to display if the desired condition hasn't been met within the given time period.
+ * @param {jasmine.Spec} spec The Jasmine spec.
+ */
+jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) {
+  this.timeout = timeout || env.defaultTimeoutInterval;
+  this.latchFunction = latchFunction;
+  this.message = message;
+  this.totalTimeSpentWaitingForLatch = 0;
+  jasmine.Block.call(this, env, null, spec);
+};
+jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
+
+jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
+
+jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
+  if (jasmine.VERBOSE) {
+    this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
+  }
+  var latchFunctionResult;
+  try {
+    latchFunctionResult = this.latchFunction.apply(this.spec);
+  } catch (e) {
+    this.spec.fail(e);
+    onComplete();
+    return;
+  }
+
+  if (latchFunctionResult) {
+    onComplete();
+  } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) {
+    var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen');
+    this.spec.fail({
+      name: 'timeout',
+      message: message
+    });
+
+    this.abort = true;
+    onComplete();
+  } else {
+    this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
+    var self = this;
+    this.env.setTimeout(function() {
+      self.execute(onComplete);
+    }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
+  }
+};
+
+jasmine.version_= {
+  "major": 1,
+  "minor": 2,
+  "build": 0,
+  "revision": 1333310630,
+  "release_candidate": 1
+};
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/accelerometer.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/accelerometer.html
index b5f41f28..a3dbff8f 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/accelerometer.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/accelerometer.html
@@ -1,53 +1,48 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Accelerometer API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Accelerometer API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
+<head>
+  <title>Cordova: Accelerometer API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
 
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/all.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/all.html
index 289f1edf..cbc2b938 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/all.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/all.html
@@ -1,81 +1,80 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: All API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-
-
-
-    <script type="text/javascript" src="../tests/device.tests.js"></script>
-    <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
-    <script type="text/javascript" src="../tests/capture.tests.js"></script>
-
-    <script type="text/javascript" src="../tests/compass.tests.js"></script>
-    
-    <script type="text/javascript" src="../tests/camera.tests.js"></script>
-
-        
-    <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
-    
-    <script type="text/javascript" src="../tests/network.tests.js"></script>
-    <script type="text/javascript" src="../tests/notification.tests.js"></script>
-    <script type="text/javascript" src="../tests/platform.tests.js"></script>
-    <script type="text/javascript" src="../tests/storage.tests.js"></script>
-
-
-    <script type="text/javascript" src="../tests/battery.tests.js"></script>
-    <!--
-    <script type="text/javascript" src="../tests/contacts.tests.js"></script>
-    
-    <script type="text/javascript" src="../tests/media.tests.js"></script>
-    <script type="text/javascript" src="../tests/file.tests.js"></script>
-    
-
-    -->
-    <script type="text/javascript">
-        document.addEventListener('deviceready', function () {
-
-            console.log("doc got device ready event");
-            var tests = new Tests();
-            console.log('running tests');
-            // Each group of tests are declared as a function in the object `Tests`.
-            // A group of tests are identified by a name that contains the word 'Tests'.
-            //
-            // Load each group of tests into QUnit
-            for (var t in tests) {
-                if (t.indexOf('Tests') > -1) {
-                    tests[t]();
-                }
-            }
-
-            // Start the QUnit test suite
-            QUnit.start();
-        }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: All API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
+<head>
+  <title>Cordova: API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/accelerometer.tests.js"></script>
+  <script type="text/javascript" src="../tests/battery.tests.js"></script>
+  <script type="text/javascript" src="../tests/capture.tests.js"></script>
+  <script type="text/javascript" src="../tests/compass.tests.js"></script>
+  <script type="text/javascript" src="../tests/contacts.tests.js"></script>
+  <script type="text/javascript" src="../tests/camera.tests.js"></script>
+  <script type="text/javascript" src="../tests/device.tests.js"></script>
+  <script type="text/javascript" src="../tests/file.tests.js"></script>
+  <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
+  <script type="text/javascript" src="../tests/media.tests.js"></script>
+  <script type="text/javascript" src="../tests/network.tests.js"></script>
+  <script type="text/javascript" src="../tests/notification.tests.js"></script>
+  <script type="text/javascript" src="../tests/platform.tests.js"></script>
+  <script type="text/javascript" src="../tests/storage.tests.js"></script>
+
+  <script type="text/javascript">
+      document.addEventListener('deviceready', function () {
+          // one-time retrieval of the root file system entry
+          var onError = function(e) {
+              console.log('[ERROR] Problem setting up root filesystem for test running! Error to follow.');
+              console.log(JSON.stringify(e));
+          };
+
+          window.requestFileSystem(LocalFileSystem.PERSISTENT, 0,
+              function(fileSystem) {
+                  console.log('File API test Init: Setting PERSISTENT FS.');
+                  root = fileSystem.root; // set in file.tests.js
+                  persistent_root = root;
+
+                  // Once root is set up, fire off tests
+                  var jasmineEnv = jasmine.getEnv();
+                  jasmineEnv.updateInterval = 1000;
+
+                  var htmlReporter = new jasmine.HtmlReporter();
+
+                  jasmineEnv.addReporter(htmlReporter);
+
+                  jasmineEnv.specFilter = function(spec) {
+                    return htmlReporter.specFilter(spec);
+                  };
+
+                  jasmineEnv.execute();
+              }, onError);
+          window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
+              function(fileSystem) {
+                  console.log('File API test Init: Setting TEMPORARY FS.');
+                  temp_root = fileSystem.root; // set in file.tests.js
+              }, onError);
+      }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
 </html>
-
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/battery.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/battery.html
index 19b1ee68..9bf34312 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/battery.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/battery.html
@@ -1,54 +1,44 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Battery API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/battery.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Battery API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
+<head>
+  <title>Cordova: Battery API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/battery.tests.js"></script>
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
+
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
 </html>
-
-
-
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/camera.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/camera.html
index e83fb5de..8a2f2f47 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/camera.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/camera.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Camera API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/camera.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Camera API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Camera API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/camera.tests.js"></script>
 
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/capture.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/capture.html
index 1f871a02..e65b427b 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/capture.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/capture.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Capture API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/capture.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Capture API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Capture API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/capture.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/compass.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/compass.html
index 1623a5e6..75f119b1 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/compass.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/compass.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Compass API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/compass.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Compass API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Compass API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/compass.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/contacts.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/contacts.html
index bbd86424..8be8891f 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/contacts.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/contacts.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Contacts API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/contacts.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Contacts API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Contacts API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/contacts.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/device.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/device.html
index 35a71bf2..00b2e9f2 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/device.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/device.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Device API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/device.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Device API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Device API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/device.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/file.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/file.html
index 4d132001..0317e422 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/file.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/file.html
@@ -1,54 +1,66 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: File API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/file.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: File API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
+<head>
+  <title>Cordova: File API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/file.tests.js"></script>
+
+  <script type="text/javascript">
+      document.addEventListener('deviceready', function () {
+          // one-time retrieval of the root file system entry
+          var onError = function(e) {
+              console.log('[ERROR] Problem setting up root filesystem for test running! Error to follow.');
+              console.log(JSON.stringify(e));
+          };
 
+          window.requestFileSystem(LocalFileSystem.PERSISTENT, 0,
+              function(fileSystem) {
+                  console.log('File API test Init: Setting PERSISTENT FS.');
+                  root = fileSystem.root; // set in file.tests.js
+                  persistent_root = root;
 
+                  // Once root is set up, fire off tests
+                  var jasmineEnv = jasmine.getEnv();
+                  jasmineEnv.updateInterval = 1000;
 
+                  var htmlReporter = new jasmine.HtmlReporter();
+
+                  jasmineEnv.addReporter(htmlReporter);
+
+                  jasmineEnv.specFilter = function(spec) {
+                    return htmlReporter.specFilter(spec);
+                  };
+
+                  jasmineEnv.execute();
+              }, onError);
+          window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
+              function(fileSystem) {
+                  console.log('File API test Init: Setting TEMPORARY FS.');
+                  temp_root = fileSystem.root; // set in file.tests.js
+              }, onError);
+      }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/geolocation.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/geolocation.html
index ff1f290b..57271c7e 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/geolocation.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/geolocation.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Geolocation API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Geolocation API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Geolocation API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/geolocation.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/media.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/media.html
index 5c772601..90b22b6e 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/media.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/media.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Media API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/media.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Media API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Media API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/media.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/network.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/network.html
index 52196fed..db1e41b2 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/network.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/network.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Network API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/network.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Network API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Network API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/network.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/notification.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/notification.html
index 0b051924..2de92756 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/notification.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/notification.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Notification API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/notification.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Notification API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Notification API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/notification.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/platform.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/platform.html
index 8a8545c4..4c5b0a52 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/platform.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/platform.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Platform API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/platform.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Platform API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Platform API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/platform.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/storage.html b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/storage.html
index 9659b480..8512dd36 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/storage.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/pages/storage.html
@@ -1,54 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
-
-    <title>Cordova: Storage API Specs</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="../qunit.css" />
-    <script type="text/javascript" src="../qunit.js"></script>
-
-    <!-- Source -->
-    <script type="text/javascript" src="../../phonegap.js"></script>
-
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="../test-runner.js"></script>
-
-    <!-- Tests -->
-    <script type="text/javascript" src="../tests/storage.tests.js"></script>
-    <script type="text/javascript">
-      document.addEventListener('deviceready', function() {
-          console.log('running tests');
-          var tests = new Tests();
-
-          // Each group of tests are declared as a function in the object `Tests`.
-          // A group of tests are identified by a name that contains the word 'Tests'.
-          //
-          // Load each group of tests into QUnit
-          for (var t in tests) {
-              if (t.indexOf('Tests') > -1) {
-                  tests[t]();
-              }
-          }
-
-          // Start the QUnit test suite
-          QUnit.start();
-      }, false);
-    </script>
-  </head>
-    <body>
-        <div class="backBtn" onclick="backHome();">Back</div>
-        <h1 id="qunit-header">Cordova: Storage API Specs</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
-</html>
 
+<head>
+  <title>Cordova: Storage API Specs</title>
+
+  <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
+  <!-- Load jasmine -->
+  <link href="../jasmine.css" rel="stylesheet"/>
+  <script type="text/javascript" src="../jasmine.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporterHelpers.js"></script>
+  <script type="text/javascript" src="../html/HtmlReporter.js"></script>
+  <script type="text/javascript" src="../html/ReporterView.js"></script>
+  <script type="text/javascript" src="../html/SpecView.js"></script>
+  <script type="text/javascript" src="../html/SuiteView.js"></script>
+  <script type="text/javascript" src="../html/TrivialReporter.js"></script>
+
+  <!-- Source -->
+  <script type="text/javascript" src="../../phonegap.js"></script>
+
+  <!-- Load Test Runner -->
+  <script type="text/javascript" src="../test-runner.js"></script>
+
+  <!-- Tests -->
+  <script type="text/javascript" src="../tests/storage.tests.js"></script>
+
+  <script type="text/javascript">
+    document.addEventListener('deviceready', function () {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
+      var htmlReporter = new jasmine.HtmlReporter();
+
+      jasmineEnv.addReporter(htmlReporter);
+
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
+
+      jasmineEnv.execute();
+    }, false);
+  </script>
+</head>
+
+<body>
+  <a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
+</body>
+</html>
 
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/test-runner.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/test-runner.js
index 35a4c63e..51851049 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/test-runner.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/test-runner.js
@@ -1,8 +1,4 @@
-// Prevent QUnit from running when the DOM load event fires
-QUnit.config.autostart = false;
-
 if (window.sessionStorage != null) {
-
     window.sessionStorage.clear();
 }
 
@@ -10,4 +6,4 @@ if (window.sessionStorage != null) {
 // time to query the response. This is important for some
 // Android devices.
 var Tests = function() {};
-Tests.TEST_TIMEOUT = 2000;
+Tests.TEST_TIMEOUT = 7500;
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/accelerometer.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/accelerometer.tests.js
index a99d459f..c9a2745b 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/accelerometer.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/accelerometer.tests.js
@@ -1,55 +1,58 @@
-Tests.prototype.AccelerometerTests = function() {
-	module('Accelerometer (navigator.accelerometer)');
-	test("should exist", function() {
-  		expect(1);
-  		ok(navigator.accelerometer != null, "navigator.accelerometer should not be null.");
+describe('Accelerometer (navigator.accelerometer)', function () {
+	it("should exist", function () {
+        expect(navigator.accelerometer).toBeDefined();
 	});
-	test("should contain a getCurrentAcceleration function", function() {
-		expect(2);
-		ok(typeof navigator.accelerometer.getCurrentAcceleration != 'undefined' && navigator.accelerometer.getCurrentAcceleration != null, "navigator.accelerometer.getCurrentAcceleration should not be null.");
-		ok(typeof navigator.accelerometer.getCurrentAcceleration == 'function', "navigator.accelerometer.getCurrentAcceleration should be a function.");
+
+	it("should contain a getCurrentAcceleration function", function() {
+		expect(typeof navigator.accelerometer.getCurrentAcceleration).toBeDefined();
+		expect(typeof navigator.accelerometer.getCurrentAcceleration == 'function').toBe(true);
 	});
-	test("getCurrentAcceleration success callback should be called with an Acceleration object", function() {
-		expect(7);
-		QUnit.stop(Tests.TEST_TIMEOUT);
-		var win = function(a) {
-			ok(typeof a == 'object', "Acceleration object returned in getCurrentAcceleration success callback should be of type 'object'.");
-			ok(a.x != null, "Acceleration object returned in getCurrentAcceleration success callback should have an 'x' property.");
-			ok(typeof a.x == 'number', "Acceleration object's 'x' property returned in getCurrentAcceleration success callback should be of type 'number'.");
-			ok(a.y != null, "Acceleration object returned in getCurrentAcceleration success callback should have a 'y' property.");
-			ok(typeof a.y == 'number', "Acceleration object's 'y' property returned in getCurrentAcceleration success callback should be of type 'number'.");
-			ok(a.z != null, "Acceleration object returned in getCurrentAcceleration success callback should have a 'z' property.");
-			ok(typeof a.z == 'number', "Acceleration object's 'z' property returned in getCurrentAcceleration success callback should be of type 'number'.");
-			start();
-		};
-		var fail = function() { start(); };
-		navigator.accelerometer.getCurrentAcceleration(win, fail);
+
+	it("getCurrentAcceleration success callback should be called with an Acceleration object", function() {
+
+		var win = jasmine.createSpy().andCallFake(function(a) {
+                expect(a).toBeDefined();
+                expect(a.x).toBeDefined();
+                expect(typeof a.x == 'number').toBe(true);
+                expect(a.y).toBeDefined();
+                expect(typeof a.y == 'number').toBe(true);
+                expect(a.z).toBeDefined();
+                expect(typeof a.z == 'number').toBe(true);
+            }),
+            fail = jasmine.createSpy();
+
+        runs(function () {
+		    navigator.accelerometer.getCurrentAcceleration(win, fail);
+        });
+
+        waitsFor(function () { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+        runs(function () {
+            expect(fail).not.toHaveBeenCalled();
+        });
 	});
-	test("should contain a watchAcceleration function", function() {
-		expect(2);
-		ok(typeof navigator.accelerometer.watchAcceleration != 'undefined' && navigator.accelerometer.watchAcceleration != null, "navigator.accelerometer.watchAcceleration should not be null.");
-		ok(typeof navigator.accelerometer.watchAcceleration == 'function', "navigator.accelerometer.watchAcceleration should be a function.");
+
+	it("should contain a watchAcceleration function", function() {
+		expect(navigator.accelerometer.watchAcceleration).toBeDefined();
+		expect(typeof navigator.accelerometer.watchAcceleration == 'function').toBe(true);
 	});
-	test("should contain a clearWatch function", function() {
-		expect(2);
-		ok(typeof navigator.accelerometer.clearWatch != 'undefined' && navigator.accelerometer.clearWatch != null, "navigator.accelerometer.clearWatch should not be null.");
-		ok(typeof navigator.accelerometer.clearWatch == 'function', "navigator.accelerometer.clearWatch should be a function!");
+
+	it("should contain a clearWatch function", function() {
+		expect(navigator.accelerometer.clearWatch).toBeDefined();
+		expect(typeof navigator.accelerometer.clearWatch == 'function').toBe(true);
 	});
-	module('Acceleration model');
-	test("should be able to define a new Acceleration object with x, y, z and timestamp properties.", function () {
-		expect(9);
-		var x = 1;
-		var y = 2;
-		var z = 3;
-		var a = new Acceleration(x, y, z);
-		ok(a != null, "new Acceleration object should not be null.");
-		ok(typeof a == 'object', "new Acceleration object should be of type 'object'.");
-		ok(a.x != null, "new Acceleration object should have an 'x' property.");
-		equals(a.x, x, "new Acceleration object should have 'x' property equal to first parameter passed in Acceleration constructor.");
-		ok(a.y != null, "new Acceleration object should have a 'y' property.");
-		equals(a.y, y, "new Acceleration object should have 'y' property equal to second parameter passed in Acceleration constructor.");
-		ok(a.z != null, "new Acceleration object should have a 'z' property.");
-		equals(a.z, z, "new Acceleration object should have 'z' property equal to third parameter passed in Acceleration constructor.");
-		ok(a.timestamp != null, "new Acceleration object should have a 'timestamp' property.");
-	});
-};
\ No newline at end of file
+
+	describe('Acceleration model', function () { 
+        it("should be able to define a new Acceleration object with x, y, z and timestamp properties.", function () {
+            var x = 1;
+            var y = 2;
+            var z = 3;
+            var a = new Acceleration(x, y, z);
+            expect(a).toBeDefined();
+            expect(a.x).toBe(x);
+            expect(a.y).toBe(y);
+            expect(a.z).toBe(z);
+            expect(a.timestamp).toBeDefined();
+        });
+    });
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/battery.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/battery.tests.js
index faf14e15..7bb25af8 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/battery.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/battery.tests.js
@@ -1,7 +1,5 @@
-Tests.prototype.BatteryTests = function() {  
-    module('Battery (navigator.battery)');
-    test("should exist", function() {
-        expect(1);
-        ok(navigator.battery != null, "navigator.battery should not be null.");
+describe('Battery (navigator.battery)', function () {;
+    it("should exist", function() {
+        expect(navigator.battery).toBeDefined();
     });
-};
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/camera.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/camera.tests.js
index 2e55f9db..9b6b04c2 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/camera.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/camera.tests.js
@@ -1,50 +1,47 @@
-Tests.prototype.CameraTests = function() {	
-	module('Camera (navigator.camera)');
-	test("should exist", function() {
-      expect(1);
-      ok(navigator.camera !== null, "navigator.camera should not be null.");
+describe('Camera (navigator.camera)', function () {
+	it("should exist", function() {
+        expect(navigator.camera).toBeDefined();
 	});
-	test("should contain a getPicture function", function() {
-		expect(2);
-		ok(typeof navigator.camera.getPicture != 'undefined' && navigator.camera.getPicture !== null, "navigator.camera.getPicture should not be null.");
-		ok(typeof navigator.camera.getPicture == 'function', "navigator.camera.getPicture should be a function.");
+
+	it("should contain a getPicture function", function() {
+        expect(navigator.camera.getPicture).toBeDefined();
+		expect(typeof navigator.camera.getPicture == 'function').toBe(true);
 	});
+});
+
+describe('Camera Constants (window.Camera + navigator.camera)', function () {
+    it("window.Camera should exist", function() {
+        expect(window.Camera).toBeDefined();
+    });
+
+    it("should contain two DestinationType constants", function() {
+        expect(Camera.DestinationType.DATA_URL).toBe(0);
+        expect(Camera.DestinationType.FILE_URI).toBe(1);
+        expect(navigator.camera.DestinationType.DATA_URL).toBe(0);
+        expect(navigator.camera.DestinationType.FILE_URI).toBe(1);
+    });
+
+    it("should contain two EncodingType constants", function() {
+        expect(Camera.EncodingType.JPEG).toBe(0);
+        expect(Camera.EncodingType.PNG).toBe(1);
+        expect(navigator.camera.EncodingType.JPEG).toBe(0);
+        expect(navigator.camera.EncodingType.PNG).toBe(1);
+    });
 
-  module('Camera Constants (window.Camera + navigator.camera)');
-  test("window.Camera should exist", function() {
-    expect(1);
-    ok(window.Camera !== null, "window.Camera should not be null.");
-  });
-  test("should contain two DestinationType constants", function() {
-    expect(4);
-    equals(Camera.DestinationType.DATA_URL, 0, "Camera.DestinationType.DATA_URL should equal to 0");
-    equals(Camera.DestinationType.FILE_URI, 1, "Camera.DestinationType.DATA_URL should equal to 1");
-    equals(navigator.camera.DestinationType.DATA_URL, 0, "navigator.camera.DestinationType.DATA_URL should equal to 0");
-    equals(navigator.camera.DestinationType.FILE_URI, 1, "navigator.camera.DestinationType.DATA_URL should equal to 1");
-  });
-  test("should contain two EncodingType constants", function() {
-    expect(4);
-    equals(Camera.EncodingType.JPEG, 0, "Camera.EncodingType.JPEG should equal to 0");
-    equals(Camera.EncodingType.PNG, 1, "Camera.EncodingType.PNG should equal to 1");
-    equals(navigator.camera.EncodingType.JPEG, 0, "navigator.camera.EncodingType.JPEG should equal to 0");
-    equals(navigator.camera.EncodingType.PNG, 1, "navigator.camera.EncodingType.PNG should equal to 1");
-  });
-  test("should contain three MediaType constants", function() {
-    expect(6);
-    equals(Camera.MediaType.PICTURE, 0, 'Camera.MediaType.PICTURE should equal to 0');
-    equals(Camera.MediaType.VIDEO, 1, 'Camera.MediaType.VIDEO should equal to 1');
-    equals(Camera.MediaType.ALLMEDIA, 2, 'Camera.MediaType.ALLMEDIA should equal to 2');
-    equals(navigator.camera.MediaType.PICTURE, 0, 'navigator.camera.MediaType.PICTURE should equal to 0');
-    equals(navigator.camera.MediaType.VIDEO, 1, 'navigator.camera.MediaType.VIDEO should equal to 1');
-    equals(navigator.camera.MediaType.ALLMEDIA, 2, 'navigator.camera.MediaType.ALLMEDIA should equal to 2');
-  });
-  test("should contain three PictureSourceType constants", function() {
-    expect(6);
-    equals(Camera.PictureSourceType.PHOTOLIBRARY, 0, 'Camera.PictureSourceType.PHOTOLIBRARY should equal to 0');
-    equals(Camera.PictureSourceType.CAMERA, 1, 'Camera.PictureSourceType.CAMERA should equal to 1');
-    equals(Camera.PictureSourceType.SAVEDPHOTOALBUM, 2, 'Camera.PictureSourceType.SAVEDPHOTOALBUM should equal to 2');
-    equals(navigator.camera.PictureSourceType.PHOTOLIBRARY, 0, 'navigator.camera.PictureSourceType.PHOTOLIBRARY should equal to 0');
-    equals(navigator.camera.PictureSourceType.CAMERA, 1, 'navigator.camera.PictureSourceType.CAMERA should equal to 1');
-    equals(navigator.camera.PictureSourceType.SAVEDPHOTOALBUM, 2, 'navigator.camera.PictureSourceType.SAVEDPHOTOALBUM should equal to 2');
-  });
-};
+    it("should contain three MediaType constants", function() {
+        expect(Camera.MediaType.PICTURE).toBe(0);
+        expect(Camera.MediaType.VIDEO).toBe(1);
+        expect(Camera.MediaType.ALLMEDIA).toBe(2);
+        expect(navigator.camera.MediaType.PICTURE).toBe(0);
+        expect(navigator.camera.MediaType.VIDEO).toBe(1);
+        expect(navigator.camera.MediaType.ALLMEDIA).toBe(2);
+    });
+    it("should contain three PictureSourceType constants", function() {
+        expect(Camera.PictureSourceType.PHOTOLIBRARY).toBe(0);
+        expect(Camera.PictureSourceType.CAMERA).toBe(1);
+        expect(Camera.PictureSourceType.SAVEDPHOTOALBUM).toBe(2);
+        expect(navigator.camera.PictureSourceType.PHOTOLIBRARY).toBe(0);
+        expect(navigator.camera.PictureSourceType.CAMERA).toBe(1);
+        expect(navigator.camera.PictureSourceType.SAVEDPHOTOALBUM).toBe(2);
+    });
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/capture.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/capture.tests.js
index 594d7d19..bffced84 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/capture.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/capture.tests.js
@@ -1,97 +1,95 @@
-Tests.prototype.CaptureTests = function() {  
-    module('Capture (navigator.device.capture)');
-    test("should exist", function() {
-        expect(2);
-        ok(navigator.device !== null, "navigator.device should not be null.");
-        ok(navigator.device.capture !== null, "navigator.device.capture should not be null.");
+describe('Capture (navigator.device.capture)', function () {
+    it("should exist", function() {
+        expect(navigator.device).toBeDefined();
+        expect(navigator.device.capture).toBeDefined();
     });
-    test("should have the correct properties ", function() {
-        expect(3);
-        ok(typeof navigator.device.capture.supportedAudioModes != 'undefined' && navigator.device.capture.supportedAudioModes !== null , "there should be a supported audio modes property");
-        ok(typeof navigator.device.capture.supportedImageModes != 'undefined' && navigator.device.capture.supportedImageModes !== null , "there should be a supported image modes property");
-        ok(typeof navigator.device.capture.supportedVideoModes != 'undefined' && navigator.device.capture.supportedVideoModes !== null , "there should be a supported video modes property");
-    });
-    test("should contain a captureAudio function", function() {
-        expect(2);
-        ok(typeof navigator.device.capture.captureAudio != 'undefined' && navigator.device.capture.captureAudio !== null, "navigator.device.capture.captureAudio should not be null.");
-        ok(typeof navigator.device.capture.captureAudio == 'function', "navigator.device.capture.captureAudio should be a function.");
+
+    it("should have the correct properties ", function() {
+        expect(navigator.device.capture.supportedAudioModes).toBeDefined();
+        expect(navigator.device.capture.supportedImageModes).toBeDefined();
+        expect(navigator.device.capture.supportedVideoModes).toBeDefined();
     });
-    test("should contain a captureImage function", function() {
-        expect(2);
-        ok(typeof navigator.device.capture.captureImage != 'undefined' && navigator.device.capture.captureImage !== null, "navigator.device.capture.captureImage should not be null.");
-        ok(typeof navigator.device.capture.captureImage == 'function', "navigator.device.capture.captureImage should be a function.");
+
+    it("should contain a captureAudio function", function() {
+        expect(navigator.device.capture.captureAudio).toBeDefined();
+        expect(typeof navigator.device.capture.captureAudio == 'function').toBe(true);
     });
-    test("should contain a captureVideo function", function() {
-        expect(2);
-        ok(typeof navigator.device.capture.captureVideo != 'undefined' && navigator.device.capture.captureVideo !== null, "navigator.device.capture.captureVideo should not be null.");
-        ok(typeof navigator.device.capture.captureVideo == 'function', "navigator.device.capture.captureVideo should be a function.");
+
+    it("should contain a captureImage function", function() {
+        expect(navigator.device.capture.captureImage).toBeDefined();
+        expect(typeof navigator.device.capture.captureImage == 'function').toBe(true);
     });
 
-    module('CaptureAudioOptions');
-    test("CaptureAudioOptions constructor should exist", function() {
-        expect(4);
-        var options = new CaptureAudioOptions();
-        ok(options !== null, "CaptureAudioOptions object should not be null.");
-        ok(typeof options.limit !== 'undefined', "CaptureAudioOptions object should have a 'limit' property.");
-        ok(typeof options.duration !== 'undefined', "CaptureAudioOptions object should have a 'duration' property.");
-        ok(typeof options.mode !== 'undefined', "CaptureAudioOptions object should have a 'mode' property.");
+    it("should contain a captureVideo function", function() {
+        expect(navigator.device.capture.captureVideo).toBeDefined();
+        expect(typeof navigator.device.capture.captureVideo == 'function').toBe(true);
     });
 
-    module('CaptureImageOptions');
-    test("CaptureImageOptions constructor should exist", function() {
-        expect(3);
-        var options = new CaptureImageOptions();
-        ok(options !== null, "CaptureImageOptions object should not be null.");
-        ok(typeof options.limit !== 'undefined', "CaptureImageOptions object should have a 'limit' property.");
-        ok(typeof options.mode !== 'undefined', "CaptureImageOptions object should have a 'mode' property.");
+    describe('CaptureAudioOptions', function () {
+        it("CaptureAudioOptions constructor should exist", function() {
+            var options = new CaptureAudioOptions();
+            expect(options).toBeDefined();
+            expect(options.limit).toBeDefined();
+            expect(options.duration).toBeDefined();
+            expect(options.mode).toBeDefined();
+        });
     });
 
-    module('CaptureVideoOptions');
-    test("CaptureVideoOptions constructor should exist", function() {
-        expect(4);
-        var options = new CaptureVideoOptions();
-        ok(options !== null, "CaptureVideoOptions object should not be null.");
-        ok(typeof options.limit !== 'undefined', "CaptureVideoOptions object should have a 'limit' property.");
-        ok(typeof options.duration !== 'undefined', "CaptureVideoOptions object should have a 'duration' property.");
-        ok(typeof options.mode !== 'undefined', "CaptureVideoOptions object should have a 'mode' property.");
+    describe('CaptureImageOptions', function () {
+        it("CaptureImageOptions constructor should exist", function() {
+            var options = new CaptureImageOptions();
+            expect(options).toBeDefined();
+            expect(options.limit).toBeDefined();
+            expect(options.mode).toBeDefined();
+        });
     });
 
-    module('CaptureError interface');
-    test("CaptureError constants should be defined", function() {
-        expect(4);
-        equal(CaptureError.CAPTURE_INTERNAL_ERR, 0, "CaptureError.CAPTURE_INTERNAL_ERR should be defined");
-        equal(CaptureError.CAPTURE_APPLICATION_BUSY, 1, "CaptureError.CAPTURE_APPLICATION_BUSY should be defined");
-        equal(CaptureError.CAPTURE_INVALID_ARGUMENT, 2, "CaptureError.CAPTURE_INVALID_ARGUMENT should be defined");
-        equal(CaptureError.CAPTURE_NO_MEDIA_FILES, 3, "CaptureError.CAPTURE_NO_MEDIA_FILES should be defined");
+    describe('CaptureVideoOptions', function () {
+        it("CaptureVideoOptions constructor should exist", function() {
+            var options = new CaptureVideoOptions();
+            expect(options).toBeDefined();
+            expect(options.limit).toBeDefined();
+            expect(options.duration).toBeDefined();
+            expect(options.mode).toBeDefined();
+        });
     });
-    test("CaptureError properties should exist", function() {
-        expect(2);
-        var error = new CaptureError();
-        ok(error !== null, "CaptureError object should not be null.");
-        ok(typeof error.code !== 'undefined', "CaptureError object should have a 'code' property.");
+
+    describe('CaptureError interface', function () {
+        it("CaptureError constants should be defined", function() {
+            expect(CaptureError.CAPTURE_INTERNAL_ERR).toBe(0);
+            expect(CaptureError.CAPTURE_APPLICATION_BUSY).toBe(1);
+            expect(CaptureError.CAPTURE_INVALID_ARGUMENT).toBe(2);
+            expect(CaptureError.CAPTURE_NO_MEDIA_FILES).toBe(3);
+        });
+
+        it("CaptureError properties should exist", function() {
+            var error = new CaptureError();
+            expect(error).toBeDefined();
+            expect(error.code).toBeDefined();
+        });
     });
 
-    module('MediaFileData');
-    test("MediaFileData constructor should exist", function() {
-        expect(6);
-        var fileData = new MediaFileData();
-        ok(fileData !== null, "MediaFileData object should not be null.");
-        ok(typeof fileData.bitrate !== 'undefined', "MediaFileData object should have a 'bitrate' property.");
-        ok(typeof fileData.codecs !== 'undefined', "MediaFileData object should have a 'codecs' property.");
-        ok(typeof fileData.duration !== 'undefined', "MediaFileData object should have a 'duration' property.");
-        ok(typeof fileData.height !== 'undefined', "MediaFileData object should have a 'height' property.");
-        ok(typeof fileData.width !== 'undefined', "MediaFileData object should have a 'width' property.");
+    describe('MediaFileData', function () {
+        it("MediaFileData constructor should exist", function() {
+            var fileData = new MediaFileData();
+            expect(fileData).toBeDefined();
+            expect(fileData.bitrate).toBeDefined();
+            expect(fileData.codecs).toBeDefined();
+            expect(fileData.duration).toBeDefined();
+            expect(fileData.height).toBeDefined();
+            expect(fileData.width).toBeDefined();
+        });
     });
 
-    module('MediaFile');
-    test("MediaFile constructor should exist", function() {
-        expect(6);
-        var fileData = new MediaFile();
-        ok(fileData !== null, "MediaFile object should not be null.");
-        ok(typeof fileData.name !== 'undefined', "MediaFile object should have a 'name' property.");
-        ok(typeof fileData.fullPath !== 'undefined', "MediaFile object should have a 'fullPath' property.");
-        ok(typeof fileData.type !== 'undefined', "MediaFile object should have a 'type' property.");
-        ok(typeof fileData.lastModifiedDate !== 'undefined', "MediaFile object should have a 'lastModifiedDate' property.");
-        ok(typeof fileData.size !== 'undefined', "MediaFile object should have a 'size' property.");
+    describe('MediaFile', function () {
+        it("MediaFile constructor should exist", function() {
+            var fileData = new MediaFile();
+            expect(fileData).toBeDefined();
+            expect(fileData.name).toBeDefined();
+            expect(fileData.fullPath).toBeDefined();
+            expect(fileData.type).toBeDefined();
+            expect(fileData.lastModifiedDate).toBeDefined();
+            expect(fileData.size).toBeDefined();
+        });
     });
-};
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/compass.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/compass.tests.js
index b3abf2b1..a16ec0e7 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/compass.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/compass.tests.js
@@ -1,72 +1,76 @@
-Tests.prototype.CompassTests = function() {
-  module('Compass (navigator.compass)');
-	test("should exist", function() {
-      expect(1);
-      ok(navigator.compass !== null, "navigator.compass should not be null.");
-	});
-	test("should contain a getCurrentHeading function", function() {
-		expect(2);
-		ok(typeof navigator.compass.getCurrentHeading != 'undefined' && navigator.compass.getCurrentHeading !== null, "navigator.compass.getCurrentHeading should not be null.");
-		ok(typeof navigator.compass.getCurrentHeading == 'function', "navigator.compass.getCurrentHeading should be a function.");
-	});
-	test("getCurrentHeading success callback should be called with a Heading object", function() {
-		expect(9);
-		QUnit.stop(Tests.TEST_TIMEOUT);
-		var win = function(a) {
-			ok(a instanceof CompassHeading, "Heading object returned in getCurrentHeading success callback should be an instance of CompassHeading.");
-			ok(a.magneticHeading !== null, "Heading object returned in getCurrentHeading success callback should have an 'magneticHeading' property.");
-			ok(typeof a.magneticHeading == 'number', "Heading object's 'magneticHeading' property returned in getCurrentHeading success callback should be of type 'number'.");
-			ok(a.trueHeading !== undefined, "Heading object returned in getCurrentHeading success callback should have a 'trueHeading' property.");
-			ok(typeof a.trueHeading == 'number' || a.trueHeading === null, "Heading object's 'trueHeading' property returned in getCurrentHeading success callback should be of type 'number', or should be null if not available.");
-			ok(a.headingAccuracy !== undefined, "Heading object returned in getCurrentHeading success callback should have a 'headingAccuracy' property.");
-			ok(typeof a.headingAccuracy == 'number' || a.headingAccuracy === null, "Heading object's 'headingAccuracy' property returned in getCurrentHeading success callback should be of type 'number', or should be null if not available.");
-			ok(a.timestamp !== null, "Heading object returned in getCurrentHeading success callback should have a 'timestamp' property.");
-			ok(a.timestamp instanceof Date, "Heading object's 'timestamp' property returned in getCurrentHeading success callback should be of type 'Date'.");
-			QUnit.start();
-		};
-		var fail = function() { QUnit.start(); };
-		navigator.compass.getCurrentHeading(win, fail);
-	});
-	test("should contain a watchHeading function", function() {
-		expect(2);
-		ok(typeof navigator.compass.watchHeading != 'undefined' && navigator.compass.watchHeading !== null, "navigator.compass.watchHeading should not be null.");
-		ok(typeof navigator.compass.watchHeading == 'function', "navigator.compass.watchHeading should be a function.");
+describe('Compass (navigator.compass)', function () {
+    it("should exist", function() {
+        expect(navigator.compass).toBeDefined();
+    });
+
+    it("should contain a getCurrentHeading function", function() {
+        expect(navigator.compass.getCurrentHeading).toBeDefined();
+		expect(typeof navigator.compass.getCurrentHeading == 'function').toBe(true);
 	});
-	test("should contain a clearWatch function", function() {
-		expect(2);
-		ok(typeof navigator.compass.clearWatch != 'undefined' && navigator.compass.clearWatch !== null, "navigator.compass.clearWatch should not be null.");
-		ok(typeof navigator.compass.clearWatch == 'function', "navigator.compass.clearWatch should be a function!");
+
+    it("getCurrentHeading success callback should be called with a Heading object", function() {
+        var win = jasmine.createSpy().andCallFake(function(a) {
+                expect(a instanceof CompassHeading).toBe(true);
+                expect(a.magneticHeading).toBeDefined();
+                expect(typeof a.magneticHeading == 'number').toBe(true);
+                expect(a.trueHeading).not.toBe(undefined);
+                expect(typeof a.trueHeading == 'number' || a.trueHeading === null).toBe(true);
+                expect(a.headingAccuracy).not.toBe(undefined);
+                expect(typeof a.headingAccuracy == 'number' || a.headingAccuracy === null).toBe(true);
+                expect(typeof a.timestamp == 'number').toBe(true);
+            }),
+            fail = jasmine.createSpy();
+
+        runs(function () {
+            navigator.compass.getCurrentHeading(win, fail);
+        });
+
+        waitsFor(function () { return win.wasCalled; }, "success callback never called", Tests.TEST_TIMEOUT);
+
+        runs(function () {
+            expect(fail).not.toHaveBeenCalled();
+            expect(win).toHaveBeenCalled();
+        });
 	});
 
-  module('Compass Constants (window.CompassError)');
-  test("CompassError globals should exist", function() {
-    expect(3);
-    ok(window.CompassError !== null, 'window.CompassError should not be null');
-    equals(window.CompassError.COMPASS_INTERNAL_ERR, 0, 'window.CompassError.COMPASS_INTERNAL_ERR should be 0');
-    equals(window.CompassError.COMPASS_NOT_SUPPORTED, 20, 'window.CompassError.COMPASS_NOT_SUPPORTED should be 20');
-  });
+    it("should contain a watchHeading function", function() {
+        expect(navigator.compass.watchHeading).toBeDefined();
+        expect(typeof navigator.compass.watchHeading == 'function').toBe(true);
+    });
+
+    it("should contain a clearWatch function", function() {
+        expect(navigator.compass.clearWatch).toBeDefined();
+        expect(typeof navigator.compass.clearWatch == 'function').toBe(true);
+    });
+
+    describe('Compass Constants (window.CompassError)', function () {
+        it("should exist", function() {
+            expect(window.CompassError).toBeDefined();
+            expect(window.CompassError.COMPASS_INTERNAL_ERR).toBe(0);
+            expect(window.CompassError.COMPASS_NOT_SUPPORTED).toBe(20);
+        });
+    });
+
+    describe('Compass Heading model (CompassHeading)', function () {
+        it("should exist", function() {
+            expect(CompassHeading).toBeDefined();
+        });
+
+        it("should be able to create a new CompassHeading instance with no parameters", function() {
+            var h = new CompassHeading();
+            expect(h.magneticHeading).toBeDefined();
+            expect(h.trueHeading).toBeDefined();
+            expect(h.headingAccuracy).toBeDefined();
+            expect(typeof h.timestamp == 'number').toBe(true);
+        });
 
-  module('Compass Heading model (CompassHeading)');
-  test("CompassHeading function should exist", function() {
-    expect(1);
-    ok(typeof CompassHeading != 'undefined' && CompassHeading !== null, 'CompassHeading should not be null');
-  });
-  test("Creating a new CompassHeading instance with no parameters", function() {
-    expect(5);
-    var h = new CompassHeading();
-    equals(h.magneticHeading, null, "CompassHeading instance should have null magneticHeading property by default");
-    equals(h.trueHeading, null, "CompassHeading instance should have null trueHeading property by default");
-    equals(h.headingAccuracy, null, "CompassHeading instance should have null headingAccuracy property by default");
-    ok(h.timestamp !== null, "CompassHeading instance should have timestamp that is not null by default");
-    ok(h.timestamp instanceof Date, "CompassHeading instance should have timestamp that is an instance of a Date object.");
-  });
-  test("Creating a new CompassHeading instance with parameters", function() {
-    expect(5);
-    var h = new CompassHeading(1,2,3,4);
-    equals(h.magneticHeading, 1, "CompassHeading instance should have specified magneticHeading.");
-    equals(h.trueHeading, 2, "CompassHeading instance should have specified trueHeading.");
-    equals(h.headingAccuracy, 3, "CompassHeading instance should have specified headingAccuracy.");
-    equals(h.timestamp.valueOf(), 4, "CompassHeading instance should have specified timestamp cast as a Date object");
-    ok(h.timestamp instanceof Date, "CompassHeading instance should have timestamp that is an instance of a Date object.");
-  });
-};
+        it("should be able to creat a new CompassHeading instance with parameters", function() {
+            var h = new CompassHeading(1,2,3,4);
+            expect(h.magneticHeading).toBe(1);
+            expect(h.trueHeading).toBe(2);
+            expect(h.headingAccuracy).toBe(3);
+            expect(h.timestamp.valueOf()).toBe(4);
+            expect(typeof h.timestamp == 'number').toBe(true);
+        });
+    });
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/contacts.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/contacts.tests.js
index bfba15c1..959125e1 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/contacts.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/contacts.tests.js
@@ -12,83 +12,77 @@ var removeContact = function(){
     }
 };
 
-Tests.prototype.ContactsTests = function() {
-    module("Contacts (navigator.contacts)");
-    test("should exist", function() {
-        expect(1);
-        ok(navigator.contacts != null, "navigator.contacts should not be null.");
+describe("Contacts (navigator.contacts)", function () {
+    it("should exist", function() {
+        expect(navigator.contacts).toBeDefined();
     });
-    test("should contain a find function", function() {
-        expect(2);
-        ok(typeof navigator.contacts.find != 'undefined' && navigator.contacts.find != null, "navigator.contacts.find should not be null.");
-        ok(typeof navigator.contacts.find == 'function', "navigator.contacts.find should be a function.");
-    });
-    test("contacts.find success callback should be called with an array", function() {
-        expect(2);
-        QUnit.stop(15000);
-        var win = function(result) {
-            ok(typeof result == 'object', "Object returned in contacts.find success callback is of type 'object' (actually array).");
-            ok(typeof result.length == 'number', "Object returned in contacts.find success callback has a length property which is numerical.");
-            QUnit.start();
-        };
-        var fail = function() { QUnit.start(); };
-        var obj = new ContactFindOptions();
-        obj.filter="";
-        obj.multiple=true;
-        navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], win, fail, obj);
-    }); 
-    test("contacts.find success callback should not be null", function() {
-        expect(1);
-        var fail = function() {};
-        var obj = new ContactFindOptions();
-        obj.filter="";
-        obj.multiple=true;
-        try {
-            navigator.contacts.find(["displayName", "name", "emails", "phoneNumbers"], null, fail, obj);
-        } catch(e) {
-            ok(true, "Trying to find with a null success call back should throw TypeError.");
-        }
-    }); 
-    test("contacts.find error callback should be called when no fields are specified", function() {
-        expect(2);
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        var win = function(result) {
-            ok(false, "Success callback should not fire in this test, failed.");
-            QUnit.start();
-        };
-        var fail = function(result) { 
-            ok(typeof result == 'object', "Object returned in contact.find failure callback is of type 'object' (actually ContactError).");
-            ok(result.code == ContactError.INVALID_ARGUMENT_ERROR, "Object returned in contacts.find failure callback has a code property which equal to ContactError.INVALID_ARGUMENT_ERROR.");
-            QUnit.start(); 
-        };
-        var obj = new ContactFindOptions();
-        obj.filter="";
-        obj.multiple=true;
-        navigator.contacts.find([], win, fail, obj);
-    });
-    module("contacts.find with newly-created contact", {
-        setup:function() {},
-        teardown:removeContact
+
+    it("should contain a find function", function() {
+        expect(navigator.contacts.find).toBeDefined();
+        expect(typeof navigator.contacts.find).toBe('function');
     });
-    test("find a contact by name", function() {
-        expect(4);
-        QUnit.stop(7000);
-        // ----
-        // Helper save/create invocations+asserts
-        // ----
-        gContactObj = new Contact();
-        gContactObj.name = new ContactName();
-        gContactObj.name.familyName = "Delete";
-        gContactObj.save(
-            function(savedContact) {
-                ok(true, "Contact's save success callback needs to fire for this test to pass");
-                // update so contact will get removed
-                gContactObj = savedContact;
-                // ----
-                // Find asserts
-                // ---
-                var findWin = function(object) {
-                    var foundName = function(result) {
+
+    describe("find method", function() {
+        it("success callback should be called with an array", function() {
+            var win = jasmine.createSpy().andCallFake(function(result) {
+                    expect(result).toBeDefined();
+                    expect(result instanceof Array).toBe(true);
+                }),
+                fail = jasmine.createSpy(),
+                obj = new ContactFindOptions();
+
+            runs(function () {
+                obj.filter="";
+                obj.multiple=true;
+                navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], win, fail, obj);
+            });
+
+            waitsFor(function () { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+            runs(function () {
+                expect(fail).not.toHaveBeenCalled();
+            });
+        }); 
+
+        it("should throw an exception if success callback is empty", function() {
+            var fail = function() {};
+            var obj = new ContactFindOptions();
+            obj.filter="";
+            obj.multiple=true;
+
+            expect(function () {
+                navigator.contacts.find(["displayName", "name", "emails", "phoneNumbers"], null, fail, obj);
+            }).toThrow();
+        }); 
+
+        it("error callback should be called when no fields are specified", function() {
+            var win = jasmine.createSpy(),
+                fail = jasmine.createSpy(function(result) { 
+                    expect(result).toBeDefined();
+                    expect(result.code).toBe(ContactError.INVALID_ARGUMENT_ERROR);
+                }),
+                obj = new ContactFindOptions();
+
+            runs(function () {
+                obj.filter="";
+                obj.multiple=true;
+                navigator.contacts.find([], win, fail, obj);
+            });
+
+            waitsFor(function () { return fail.wasCalled; }, Tests.TEST_TIMEOUT);
+
+            runs(function () { 
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).toHaveBeenCalled();
+            });
+        });
+
+        describe("with newly-created contact", function () {
+
+            afterEach(removeContact);
+
+            it("should be able to find a contact by name", function() {
+                var foundName = jasmine.createSpy().andCallFake(function(result) {
                         var bFound = false;
                         try {
                             for (var i=0; i < result.length; i++) {
@@ -101,325 +95,351 @@ Tests.prototype.ContactsTests = function() {
                             return false;
                         } 
                         return bFound;
-                    }         
-                    ok(object instanceof Array, "Object returned in contacts.find success callback should be instanceof array.");
-                    ok(object.length >= 1, "length of Object returned in contacts.find success callback should have length property >= 1");
-                    ok(foundName(object) == true, "returned contact array should contain a contact with familyName of 'Delete'.");
-                    QUnit.start();
-                };
-                var findFail = function() { 
-                    ok(false, "find method's error callback called, test failed.");
-                    QUnit.start(); 
-                };
-                var obj = new ContactFindOptions();
-                obj.filter="Delete";
-                obj.multiple=true;
-                navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWin, findFail, obj);
-        },
-        function(e){
-              ok(false, "Contact's save error callback fired; this test cannot continue");
-              QUnit.start();
+                    }),
+                    fail = jasmine.createSpy(),
+                    test = jasmine.createSpy().andCallFake(function(savedContact) {
+                        console.log('in test');
+                        // update so contact will get removed
+                        gContactObj = savedContact;
+                        // ----
+                        // Find asserts
+                        // ---
+                        var findWin = jasmine.createSpy().andCallFake(function(object) {
+                                console.log('in findwin');
+                                expect(object instanceof Array).toBe(true);
+                                expect(object.length >= 1).toBe(true);
+                                expect(foundName(object)).toBe(true);
+                            }),
+                            findFail = jasmine.createSpy(),
+                            obj = new ContactFindOptions();
+
+                        obj.filter="Delete";
+                        obj.multiple=true;
+
+                        runs(function () {
+                            navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWin, findFail, obj);
+                        });
+
+                        waitsFor(function () { return foundName.wasCalled; }, "foundName not done", Tests.TEST_TIMEOUT);
+
+                        runs(function () {
+                            expect(findFail).not.toHaveBeenCalled();
+                            expect(fail).not.toHaveBeenCalled();
+                        });
+                    });
+
+                runs(function () {
+                    gContactObj = new Contact();
+                    gContactObj.name = new ContactName();
+                    gContactObj.name.familyName = "Delete";
+                    gContactObj.save(test, fail);
+                });
+
+                waitsFor(function () { return test.wasCalled; }, "test not done", Tests.TEST_TIMEOUT);
+            });
         });
     });
-    module("Contacts (navigator.contacts)");
-    test("should contain a create function", function() {
-        expect(2);
-        ok(typeof navigator.contacts.create != 'undefined' && navigator.contacts.create != null, "navigator.contacts.create should not be null.");
-        ok(typeof navigator.contacts.create == 'function', "navigator.contacts.create should be a function.");
-    });
-    test("contacts.create should return a Contact object", function() {
-        expect(9);
-        var bDay = new Date(1976, 7,4);
-        var obj = navigator.contacts.create({"displayName": "test name", "gender": "male", "note": "my note", "name": {"formatted": "Mr. Test Name"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});		
-        ok(obj != 'undefined' && obj != null, "navigator.contacts.create should return a Contact object.");
-        ok(obj.displayName == 'test name', "Contact should contain a displayName property.");
-        ok(obj.note == 'my note', "Contact should contain a note property.");
-        ok(obj.name.formatted == 'Mr. Test Name', "Contact should contain a name.formatted property.");
-        ok(obj.emails.length == 2, "Contact should contain and array of emails with 2 entries");
-        ok(obj.emails[0].value == 'here@there.com', "Contact.emails[1] should contain a value.");
-        ok(obj.emails[1].value == 'there@here.com', "Contact.emails[2] should contain a value.");	
-        ok(obj.nickname == null, "Contact object should not contain a nickname property.");
-        ok(obj.birthday instanceof Date && obj.birthday == bDay, "Contact should be a Date object equal to " + bDay);
-    });
-    module("Contact model");
-    test("should be able to define a Contact object", function() {
-        expect(15);
-        var contact = new Contact("a", "b", new ContactName("a", "b", "c", "d", "e", "f"), "c", [], [], [], [], [], "f", "i",  
-            [], [], []);
-        ok(contact != null, "new Contact() should not be null.");
-        ok(typeof contact.id != 'undefined' && contact.id != null && contact.id == "a", "new Contact() should include a 'id' property.");
-        ok(typeof contact.displayName != 'undefined' && contact.displayName != null && contact.displayName == "b", "new Contact() should include a 'displayName' property.");
-        ok(typeof contact.name != 'undefined' && contact.name != null && contact.name.formatted == "a", "new Contact() should include a 'name' property.");
-        ok(typeof contact.nickname != 'undefined' && contact.nickname != null && contact.nickname == "c", "new Contact() should include a 'nickname' property.");
-        ok(typeof contact.phoneNumbers != 'undefined' && contact.phoneNumbers != null, "new Contact() should include a 'phoneNumbers' property.");
-        ok(typeof contact.emails != 'undefined' && contact.emails != null, "new Contact() should include a 'emails' property.");
-        ok(typeof contact.addresses != 'undefined' && contact.addresses != null, "new Contact() should include a 'addresses' property.");
-        ok(typeof contact.ims != 'undefined' && contact.ims != null, "new Contact() should include a 'ims' property.");
-        ok(typeof contact.organizations != 'undefined' && contact.organizations != null, "new Contact() should include a 'organizations' property.");
-        ok(typeof contact.birthday != 'undefined' && contact.birthday != null && contact.birthday == "f", "new Contact() should include a 'birthday' property.");
-        ok(typeof contact.note != 'undefined' && contact.note != null && contact.note == "i", "new Contact() should include a 'note' property.");
-        ok(typeof contact.photos != 'undefined' && contact.photos != null, "new Contact() should include a 'photos' property.");
-        ok(typeof contact.categories != 'undefined' && contact.categories != null, "new Contact() should include a 'categories' property.");
-        ok(typeof contact.urls != 'undefined' && contact.urls != null, "new Contact() should include a 'urls' property.");
-    });	
-    test("should be able to define a ContactName object", function() {
-        expect(7);
-        var contactName = new ContactName("Dr. First Last Jr.", "Last", "First", "Middle", "Dr.", "Jr.");
-        ok(contactName != null, "new ContactName() should not be null.");
-        ok(typeof contactName.formatted != 'undefined' && contactName.formatted != null && contactName.formatted == "Dr. First Last Jr.", "new ContactName() should include a 'formatted' property.");
-        ok(typeof contactName.familyName != 'undefined' && contactName.familyName != null && contactName.familyName == "Last", "new ContactName() should include a 'familyName' property.");
-        ok(typeof contactName.givenName != 'undefined' && contactName.givenName != null && contactName.givenName == "First", "new ContactName() should include a 'givenName' property.");
-        ok(typeof contactName.middleName != 'undefined' && contactName.middleName != null && contactName.middleName == "Middle", "new ContactName() should include a 'middleName' property.");
-        ok(typeof contactName.honorificPrefix != 'undefined' && contactName.honorificPrefix != null && contactName.honorificPrefix == "Dr.", "new ContactName() should include a 'honorificPrefix' property.");
-        ok(typeof contactName.honorificSuffix != 'undefined' && contactName.honorificSuffix != null && contactName.honorificSuffix == "Jr.", "new ContactName() should include a 'honorificSuffix' property.");
-    });	
-    test("should be able to define a ContactField object", function() {
-        expect(4);
-        var contactField = new ContactField("home", "8005551212", true);
-        ok(contactField != null, "new ContactField() should not be null.");
-        ok(typeof contactField.type != 'undefined' && contactField.type != null && contactField.type == "home", "new ContactField() should include a 'type' property.");
-        ok(typeof contactField.value != 'undefined' && contactField.value != null && contactField.value == "8005551212", "new ContactField() should include a 'value' property.");
-        ok(typeof contactField.pref != 'undefined' && contactField.pref != null && contactField.pref == true, "new ContactField() should include a 'pref' property.");
-    });	
-    test("should be able to define a ContactAddress object", function() {
-        expect(9);
-        var contactAddress = new ContactAddress(true, "home", "a","b","c","d","e","f");
-        ok(contactAddress != null, "new ContactAddress() should not be null.");
-        ok(typeof contactAddress.pref != 'undefined' && contactAddress.pref != null && contactAddress.pref == true, "new ContactAddress() should include a 'pref' property.");
-        ok(typeof contactAddress.type != 'undefined' && contactAddress.type != null && contactAddress.type == "home", "new ContactAddress() should include a 'type' property.");
-        ok(typeof contactAddress.formatted != 'undefined' && contactAddress.formatted != null && contactAddress.formatted == "a", "new ContactAddress() should include a 'formatted' property.");
-        ok(typeof contactAddress.streetAddress != 'undefined' && contactAddress.streetAddress != null && contactAddress.streetAddress == "b", "new ContactAddress() should include a 'streetAddress' property.");
-        ok(typeof contactAddress.locality != 'undefined' && contactAddress.locality != null && contactAddress.locality == "c", "new ContactAddress() should include a 'locality' property.");
-        ok(typeof contactAddress.region != 'undefined' && contactAddress.region != null && contactAddress.region == "d", "new ContactAddress() should include a 'region' property.");
-        ok(typeof contactAddress.postalCode != 'undefined' && contactAddress.postalCode != null && contactAddress.postalCode == "e", "new ContactAddress() should include a 'postalCode' property.");
-        ok(typeof contactAddress.country != 'undefined' && contactAddress.country != null && contactAddress.country == "f", "new ContactAddress() should include a 'country' property.");
-    });	
-    test("should be able to define a ContactOrganization object", function() {
-        expect(6);
-        var contactOrg = new ContactOrganization(true, "home", "a","b","c","d","e","f","g");
-        ok(contactOrg != null, "new ContactOrganization() should not be null.");
-        ok(typeof contactOrg.pref != 'undefined' && contactOrg.pref != null && contactOrg.pref == true, "new ContactOrganization() should include a 'pref' property.");
-        ok(typeof contactOrg.type != 'undefined' && contactOrg.type != null && contactOrg.type == "home", "new ContactOrganization() should include a 'type' property.");
-        ok(typeof contactOrg.name != 'undefined' && contactOrg.name != null && contactOrg.name == "a", "new ContactOrganization() should include a 'name' property.");
-        ok(typeof contactOrg.department != 'undefined' && contactOrg.department != null && contactOrg.department == "b", "new ContactOrganization() should include a 'department' property.");
-        ok(typeof contactOrg.title != 'undefined' && contactOrg.title != null && contactOrg.title == "c", "new ContactOrganization() should include a 'title' property.");
-    });	
-    test("should be able to define a ContactFindOptions object", function() {
-        expect(3);
-        var contactFindOptions = new ContactFindOptions("a", true, "b");
-        ok(contactFindOptions != null, "new ContactFindOptions() should not be null.");
-        ok(typeof contactFindOptions.filter != 'undefined' && contactFindOptions.filter != null && contactFindOptions.filter == "a", "new ContactFindOptions() should include a 'filter' property.");
-        ok(typeof contactFindOptions.multiple != 'undefined' && contactFindOptions.multiple != null && contactFindOptions.multiple == true, "new ContactFindOptions() should include a 'multiple' property.");
-    });	
-    module("Contact Object");
-    test("should contain a clone function", function() {
-        expect(2);
-        var contact = new Contact();
-        ok(typeof contact.clone != 'undefined' && contact.clone != null, "contact.clone should not be null.");
-        ok(typeof contact.clone == 'function', "contact.clone should be a function.");
+
+    describe('create method', function() {
+
+        it("should exist", function() {
+            expect(navigator.contacts.create).toBeDefined();
+            expect(typeof navigator.contacts.create).toBe('function');
+        });
+
+        it("should return a Contact object", function() {
+            var bDay = new Date(1976, 7,4);
+            var obj = navigator.contacts.create({"displayName": "test name", "gender": "male", "note": "my note", "name": {"formatted": "Mr. Test Name"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});		
+
+            expect(obj).toBeDefined();
+            expect(obj.displayName).toBe('test name');
+            expect(obj.note).toBe('my note');
+            expect(obj.name.formatted).toBe('Mr. Test Name');
+            expect(obj.emails.length).toBe(2);
+            expect(obj.emails[0].value).toBe('here@there.com');
+            expect(obj.emails[1].value).toBe('there@here.com');
+            expect(obj.nickname).toBe(null);
+            expect(obj.birthday).toBe(bDay);
+        });
     });
-    test("clone function should make deep copy of Contact Object", function() {
-        expect(8);
-        var contact = new Contact();
-        contact.id=1;
-        contact.displayName="Test Name";
-        contact.nickname="Testy";
-        contact.gender="male";
-        contact.note="note to be cloned";
-        contact.name = new ContactName("Mr. Test Name");
-        
-        var clonedContact = contact.clone();
+
+    describe("Contact object", function () {
+        it("should be able to create instance", function() {
+            var contact = new Contact("a", "b", new ContactName("a", "b", "c", "d", "e", "f"), "c", [], [], [], [], [], "f", "i",  
+                [], [], []);
+            expect(contact).toBeDefined();
+            expect(contact.id).toBe("a");
+            expect(contact.displayName).toBe("b");
+            expect(contact.name.formatted).toBe("a");
+            expect(contact.nickname).toBe("c");
+            expect(contact.phoneNumbers).toBeDefined();
+            expect(contact.emails).toBeDefined();
+            expect(contact.addresses).toBeDefined();
+            expect(contact.ims).toBeDefined();
+            expect(contact.organizations).toBeDefined();
+            expect(contact.birthday).toBe("f");
+            expect(contact.note).toBe("i");
+            expect(contact.photos).toBeDefined();
+            expect(contact.categories).toBeDefined();
+            expect(contact.urls).toBeDefined();
+        });	
+
+        it("should be able to define a ContactName object", function() {
+            var contactName = new ContactName("Dr. First Last Jr.", "Last", "First", "Middle", "Dr.", "Jr.");
+            expect(contactName).toBeDefined();
+            expect(contactName.formatted).toBe("Dr. First Last Jr.");
+            expect(contactName.familyName).toBe("Last");
+            expect(contactName.givenName).toBe("First");
+            expect(contactName.middleName).toBe("Middle");
+            expect(contactName.honorificPrefix).toBe("Dr.");
+            expect(contactName.honorificSuffix).toBe("Jr.");
+        });	
+
+        it("should be able to define a ContactField object", function() {
+            var contactField = new ContactField("home", "8005551212", true);
+            expect(contactField).toBeDefined();
+            expect(contactField.type).toBe("home");
+            expect(contactField.value).toBe("8005551212");
+            expect(contactField.pref).toBe(true);
+        });	
+
+        it("should be able to define a ContactAddress object", function() {
+            var contactAddress = new ContactAddress(true, "home", "a","b","c","d","e","f");
+            expect(contactAddress).toBeDefined();
+            expect(contactAddress.pref).toBe(true);
+            expect(contactAddress.type).toBe("home");
+            expect(contactAddress.formatted).toBe("a");
+            expect(contactAddress.streetAddress).toBe("b");
+            expect(contactAddress.locality).toBe("c");
+            expect(contactAddress.region).toBe("d");
+            expect(contactAddress.postalCode).toBe("e");
+            expect(contactAddress.country).toBe("f");
+        });	
+
+        it("should be able to define a ContactOrganization object", function() {
+            var contactOrg = new ContactOrganization(true, "home", "a","b","c","d","e","f","g");
+            expect(contactOrg).toBeDefined();
+            expect(contactOrg.pref).toBe(true);
+            expect(contactOrg.type).toBe("home");
+            expect(contactOrg.name).toBe("a");
+            expect(contactOrg.department).toBe("b");
+            expect(contactOrg.title).toBe("c");
+        });	
+
+        it("should be able to define a ContactFindOptions object", function() {
+            var contactFindOptions = new ContactFindOptions("a", true, "b");
+            expect(contactFindOptions).toBeDefined();
+            expect(contactFindOptions.filter).toBe("a");
+            expect(contactFindOptions.multiple).toBe(true);
+        });	
+
+        it("should contain a clone function", function() {
+            var contact = new Contact();
+            expect(contact.clone).toBeDefined();
+            expect(typeof contact.clone).toBe('function');
+        });
+
+        it("clone function should make deep copy of Contact Object", function() {
+            var contact = new Contact();
+            contact.id=1;
+            contact.displayName="Test Name";
+            contact.nickname="Testy";
+            contact.gender="male";
+            contact.note="note to be cloned";
+            contact.name = new ContactName("Mr. Test Name");
+            
+            var clonedContact = contact.clone();
+            
+            expect(contact.id).toBe(1);
+            expect(clonedContact.id).toBe(null);
+            expect(clonedContact.displayName).toBe(contact.displayName);
+            expect(clonedContact.nickname).toBe(contact.nickname);
+            expect(clonedContact.gender).toBe(contact.gender);
+            expect(clonedContact.note).toBe(contact.note);
+            expect(clonedContact.name.formatted).toBe(contact.name.formatted);
+            expect(clonedContact.connected).toBe(contact.connected);
+        });
         
-        ok(contact.id == 1, "contact.id should be 1.");
-        ok(clonedContact.id == null, "clonedContact.id should be null.");
-        ok(clonedContact.displayName == contact.displayName, "displayName's should be equal");
-        ok(clonedContact.nickname == contact.nickname, "nickname's should be equal");
-        ok(clonedContact.gender == contact.gender, "gender's should be equal");
-        ok(clonedContact.note == contact.note, "note's should be equal");
-        ok(clonedContact.name.formatted == contact.name.formatted, "name.formatted's should be equal");
-        ok(clonedContact.connected == contact.connected, "connected's should be equal (null)");
-    });
-    test("should contain a save function", function() {
-        expect(2);
-        var contact = new Contact();
-        ok(typeof contact.save != 'undefined' && contact.save != null, "contact.save should not be null.");
-        ok(typeof contact.save == 'function', "contact.save should be a function.");
-    });
-    test("should contain a remove function", function() {
-        expect(2);
-        var contact = new Contact();
-        ok(typeof contact.remove != 'undefined' && contact.remove != null, "contact.remove should not be null.");
-        ok(typeof contact.remove == 'function', "contact.remove should be a function.");
-    });
-    module('Contact.save method', {
-        setup:function(){},
-        teardown:function(){}
-    });
-    test("should be able to save a contact", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-
-        var bDay = new Date(1976, 6,4);
-        gContactObj = navigator.contacts.create({"gender": "male", "note": "my note", "name": {"familyName": "Delete", "givenName": "Test"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});	
-
-        var saveSuccess = function(obj) {
-            ok(obj != 'undefined' && obj != null, "navigator.contacts.save should return a Contact object.");
-            ok(obj.note == 'my note', "Contact should contain a note property.");
-            ok(obj.name.familyName == 'Delete', "Contact familyName should equal 'Delete'.");
-            ok(obj.name.givenName == 'Test', "Contact givenName should equal 'Test'.");
-            ok(obj.emails.length == 2, "Contact should contain and array of emails with 2 entries.");
-            ok(obj.emails[0].value == 'here@there.com', "Contact.emails[1] should contain a value.");
-            ok(obj.emails[1].value == 'there@here.com', "Contact.emails[2] should contain a value.");	
-            ok(obj.birthday instanceof Date && obj.birthday.toDateString() == bDay.toDateString(), "Contact should be a date object equal to " + bDay.toDateString());
-            ok(obj.addresses == null, "Contact should return null for addresses.");
-            // must store returned object in order to have id for update test below
-            gContactObj = obj;
-            QUnit.start();
-        };
-
-        gContactObj.save(saveSuccess, function(e) {
-            ok(false, "save method error callback called, test failed.");
-            QUnit.start();
+        it("should contain a save function", function() {
+            var contact = new Contact();
+            expect(contact.save).toBeDefined();
+            expect(typeof contact.save).toBe('function');
+        });
+
+        it("should contain a remove function", function() {
+            var contact = new Contact();
+            expect(contact.remove).toBeDefined();
+            expect(typeof contact.remove).toBe('function');
         });
-     });
-    // HACK: there is a reliance between the previous and next test. This is bad form.
-    test("update a contact", function() {
-        expect(6);
-        QUnit.stop(7000);
-        ok(gContactObj != null, "Contact object from previous test should still exist for this update test to pass.");
-
-        var bDay = new Date(1975, 5,4);
-        var noteText = "an UPDATED note";
-
-        var win = function(obj) {
-            ok(obj != 'undefined' && obj != null, "navigator.contacts.save should return a Contact object.");
-            ok(obj.id == gContactObj.id, "Contact id should not have changed");
-            ok(obj.note == noteText, "Contact should contain a note property.");
-            ok(obj.birthday instanceof Date && obj.birthday.toDateString() == bDay.toDateString(), "Contact should be a date object equal to " + bDay.toDateString());
-            ok(obj.emails.length == 1 && obj.emails[0].value == 'here@there.com', "Contact should contain only one email with value 'here@there.com'");
-            removeContact();         // Clean up contact object 
-            QUnit.start();
-        };
-        var fail = function(obj) {
-            removeContact(); // Clean up contact object
-            ok(false, "updating a Contact object then calling .save should not fail. Test failed.");
-            QUnit.start();
-        }
-
-        // remove an email
-        gContactObj.emails[1].value = "";
-        // change birthday
-        gContactObj.birthday = bDay;
-        // update note
-        gContactObj.note = noteText;
-        gContactObj.save(win, fail);
-    });
-    module('Contact.remove method', {
-        setup:function(){},
-        teardown:removeContact
-    });
-    test("calling remove on a contact has an id of null should return ContactError.UNKNOWN_ERROR", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        var win = function(result) {
-            ok(false, "Success callback should not be called when calling remove on a Contact object with no ID.");
-            QUnit.start();
-        };
-        var fail = function(result) {
-            ok(typeof result == 'object', "Object returned in contact.remove failure callback is of type 'object' (actually ContactError).");
-            ok(result.code == ContactError.UNKNOWN_ERROR, "Object returned in contacts.remove failure callback has a code property which equal to ContactError.UNKNOWN_ERROR.");
-            QUnit.start();
-        };
-        var rmContact = new Contact();
-        rmContact.remove(win, fail);
     });
-    test("calling remove on a contact that does not exist should return ContactError.UNKNOWN_ERROR", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-
-        var win = function(result) {
-        ok(false, "success callback should never return in this case. Test failed!");
-        QUnit.start();
-        };
-        var fail = function(result) {
-        ok(typeof result == 'object', "Object returned in contact.remove failure callback is of type 'object' (actually ContactError).");
-        ok(result.code == ContactError.UNKNOWN_ERROR, "Object returned in contacts.remove failure callback has a code property which equal to ContactError.UNKNOWN_ERROR.");
-        QUnit.start();
-        };
-        // this is a bit risky as some devices may have contact ids that large
-        var contact = new Contact("this string is supposed to be a unique identifier that will never show up on a device");
-        contact.remove(win, fail);		
+
+    describe('save method', function () {
+        it("should be able to save a contact", function() {
+            var bDay = new Date(1976, 6,4);
+            gContactObj = navigator.contacts.create({"gender": "male", "note": "my note", "name": {"familyName": "Delete", "givenName": "Test"}, "emails": [{"value": "here@there.com"}, {"value": "there@here.com"}], "birthday": bDay});	
+
+            var saveSuccess = jasmine.createSpy().andCallFake(function(obj) {
+                    expect(obj).toBeDefined();
+                    expect(obj.note).toBe('my note');
+                    expect(obj.name.familyName).toBe('Delete');
+                    expect(obj.name.givenName).toBe('Test');
+                    expect(obj.emails.length).toBe(2);
+                    expect(obj.emails[0].value).toBe('here@there.com');
+                    expect(obj.emails[1].value).toBe('there@here.com');
+                    expect(obj.birthday.toDateString()).toBe(bDay.toDateString());
+                    expect(obj.addresses).toBe(null);
+                    // must store returned object in order to have id for update test below
+                    gContactObj = obj;
+                }),
+                saveFail = jasmine.createSpy();
+
+            runs(function () {
+                gContactObj.save(saveSuccess, saveFail);
+            });
+
+            waitsFor(function () { return saveSuccess.wasCalled; }, "saveSuccess never called", Tests.TEST_TIMEOUT);
+
+            runs(function () {
+                expect(saveFail).not.toHaveBeenCalled();
+            });
+         });
+        // HACK: there is a reliance between the previous and next test. This is bad form.
+        it("update a contact", function() {
+            expect(gContactObj).toBeDefined();
+
+            var bDay = new Date(1975, 5,4);
+            var noteText = "an UPDATED note";
+
+            var win = function(obj) {
+                    expect(obj).toBeDefined();
+                    expect(obj.id).toBe(gContactObj.id);
+                    expect(obj.note).toBe(noteText);
+                    expect(obj.birthday.toDateString()).toBe(bDay.toDateString());
+                    expect(obj.emails.length).toBe(1);
+                    expect(obj.emails[0].value).toBe('here@there.com');
+                    removeContact();         // Clean up contact object 
+                }, fail = jasmine.createSpy().andCallFake(removeContact);
+
+            runs(function () {
+                // remove an email
+                gContactObj.emails[1].value = "";
+                // change birthday
+                gContactObj.birthday = bDay;
+                // update note
+                gContactObj.note = noteText;
+                gContactObj.save(win, fail);
+            });
+
+            waitsFor(function () { return win.wasCalled; }, "saveSuccess never called", Tests.TEST_TIMEOUT);
+
+            runs(function () {
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
     });
 
-    module("Round trip Contact tests (creating + save + delete + find).", {
-        setup:function(){},
-        teardown:removeContact
+    describe('Contact.remove method', function () {
+        afterEach(removeContact);
+
+        it("calling remove on a contact has an id of null should return ContactError.UNKNOWN_ERROR", function() {
+            var win = jasmine.createSpy();
+            var fail = jasmine.createSpy().andCallFake(function(result) {
+                expect(result.code).toBe(ContactError.UNKNOWN_ERROR);
+            });
+
+            runs(function () {
+                var rmContact = new Contact();
+                rmContact.remove(win, fail);
+            });
+
+            waitsFor(function () { return fail.wasCalled; }, Tests.TEST_TIMEOUT);
+
+            runs(function () {
+                expect(win).not.toHaveBeenCalled();
+            });
+        });
+
+        it("calling remove on a contact that does not exist should return ContactError.UNKNOWN_ERROR", function() {
+            var win = jasmine.createSpy();
+            var fail = jasmine.createSpy().andCallFake(function(result) {
+                expect(result.code).toBe(ContactError.UNKNOWN_ERROR);
+            });
+
+            runs(function () {
+                var rmContact = new Contact();
+                // this is a bit risky as some devices may have contact ids that large
+                var contact = new Contact("this string is supposed to be a unique identifier that will never show up on a device");
+                contact.remove(win, fail);
+            });
+
+            waitsFor(function () { return fail.wasCalled; }, Tests.TEST_TIMEOUT);
+
+            runs(function () {
+                expect(win).not.toHaveBeenCalled();
+            });
+        });
     });
-    test("Creating, saving, finding a contact should work, removing it should work, after which we should not be able to find it, and we should not be able to delete it again.", function() {
-        expect(8);
-        QUnit.stop(7000);
-
-        gContactObj = new Contact();
-        gContactObj.name = new ContactName();
-        gContactObj.name.familyName = "DeleteMe";
-        gContactObj.save(function(c_obj) {
-            ok(true, "Contact creation + saving succeeded, proceeding with test.");
-            var findWin = function(cs) {
-                ok(true, "contacts.find success callback invoked, proceeding with test.");
-                equal(cs.length, 1, "contacts.find success callback should return only 1 item (no one has a contact with 'DeleteMe') as a family name.");
-                //deepEqual(cs[0], gContactObj, "returned Contact object should equal the initially-created Contact object.");
-                // update to have proper saved id
-                gContactObj = cs[0];
-                gContactObj.remove(function() {
-                    ok(true, "Newly created contact's remove function success callback called, proceeding with test.");
-                    var findWinAgain = function(seas) {
-                        ok(true, "Calling find after deleting contact should be a success, proceeding.");
-                        equal(seas.length, 0, "find post-remove should return zero length array of results.");
+
+    describe("Round trip Contact tests (creating + save + delete + find).", function () {
+        afterEach(removeContact);
+
+        it("Creating, saving, finding a contact should work, removing it should work, after which we should not be able to find it, and we should not be able to delete it again.", function() {
+            var done = false;
+            runs(function () {
+                gContactObj = new Contact();
+                gContactObj.name = new ContactName();
+                gContactObj.name.familyName = "DeleteMe";
+                gContactObj.save(function(c_obj) {
+                    var findWin = function(cs) {
+                        expect(cs.length).toBe(1);
+                        // update to have proper saved id
+                        gContactObj = cs[0];
                         gContactObj.remove(function() {
-                            ok(false, "success callback called after non-existent Contact object called remove(). Test failed.");
-                            QUnit.start();
+                            var findWinAgain = function(seas) {
+                                expect(seas.length).toBe(0);
+                                gContactObj.remove(function() {
+                                    throw("success callback called after non-existent Contact object called remove(). Test failed.");
+                                }, function(e) {
+                                    expect(e.code).toBe(ContactError.UNKNOWN_ERROR);
+                                    done = true;
+                                });
+                            };
+                            var findFailAgain = function(e) {
+                                throw("find error callback invoked after delete, test failed.");
+                            };
+                            var obj = new ContactFindOptions();
+                            obj.filter="DeleteMe";
+                            obj.multiple=true;
+                            navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWinAgain, findFailAgain, obj);
                         }, function(e) {
-                            ok(true, "error callback called after non-existent Contact object called with remove().");
-                            equal(e.code, ContactError.UNKNOWN_ERROR, "error callback should be called with UNKNOWN_ERROR");
-                            QUnit.start();
+                            throw("Newly created contact's remove function invoked error callback. Test failed.");
                         });
                     };
-                    var findFailAgain = function(e) {
-                        ok(false, "find error callback invoked after delete, test failed.");
-                        QUnit.start();
+                    var findFail = function(e) {
+                        throw("Failure callback invoked in navigator.contacts.find call, test failed.");
                     };
                     var obj = new ContactFindOptions();
                     obj.filter="DeleteMe";
                     obj.multiple=true;
-                    navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWinAgain, findFailAgain, obj);
+                    navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWin, findFail, obj);
                 }, function(e) {
-                    ok(false, "Newly created contact's remove function invoked error callback. Test failed.");
-                    QUnit.start();
+                    throw("Contact creation failed, error callback was invoked.");
                 });
-            };
-            var findFail = function(e) {
-                ok(false, "Failure callback invoked in navigator.contacts.find call, test failed.");
-                QUnit.start();
-            };
-            var obj = new ContactFindOptions();
-            obj.filter="DeleteMe";
-            obj.multiple=true;
-            navigator.contacts.find(["displayName", "name", "phoneNumbers", "emails"], findWin, findFail, obj);
-        }, function(e) {
-            ok(false, "Contact creation failed, error callback was invoked.");
-            QUnit.start();
+            });
+
+            waitsFor(function () { return done; }, Tests.TEST_TIMEOUT);
         });
     });
 
-    module('ContactError interface');
-    test("ContactError constants should be defined", function() {
-        expect(7);
-        equal(ContactError.UNKNOWN_ERROR, 0, "ContactError.UNKNOWN_ERROR should be defined");
-        equal(ContactError.INVALID_ARGUMENT_ERROR, 1, "ContactError.INVALID_ARGUMENT_ERROR should be defined");
-        equal(ContactError.TIMEOUT_ERROR, 2, "ContactError.TIMEOUT_ERROR should be defined");
-        equal(ContactError.PENDING_OPERATION_ERROR, 3, "ContactError.PENDING_OPERATION_ERROR should be defined");
-        equal(ContactError.IO_ERROR, 4, "ContactError.IO_ERROR should be defined");
-        equal(ContactError.NOT_SUPPORTED_ERROR, 5, "ContactError.NOT_SUPPORTED_ERROR should be defined");
-        equal(ContactError.PERMISSION_DENIED_ERROR, 20, "ContactError.PERMISSION_DENIED_ERROR should be defined");
+    describe('ContactError interface', function () {
+        it("ContactError constants should be defined", function() {
+            expect(ContactError.UNKNOWN_ERROR).toBe(0);
+            expect(ContactError.INVALID_ARGUMENT_ERROR).toBe(1);
+            expect(ContactError.TIMEOUT_ERROR).toBe(2);
+            expect(ContactError.PENDING_OPERATION_ERROR).toBe(3);
+            expect(ContactError.IO_ERROR).toBe(4);
+            expect(ContactError.NOT_SUPPORTED_ERROR).toBe(5);
+            expect(ContactError.PERMISSION_DENIED_ERROR).toBe(20);
+        });
     });
-};
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js
index b61ded9d..cc322d65 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js
@@ -1,37 +1,34 @@
-Tests.prototype.DeviceTests = function () {
-    module('Device Information (window.device)');
-    test("should exist", function () {
-        console.log("running test 1");
-        expect(1);
-        ok(window.device != null, "window.device should not be null.");
-    });
-    test("should contain a platform specification that is a string", function () {
-        expect(2);
-        ok(typeof window.device.platform != 'undefined' && window.device.platform != null, "window.device.platform should not be null.")
-        ok((new String(window.device.platform)).length > 0, "window.device.platform should contain some sort of description.")
-    });
-    test("should contain a version specification that is a string", function () {
-        expect(2);
-        ok(typeof window.device.version != 'undefined' && window.device.version != null, "window.device.version should not be null.")
-        ok((new String(window.device.version)).length > 0, "window.device.version should contain some kind of description.")
-    });
-    test("should contain a name specification that is a string", function () {
-        expect(2);
-        ok(typeof window.device.name != 'undefined' && window.device.name != null, "window.device.name should not be null.")
-        ok((new String(window.device.name)).length > 0, "window.device.name should contain some kind of description.")
-    });
-    test("should contain a UUID specification that is a string or a number", function () {
-        expect(2);
-        ok(typeof window.device.uuid != 'undefined' && window.device.uuid != null, "window.device.uuid should not be null.")
-        if (typeof window.device.uuid == 'string' || typeof window.device.uuid == 'object') {
-            ok((new String(window.device.uuid)).length > 0, "window.device.uuid, as a string, should have at least one character.")
-        } else {
-            ok(window.device.uuid > 0, "window.device.uuid, as a number, should be greater than 0. (should it, even?)")
-        }
-    });
-    test("should contain a cordova specification that is a string", function () {
-        expect(2);
-        ok(typeof window.device.cordova != 'undefined' && window.device.cordova != null, "window.device.cordova should not be null.")
-        ok((new String(window.device.cordova)).length > 0, "window.device.cordova should contain some kind of description.")
-    });
-};
+describe('Device Information (window.device)', function () {
+	it("should exist", function() {
+        expect(window.device).toBeDefined();
+	});
+
+	it("should contain a platform specification that is a string", function() {
+        expect(window.device.platform).toBeDefined();
+		expect((new String(window.device.platform)).length > 0).toBe(true);
+	});
+
+	it("should contain a version specification that is a string", function() {
+        expect(window.device.version).toBeDefined();
+		expect((new String(window.device.version)).length > 0).toBe(true);
+	});
+
+	it("should contain a name specification that is a string", function() {
+        expect(window.device.name).toBeDefined();
+		expect((new String(window.device.name)).length > 0).toBe(true);
+	});
+
+	it("should contain a UUID specification that is a string or a number", function() {
+        expect(window.device.uuid).toBeDefined();
+		if (typeof window.device.uuid == 'string' || typeof window.device.uuid == 'object') {
+		    expect((new String(window.device.uuid)).length > 0).toBe(true);
+		} else {
+			expect(window.device.uuid > 0).toBe(true);
+		}
+	});
+
+	it("should contain a cordova specification that is a string", function() {
+        expect(window.device.cordova).toBeDefined();
+		expect((new String(window.device.cordova)).length > 0).toBe(true);
+	});
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/file.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/file.tests.js
index 2370fa5d..e46e51cb 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/file.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/file.tests.js
@@ -1,2833 +1,3427 @@
-/**
- * Retrieves root file system entries once, so they don't have to be 
- * repeated for every test (file system shouldn't change during test run). 
- */ 
-var getFileSystemRoot = (function() {
-
-    // private
-    var temp_root, persistent_root;
-
-    var onError = function(error) {
-        console.log('unable to retrieve file system: ' + error.code);
+// Used by tests, set in file.html
+var root, temp_root, persistent_root;
+
+describe('File API', function() {
+    // HELPER FUNCTIONS
+
+    // deletes specified file or directory
+    var deleteEntry = function(name, success, error) {
+        // deletes entry, if it exists
+        window.resolveLocalFileSystemURI(root.toURL() + '/' + name, 
+            function(entry) {
+                if (entry.isDirectory === true) {
+                    entry.removeRecursively(success, error); 
+                } else {
+                    entry.remove(success, error);
+                }
+            }, success);
     };
-    
-    // one-time retrieval of the root file system entry
-    var init = function() {
-        window.requestFileSystem(LocalFileSystem.PERSISTENT, 0,
-                function(fileSystem) {
-                    persistent_root = fileSystem.root;
-                }, onError);
-        window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
-                function(fileSystem) {
-                    temp_root = fileSystem.root;
-                }, onError);
+    // deletes file, if it exists, then invokes callback
+    var deleteFile = function(fileName, callback) {
+        root.getFile(fileName, null, 
+                // remove file system entry
+                function(entry) {
+                    entry.remove(callback, function() { console.log('[ERROR] deleteFile cleanup method invoked fail callback.'); });
+                },
+                // doesn't exist
+                callback);
     };
-    document.addEventListener("deviceready", init, true);
-
-    // public function returns private root entry
-    return function() {
-        // When testing, it is a good idea to run the test suite once for each
-        // file system type.  Just change the return value from this function.  
-        //return temp_root;
-        return persistent_root;
+    // deletes and re-creates the specified file
+    var createFile = function(fileName, success, error) {
+        deleteEntry(fileName, function() {
+            root.getFile(fileName, {create: true}, success, error);
+        }, error);
+    };
+    // deletes and re-creates the specified directory
+    var createDirectory = function(dirName, success, error) {
+        deleteEntry(dirName, function() {
+           root.getDirectory(dirName, {create: true}, success, error); 
+        }, error);
     };
-}()); // execute immediately
-
-Tests.prototype.FileTests = function() {
-    module('FileError interface');
-    test("FileError constants should be defined", function() {
-        expect(12);
-        equal(FileError.NOT_FOUND_ERR, 1, "FileError.NOT_FOUND_ERR should be defined");
-        equal(FileError.SECURITY_ERR, 2, "FileError.SECURITY_ERR should be defined");
-        equal(FileError.ABORT_ERR, 3, "FileError.ABORT should be defined");
-        equal(FileError.NOT_READABLE_ERR, 4, "FileError.NOT_READABLE_ERR should be defined");
-        equal(FileError.ENCODING_ERR, 5, "FileError.ENCODING_ERR should be defined");
-        equal(FileError.NO_MODIFICATION_ALLOWED_ERR, 6, "FileError.NO_MODIFICATION_ALLOWED_ERR should be defined");
-        equal(FileError.INVALID_STATE_ERR, 7, "FileError.INVALID_STATE_ERR should be defined");
-        equal(FileError.SYNTAX_ERR, 8, "FileError.SYNTAX_ERR should be defined");
-        equal(FileError.INVALID_MODIFICATION_ERR, 9, "FileError.INVALID_MODIFICATION_ERR should be defined");
-        equal(FileError.QUOTA_EXCEEDED_ERR, 10, "FileError.QUOTA_EXCEEDED_ERR should be defined");
-        equal(FileError.TYPE_MISMATCH_ERR, 11, "FileError.TYPE_MISMATCH_ERR should be defined");
-        equal(FileError.PATH_EXISTS_ERR, 12, "FileError.PATH_EXISTS_ERR should be defined");
-    });
 
-    module('LocalFileSystem interface', {
-        // setup function will run before each test
-        setup: function() {
-            var that = this;
-            this.root = getFileSystemRoot();
-            this.fail = function(error) {
-                console.log('file error: ' + error.code);
-            };
-            this.unexpectedSuccess = function() {
-                console.log('!!! success function called when not expected !!!');
-            };
-            // deletes specified file or directory
-            this.deleteEntry = function(name, success, error) {
-                // deletes entry, if it exists
-                window.resolveLocalFileSystemURI(that.root.toURL() + '/' + name, 
-                        function(entry) {
-                            console.log('Deleting: ' + entry.fullPath);
-                            if (entry.isDirectory === true) {
-                                entry.removeRecursively(success, error); 
-                            }
-                            else {
-                                entry.remove(success, error);
-                            }
-                        }, 
-                        // doesn't exist
-                        success);
-            };
-            // deletes and re-creates the specified file
-            this.createFile = function(fileName, success, error) {
-                that.deleteEntry(fileName, function() {
-                    console.log('Creating file: ' + that.root.fullPath + '/' + fileName);
-                    that.root.getFile(fileName, {create: true}, success, error);                
-                }, error);
-            };
-            // deletes and re-creates the specified directory
-            this.createDirectory = function(dirName, success, error) {
-                that.deleteEntry(dirName, function() {
-                   console.log('Creating directory: ' + that.root.fullPath + '/' + dirName);
-                   that.root.getDirectory(dirName, {create: true}, success, error); 
-                }, error);
-            };
-        }
-    });
-    test("window.requestFileSystem function should be defined", function() {
-        expect(1);
-        ok(typeof window.requestFileSystem === 'function', "window.requestFileSystem should be a function.");
-    });
-    test("window.resolveLocalFileSystemURI function should be defined", function() {
-        expect(1);
-        ok(typeof window.resolveLocalFileSystemURI === 'function', "window.resolveLocalFileSystemURI should be a function.");
-    });
-    test("File system types should be defined", function() {
-        expect(2);
-        equal(LocalFileSystem.TEMPORARY, 0, "LocalFileSystem.TEMPORARY should be defined");
-        equal(LocalFileSystem.PERSISTENT, 1, "LocalFileSystem.PERSISTENT should be defined");
-    });
-    test("retrieve PERSISTENT file system", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-
-        var testPersistent = function(fileSystem) {
-            ok(typeof fileSystem !== 'undefined' && fileSystem !== null, "window.requestFileSystem should return an object.");
-            ok(typeof fileSystem.name !== 'undefined' && fileSystem.name !== null, "filesystem should include a 'name' property.");
-            equal(fileSystem.name, "persistent", "file system 'name' attribute should be set properly");
-            ok(typeof fileSystem.root !== 'undefined' && fileSystem.root !== null, "filesystem should include a 'root' property.");
-            QUnit.start();
-        };
-        
-        // retrieve PERSISTENT file system
-        window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, testPersistent, 
-                function(error) {
-                    console.log('error retrieving file system: ' + error.code);
-                });            
-    });
-    test("retrieve TEMPORARY file system", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-
-        var testTemporary = function(fileSystem) {
-            ok(typeof fileSystem !== 'undefined' && fileSystem !== null, "window.requestFileSystem should return an object.");
-            ok(typeof fileSystem.name !== 'undefined' && fileSystem.name !== null, "filesystem should include a 'name' property.");
-            equal(fileSystem.name, "temporary", "file system 'name' attribute should be set properly");
-            ok(typeof fileSystem.root !== 'undefined' && fileSystem.root !== null, "filesystem should include a 'root' property.");
-            QUnit.start();
-        };
-        
-        // Request the file system
-        window.requestFileSystem(LocalFileSystem.TEMPORARY, 0, testTemporary, 
-                function(error) {
-                    console.log('error retrieving file system: ' + error.code);
-                });            
-    });
-    test("request a file system that is too large", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-
-        var failFS = function(error) {
-            ok(error !== null, "error should not be null.");
-            equal(error.code, FileError.QUOTA_EXCEEDED_ERR, "Shoud receive error code FileError.QUOTA_EXCEEDED_ERR");
-            QUnit.start();
-        };
-        
-        // Request the file system
-        window.requestFileSystem(LocalFileSystem.TEMPORARY, 1000000000000000, null, failFS);
-    });
-    test("request a file system that does not exist", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-
-        var failFS = function(error) {
-            ok(typeof error !== 'undefined' && error !== null, "error should not be null.");
-            equal(error.code, FileError.SYNTAX_ERR, "Shoud receive error code FileError.SYNTAX_ERR");
-            QUnit.start();
-        };
-        
-        // Request the file system
-        window.requestFileSystem(-1, 0, null, failFS);
-    });
-    test("resolve valid file name", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "resolve.file.uri",
-            that = this,
-            resolveCallback = function(entry) {
-                // lookup file system entry
-                window.resolveLocalFileSystemURI(entry.toURI(), testEntry, this.fail);
-            },
-            testEntry = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "fileEntry should not be null.");
-                ok(fileEntry.name == fileName, "fileEntry.name should equal 'resolve.file.uri'");
-
-                // cleanup
-                that.deleteEntry(fileName);
-                QUnit.start();
-            };
-        
-        // create a new file entry
-        this.createFile(fileName, resolveCallback, this.fail);
-    });
-    test("resolve valid file name with parameters", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "resolve.file.uri.params",
-            that = this,
-            resolveCallback = function(entry) {
-                // lookup file system entry
-                window.resolveLocalFileSystemURI(entry.toURI() + "?1234567890", testEntry, this.fail);
-            },
-            testEntry = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "fileEntry should not be null.");
-                ok(fileEntry.name == fileName, "fileEntry.name should equal 'resolve.file.uri.params'");
-
-                // cleanup
-                that.deleteEntry(fileName);
-                QUnit.start();
-            };
-        
-        // create a new file entry
-        this.createFile(fileName, resolveCallback, this.fail);
-    });
-    test("resolve invalid file name", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-
-        var failURL = function(error) {
-            ok(typeof error !== 'undefined' && error !== null, "error should not be null.");
-            equal(error.code, FileError.NOT_FOUND_ERR, "Shoud receive error code FileError.NOT_FOUND_ERR");
-            QUnit.start();
-        };
-        
-        // lookup file system entry
-        window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt", null, failURL);
-    });
-    test("resolve invalid URL", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-
-        var failURL = function(error) {
-            ok(typeof error !== 'undefined' && error !== null, "error should not be null.");
-            equal(error.code, FileError.ENCODING_ERR, "Shoud receive an error code FileError.ENCODING_ERR");
-            QUnit.start();
-        };
-        
-        // lookup file system entry
-        window.resolveLocalFileSystemURI("/this.is.not.a.valid.url", null, failURL);
-    });
+    var createFail = function(module) {
+        return jasmine.createSpy().andCallFake(function(err) {
+            console.log('[ERROR ' + module + '] ' + JSON.stringify(err));
+        });
+    };
 
-    module('Metadata interface');
-    test("Metadata constructor should exist", function() {
-        expect(2);
-        var metadata = new Metadata();
-        ok(metadata !== null, "Metadata object should not be null.");
-        ok(typeof metadata.modificationTime !== 'undefined', "Metadata object should have a 'modificationTime' property.");
-    });
-    module('Flags interface');
-    test("Flags constructor should exist", function() {
-        expect(5);
-        var flags = new Flags(false, true);
-        ok(flags !== null, "Flags object should not be null.");
-        ok(typeof flags.create !== 'undefined' && flags.create !== null, "Flags object should have a 'create' property.");
-        equal(flags.create, false, "Flags.create should be set properly");
-        ok(typeof flags.exclusive !== 'undefined' && flags.exclusive !== null, "Flags object should have an 'exclusive' property.");
-        equal(flags.exclusive, true, "flags.exclusive should be set properly");
-    });
-    module('FileSystem interface');
-    test("FileSystem root should be a DirectoryEntry", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(15);
-
-        var root = getFileSystemRoot(),
-            testFSRoot = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "entry should be non-null");
-                equal(entry.isFile, false, "entry.isFile should be false");
-                equal(entry.isDirectory, true, "entry.isDirectory should be true");
-                ok(typeof entry.name !== 'undefined' && entry.name !== null, "entry should include a 'name' property.");
-                ok(typeof entry.fullPath !== 'undefined' && entry.fullPath !== null, "entry should include a 'fullPath' property.");
-                ok(typeof entry.getMetadata === 'function', "entry object should have a 'getMetadata' function.");
-                ok(typeof entry.moveTo === 'function', "entry object should have a 'moveTo' function.");
-                ok(typeof entry.copyTo === 'function', "entry object should have a 'copyTo' function.");
-                ok(typeof entry.toURL === 'function', "entry object should have a 'toURL' function.");
-                ok(typeof entry.remove === 'function', "entry object should have a 'remove' function.");
-                ok(typeof entry.getParent === 'function', "entry object should have a 'getParent' function.");
-                ok(typeof entry.createReader === 'function', "entry object should have a 'createReader' function.");
-                ok(typeof entry.getFile === 'function', "entry object should have a 'getFile' function.");
-                ok(typeof entry.getDirectory === 'function', "entry object should have a 'getDirectory' function.");
-                ok(typeof entry.removeRecursively === 'function', "entry object should have a 'removeRecursively' function.");
-                QUnit.start();
-        };
-    
-        window.resolveLocalFileSystemURI(root.toURL(), testFSRoot, null);
+    var createWin = function(module) {
+        return jasmine.createSpy().andCallFake(function() {
+            console.log('[ERROR ' + module + '] Unexpected success callback');
+        });
+    };
 
-    });
-    module('DirectoryEntry interface', {
-        // setup function will run before each test
-        setup: function() {
-            this.root = getFileSystemRoot();
-            this.fail = function(error) {
-                console.log('file error: ' + error.code);
-            };
-            this.unexpectedSuccess = function() {
-                console.log('!!! success function called when not expected !!!');
-            };
-        }
-    });
-    test("DirectoryEntry.getFile: get Entry for file that does not exist", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "de.no.file",
-            filePath = this.root.fullPath + '/' + fileName,
-            that = this,
-            testFile = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "retrieving a file that does not exist is an error");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                
-                // cleanup
-                QUnit.start();
-            };
-                
-        // create:false, exclusive:false, file does not exist
-        this.root.getFile(fileName, {create:false}, null, testFile); 
-    });
-    test("DirectoryEntry.getFile: create new file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var fileName = "de.create.file",
-            filePath = this.root.fullPath + '/' + fileName,
-            that = this,
-            testFile = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "file entry should not be null");
-                equal(entry.isFile, true, "entry 'isFile' attribute should be true");
-                equal(entry.isDirectory, false, "entry 'isDirectory' attribute should be false");
-                equal(entry.name, fileName, "entry 'name' attribute should be set");
-                equal(entry.fullPath, filePath, "entry 'fullPath' attribute should be set");
-                
-                // cleanup
-                entry.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create:true, exclusive:false, file does not exist
-        this.root.getFile(fileName, {create: true}, testFile, this.fail); 
-    });
-    test("DirectoryEntry.getFile: create new file (exclusive)", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var fileName = "de.create.exclusive.file",
-            filePath = this.root.fullPath + '/' + fileName,
-            that = this,
-            testFile = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "file entry should not be null");
-                equal(entry.isFile, true, "entry 'isFile' attribute should be true");
-                equal(entry.isDirectory, false, "entry 'isDirectory' attribute should be false");
-                equal(entry.name, fileName, "entry 'name' attribute should be set");
-                equal(entry.fullPath, filePath, "entry 'fullPath' attribute should be set");
-                
-                // cleanup
-                entry.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create:true, exclusive:true, file does not exist
-        this.root.getFile(fileName, {create: true, exclusive:true}, testFile, this.fail); 
-    });
-    test("DirectoryEntry.getFile: create file that already exists", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var fileName = "de.create.existing.file",
-            filePath = this.root.fullPath + '/' + fileName,
-            that = this,
-            getFile = function(file) {
-                // create:true, exclusive:false, file exists
-                that.root.getFile(fileName, {create:true}, testFile, that.fail);             
-            },
-            testFile = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "file entry should not be null");
-                equal(entry.isFile, true, "entry 'isFile' attribute should be true");
-                equal(entry.isDirectory, false, "entry 'isDirectory' attribute should be false");
-                equal(entry.name, fileName, "entry 'name' attribute should be set");
-                equal(entry.fullPath, filePath, "entry 'fullPath' attribute should be set");
-                
-                // cleanup
-                entry.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create file to kick off test
-        this.root.getFile(fileName, {create:true}, getFile, this.fail); 
-    });
-    test("DirectoryEntry.getFile: create file that already exists (exclusive)", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "de.create.exclusive.existing.file",
-            filePath = this.root.fullPath + '/' + fileName,
-            that = this,
-            existingFile,
-            getFile = function(file) {
-                existingFile = file;
-                // create:true, exclusive:true, file exists
-                that.root.getFile(fileName, {create:true, exclusive:true}, null, testFile);             
-            },
-            testFile = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "creating exclusive file that already exists is an error");
-                equal(error.code, FileError.PATH_EXISTS_ERR, "error code should be FileError.PATH_EXISTS_ERR");
-               
-                // cleanup
-                existingFile.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create file to kick off test
-        this.root.getFile(fileName, {create:true}, getFile, this.fail); 
-    });
-    test("DirectoryEntry.getFile: get Entry for existing file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var fileName = "de.get.file",
-            filePath = this.root.fullPath + '/' + fileName,
-            that = this,
-            getFile = function(file) {
-                // create:false, exclusive:false, file exists
-                that.root.getFile(fileName, {create:false}, testFile, that.fail);             
-            },
-            testFile = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "file entry should not be null");
-                equal(entry.isFile, true, "entry 'isFile' attribute should be true");
-                equal(entry.isDirectory, false, "entry 'isDirectory' attribute should be false");
-                equal(entry.name, fileName, "entry 'name' attribute should be set");
-                equal(entry.fullPath, filePath, "entry 'fullPath' attribute should be set");
-                
-                // cleanup
-                entry.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create file to kick off test
-        this.root.getFile(fileName, {create:true}, getFile, this.fail); 
-    });
-    test("DirectoryEntry.getFile: get FileEntry for invalid path", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "de:invalid:path",
-            that = this,
-            testFile = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "retrieving a file using an invalid path is an error");
-                equal(error.code, FileError.ENCODING_ERR, "error code should be FileError.ENCODING_ERR");
-                
-                // cleanup
-                QUnit.start();
-            };
-                
-        // create:false, exclusive:false, invalid path
-        this.root.getFile(fileName, {create:false}, null, testFile); 
-    });
-    test("DirectoryEntry.getDirectory: get Entry for directory that does not exist", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var dirName = "de.no.dir",
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            testDir = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "retrieving a directory that does not exist is an error");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                
-                // cleanup
-                QUnit.start();
-            };
+    describe('FileError object', function() {
+        it("should define FileError constants", function() {
+            expect(FileError.NOT_FOUND_ERR).toBe(1);
+            expect(FileError.SECURITY_ERR).toBe(2);
+            expect(FileError.ABORT_ERR).toBe(3);
+            expect(FileError.NOT_READABLE_ERR).toBe(4);
+            expect(FileError.ENCODING_ERR).toBe(5);
+            expect(FileError.NO_MODIFICATION_ALLOWED_ERR).toBe(6);
+            expect(FileError.INVALID_STATE_ERR).toBe(7);
+            expect(FileError.SYNTAX_ERR).toBe(8);
+            expect(FileError.INVALID_MODIFICATION_ERR).toBe(9);
+            expect(FileError.QUOTA_EXCEEDED_ERR).toBe(10);
+            expect(FileError.TYPE_MISMATCH_ERR).toBe(11);
+            expect(FileError.PATH_EXISTS_ERR).toBe(12);
+        });
+    });
+
+    describe('LocalFileSystem', function() {
+
+        it("should define LocalFileSystem constants", function() {
+            expect(LocalFileSystem.TEMPORARY).toBe(0);
+            expect(LocalFileSystem.PERSISTENT).toBe(1);
+        });
+
+        describe('window.requestFileSystem', function() {
+            it("should be defined", function() {
+                expect(window.requestFileSystem).toBeDefined();
+            });
+            it("should be able to retrieve a PERSISTENT file system", function() {
+                var win = jasmine.createSpy().andCallFake(function(fileSystem) {
+                    expect(fileSystem).toBeDefined();
+                    expect(fileSystem.name).toBeDefined();
+                    expect(fileSystem.name).toBe("persistent");
+                    expect(fileSystem.root).toBeDefined();
+                }),
+                fail = createFail('window.requestFileSystem');
+          
+                // retrieve PERSISTENT file system
+                runs(function() {
+                    window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, win, fail);
+                });
+
+                waitsFor(function() { return win.wasCalled; }, "success callback never called", Tests.TEST_TIMEOUT);
+
+                runs(function() {
+                    expect(fail).not.toHaveBeenCalled();
+                    expect(win).toHaveBeenCalled();
+                });
+            });
+            it("should be able to retrieve a TEMPORARY file system", function() {
+                var win = jasmine.createSpy().andCallFake(function(fileSystem) {
+                    expect(fileSystem).toBeDefined();
+                    expect(fileSystem.name).toBeDefined();
+                    expect(fileSystem.name).toBe("temporary");
+                    expect(fileSystem.root).toBeDefined();
+                }),
+                fail = createFail('window.requestFileSystem');
+
+                // Request the file system
+                runs(function() { 
+                    window.requestFileSystem(LocalFileSystem.TEMPORARY, 0, win, fail);
+                });
+
+                waitsFor(function() { return win.wasCalled; }, "success callback never called", Tests.TEST_TIMEOUT);
+
+                runs(function() {
+                    expect(fail).not.toHaveBeenCalled();
+                    expect(win).toHaveBeenCalled();
+                });
+            });
+            it("should error if you request a file system that is too large", function() {
+                var fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.QUOTA_EXCEEDED_ERR);
+                }),
+                win = createWin('window.requestFileSystem');
+
+                // Request the file system
+                runs(function() {
+                    window.requestFileSystem(LocalFileSystem.TEMPORARY, 1000000000000000, win, fail);
+                });
+
+                waitsFor(function() { return fail.wasCalled; }, "error callback never called", Tests.TEST_TIMEOUT);
+
+                runs(function() {
+                    expect(win).not.toHaveBeenCalled();
+                    expect(fail).toHaveBeenCalled();
+                });
+            });
+            it("should error out if you request a file system that does not exist", function() {
+                var fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.SYNTAX_ERR);
+                }),
+                win = createWin('window.requestFileSystem');
+
+                // Request the file system
+                runs(function() {
+                    window.requestFileSystem(-1, 0, win, fail);
+                });
+
+                waitsFor(function() { return fail.wasCalled; }, "error callback never called", Tests.TEST_TIMEOUT);
+
+                runs(function() {
+                    expect(win).not.toHaveBeenCalled();
+                    expect(fail).toHaveBeenCalled();
+                });
+            });
+        });
+
+        describe('window.resolveLocalFileSystemURI', function() {
+            it("should be defined", function() {
+                expect(window.resolveLocalFileSystemURI).toBeDefined();
+            });
+            it("should resolve a valid file name", function() {
+                var fileName = "resolve.file.uri",
+                win = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.name).toBe(fileName);
+
+                    // cleanup
+                    deleteEntry(fileName);
+                }),
+                fail = createFail('window.resolveLocalFileSystemURI');
+                resolveCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // lookup file system entry
+                    runs(function() {
+                        window.resolveLocalFileSystemURI(entry.toURL(), win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
+                    
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                });
+
+                // create a new file entry
+                runs(function() {
+                    createFile(fileName, resolveCallback, fail);
+                });
+
+                waitsFor(function() { return resolveCallback.wasCalled; }, "createFile callback never called", Tests.TEST_TIMEOUT);
+            });
+            it("resolve valid file name with parameters", function() {
+                var fileName = "resolve.file.uri.params",
+                win = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.name).toBe(fileName);
+
+                    // cleanup
+                    deleteEntry(fileName);
+                }),
+                fail = createFail('window.resolveLocalFileSystemURI');
+                resolveCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // lookup file system entry
+                    runs(function() {
+                        window.resolveLocalFileSystemURI(entry.toURL() + "?1234567890", win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
+                    
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                });
+        
+                // create a new file entry
+                runs(function() {
+                    createFile(fileName, resolveCallback, fail);
+                });
+
+                waitsFor(function() { return resolveCallback.wasCalled; }, "createFile callback never called", Tests.TEST_TIMEOUT);
+            });
+            it("should error out when resolving invalid file name", function() {
+                var fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                }),
+                win = createWin('window.resolveLocalFileSystemURI');
                 
-        // create:false, exclusive:false, directory does not exist
-        this.root.getDirectory(dirName, {create:false}, null, testDir); 
-    });
-    test("DirectoryEntry.getDirectory: create new dir with space then resolveFileSystemURL", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var dirName = "de create dir",
-        dirPath = this.root.fullPath + '/' + dirName,
-        that = this,
-        getDir = function(dirEntry) {
+                // lookup file system entry
+                runs(function() {
+                    window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt", win, fail);
+                });
+
+                waitsFor(function() { return fail.wasCalled; }, "error callback never called", Tests.TEST_TIMEOUT);
+
+                runs(function() {
+                    expect(fail).toHaveBeenCalled();
+                    expect(win).not.toHaveBeenCalled();
+                });
+            });
+            it("resolve invalid URL", function() {
+                var fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.ENCODING_ERR);
+                }),
+                win = createWin('window.resolveLocalFileSystemURI');
+
+                // lookup file system entry
+                runs(function() {
+                    window.resolveLocalFileSystemURI("/this.is.not.a.valid.url", win, fail);
+                });
+
+                waitsFor(function() { return fail.wasCalled; }, "error callback never called", Tests.TEST_TIMEOUT);
+
+                runs(function() {
+                    expect(fail).toHaveBeenCalled();
+                    expect(win).not.toHaveBeenCalled();
+                });
+            });
+        });
+    });
+
+    describe('Metadata interface', function() {
+        it("should exist and have the right properties", function() {
+            var metadata = new Metadata();
+            expect(metadata).toBeDefined();
+            expect(metadata.modificationTime).toBeDefined();
+        });
+    });
+
+    describe('Flags interface', function() {
+        it("should exist and have the right properties", function() {
+            var flags = new Flags(false, true);
+            expect(flags).toBeDefined();
+            expect(flags.create).toBeDefined();
+            expect(flags.create).toBe(false);
+            expect(flags.exclusive).toBeDefined();
+            expect(flags.exclusive).toBe(true);
+        });
+    });
+
+    describe('FileSystem interface', function() {
+        it("should have a root that is a DirectoryEntry", function() {
+            var win = jasmine.createSpy().andCallFake(function(entry) {
+                expect(entry).toBeDefined();
+                expect(entry.isFile).toBe(false);
+                expect(entry.isDirectory).toBe(true);
+                expect(entry.name).toBeDefined();
+                expect(entry.fullPath).toBeDefined();
+                expect(entry.getMetadata).toBeDefined();
+                expect(entry.moveTo).toBeDefined();
+                expect(entry.copyTo).toBeDefined();
+                expect(entry.toURL).toBeDefined();
+                expect(entry.remove).toBeDefined();
+                expect(entry.getParent).toBeDefined();
+                expect(entry.createReader).toBeDefined();
+                expect(entry.getFile).toBeDefined();
+                expect(entry.getDirectory).toBeDefined();
+                expect(entry.removeRecursively).toBeDefined();
+            }),
+            fail = createFail('FileSystem');
+ 
+            runs(function() {
+                window.resolveLocalFileSystemURI(root.toURL(), win, fail);
+            });
+
+            waitsFor(function() { return win.wasCalled; }, "success callback never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).not.toHaveBeenCalled();
+                expect(win).toHaveBeenCalled();
+            });
+        });
+    });
+
+    describe('DirectoryEntry', function() {
+        it("getFile: get Entry for file that does not exist", function() {
+            var fileName = "de.no.file",
+                filePath = root.fullPath + '/' + fileName,
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                }),
+                win = createWin('DirectoryEntry');
+
+            // create:false, exclusive:false, file does not exist
+            runs(function() {
+                root.getFile(fileName, {create:false}, win, fail); 
+            });
+
+            waitsFor(function() { return fail.wasCalled; }, "error callback never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+            });
+        });
+        it("etFile: create new file", function() {
+            var fileName = "de.create.file",
+                filePath = root.fullPath + '/' + fileName,
+                win = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.name).toBe(fileName);
+                    expect(entry.fullPath).toBe(filePath);
+                    // cleanup
+                    entry.remove(null, null);
+                }),
+                fail = createFail('DirectoryEntry');
+                    
+            // create:true, exclusive:false, file does not exist
+            runs(function() {
+                root.getFile(fileName, {create: true}, win, fail); 
+            });
+
+            waitsFor(function() { return win.wasCalled; }, "success callback never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(win).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("getFile: create new file (exclusive)", function() {
+            var fileName = "de.create.exclusive.file",
+                filePath = root.fullPath + '/' + fileName,
+                win = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.name).toBe(fileName);
+                    expect(entry.fullPath).toBe(filePath);
+                    
+                    // cleanup
+                    entry.remove(null, null);
+                }),
+                fail = createFail('DirectoryEntry');
+
+            // create:true, exclusive:true, file does not exist
+            runs(function() {
+                root.getFile(fileName, {create: true, exclusive:true}, win, fail);
+            });
+
+            waitsFor(function() { return win.wasCalled; }, "success callback never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(win).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("getFile: create file that already exists", function() {
+            var fileName = "de.create.existing.file",
+                filePath = root.fullPath + '/' + fileName,
+                getFile = jasmine.createSpy().andCallFake(function(file) {
+                    // create:true, exclusive:false, file exists
+                    runs(function() {
+                        root.getFile(fileName, {create:true}, win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "win was never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = createFail('DirectoryEntry'),
+                win = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.name).toBe(fileName);
+                    expect(entry.fullPath).toBe(filePath);
+                    
+                    // cleanup
+                    entry.remove(null, fail);
+                });
+            // create file to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, getFile, fail);
+            });
+
+            waitsFor(function() { return getFile.wasCalled; }, "getFile was never called", Tests.TEST_TIMEOUT);
+        });
+        it("getFile: create file that already exists (exclusive)", function() {
+            var fileName = "de.create.exclusive.existing.file",
+                filePath = root.fullPath + '/' + fileName,
+                existingFile,
+                getFile = jasmine.createSpy().andCallFake(function(file) {
+                    existingFile = file;
+                    // create:true, exclusive:true, file exists
+                    runs(function() {
+                        root.getFile(fileName, {create:true, exclusive:true}, win, fail);
+                    });
+
+                    waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(fail).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.PATH_EXISTS_ERR);
+                   
+                    // cleanup
+                    existingFile.remove(null, fail);
+                }),
+                win = createWin('DirectoryEntry');
+                    
+            // create file to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, getFile, fail);
+            });
+
+            waitsFor(function() { return getFile.wasCalled; }, "getFile never called", Tests.TEST_TIMEOUT);
+        });
+        it("getFile: get Entry for existing file", function() {
+            var fileName = "de.get.file",
+                filePath = root.fullPath + '/' + fileName,
+                win = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.name).toBe(fileName);
+                    expect(entry.fullPath).toBe(filePath);
             
-            var dirURL = dirEntry.toURL();
-            // now encode URL and try to resolve
-            window.resolveLocalFileSystemURI(dirURL, testDirFromURL, that.fail);
+                    entry.remove(null, fail); //clean up
+                }),
+                fail = createFail('DirectoryEntry'),
+                getFile = jasmine.createSpy().andCallFake(function(file) {
+                    // create:false, exclusive:false, file exists
+                    runs(function() {
+                        root.getFile(fileName, {create:false}, win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "getFile success callback", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                });
             
-        },
-        testDirFromURL = function(directory) {
-            ok(typeof directory !== 'undefined' && directory !== null, "directory entry should not be null");
-            equal(directory.isFile, false, "directory 'isFile' attribute should be false");
-            equal(directory.isDirectory, true, "directory 'isDirectory' attribute should be true");
-            equal(directory.name, dirName, "directory 'name' attribute should be set");
-            equal(directory.fullPath, dirPath, "directory 'fullPath' attribute should be set");
+            // create file to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, getFile, fail);
+            });
+
+            waitsFor(function() { return getFile.wasCalled; }, "file creation", Tests.TEST_TIMEOUT);
+        });
+        it("DirectoryEntry.getFile: get FileEntry for invalid path", function() {
+            var fileName = "de:invalid:path",
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.ENCODING_ERR);
+                }),
+                win = createWin('DirectoryEntry');
             
-            // cleanup
-            directory.remove(null, that.fail);
-            QUnit.start();
-        };
-        
-        // create:true, exclusive:false, directory does not exist
-        this.root.getDirectory(dirName, {create: true}, getDir, this.fail); 
-    });
-    test("DirectoryEntry.getDirectory: create new dir with space resolveFileSystemURL with encoded URL", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var dirName = "de create dir",
-        dirPath = this.root.fullPath + '/' + dirName,
-        that = this,
-        getDir = function(dirEntry) {
+            // create:false, exclusive:false, invalid path
+            runs(function() {
+                root.getFile(fileName, {create:false}, win, fail);
+            });
+
+            waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+            });
+
+        });
+        it("DirectoryEntry.getDirectory: get Entry for directory that does not exist", function() {
+            var dirName = "de.no.dir",
+                dirPath = root.fullPath + '/' + dirName,
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                }),
+                win = createWin('DirectoryEntry');
+                    
+            // create:false, exclusive:false, directory does not exist
+            runs(function() {
+                root.getDirectory(dirName, {create:false}, win, fail);
+            });
+
+            waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+            });
+        });
+        it("DirectoryEntry.getDirectory: create new dir with space then resolveFileSystemURL", function() {
+            var dirName = "de create dir",
+                dirPath = root.fullPath + '/' + dirName,
+                getDir = jasmine.createSpy().andCallFake(function(dirEntry) {
+                    var dirURL = dirEntry.toURL();
+                    // now encode URL and try to resolve
+                    runs(function() {
+                        window.resolveLocalFileSystemURI(dirURL, win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                
+                }), win = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.name).toBe(dirName);
+                    expect(directory.fullPath).toBe(dirPath);
+                    
+                    // cleanup
+                    directory.remove(null, fail);
+                }),
+                fail = createFail('DirectoryEntry');
             
-            var dirURL = dirEntry.toURL();
-            // now encode URL and try to resolve
-            window.resolveLocalFileSystemURI(encodeURI(dirURL), testDirFromURL, that.fail);
+            // create:true, exclusive:false, directory does not exist
+            runs(function() {
+                root.getDirectory(dirName, {create: true}, getDir, fail);
+            });
+
+            waitsFor(function() { return getDir.wasCalled; }, "getDir never called", Tests.TEST_TIMEOUT);
+        });
+        it("DirectoryEntry.getDirectory: create new dir with space resolveFileSystemURL with encoded URL", function() {
+            var dirName = "de create dir",
+                dirPath = root.fullPath + '/' + dirName,
+                getDir = jasmine.createSpy().andCallFake(function(dirEntry) {
+                    var dirURL = dirEntry.toURL();
+                    // now encode URL and try to resolve
+                    runs(function() {
+                        window.resolveLocalFileSystemURI(encodeURI(dirURL), win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                win = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.name).toBe(dirName);
+                    expect(directory.fullPath).toBe(dirPath);
+                    // cleanup
+                    directory.remove(null, fail);
+                }),
+                fail = createFail('DirectoryEntry');
             
-        },
-        testDirFromURL = function(directory) {
-            ok(typeof directory !== 'undefined' && directory !== null, "directory entry should not be null");
-            equal(directory.isFile, false, "directory 'isFile' attribute should be false");
-            equal(directory.isDirectory, true, "directory 'isDirectory' attribute should be true");
-            equal(directory.name, dirName, "directory 'name' attribute should be set");
-            equal(directory.fullPath, dirPath, "directory 'fullPath' attribute should be set");
-        
-            // cleanup
-            directory.remove(null, that.fail);
-            QUnit.start();
-        };
-        
-        // create:true, exclusive:false, directory does not exist
-        this.root.getDirectory(dirName, {create: true}, getDir, this.fail); 
-    });
-
-    test("DirectoryEntry.getDirectory: create new directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var dirName = "de.create.dir",
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            testDir = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "directory entry should not be null");
-                equal(directory.isFile, false, "directory 'isFile' attribute should be false");
-                equal(directory.isDirectory, true, "directory 'isDirectory' attribute should be true");
-                equal(directory.name, dirName, "directory 'name' attribute should be set");
-                equal(directory.fullPath, dirPath, "directory 'fullPath' attribute should be set");
-                
-                // cleanup
-                directory.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create:true, exclusive:false, directory does not exist
-        this.root.getDirectory(dirName, {create: true}, testDir, this.fail); 
-    });
-    
-    test("DirectoryEntry.getDirectory: create new directory (exclusive)", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var dirName = "de.create.exclusive.dir",
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            testDir = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "directory entry should not be null");
-                equal(directory.isFile, false, "directory 'isFile' attribute should be false");
-                equal(directory.isDirectory, true, "directory 'isDirectory' attribute should be true");
-                equal(directory.name, dirName, "directory 'name' attribute should be set");
-                equal(directory.fullPath, dirPath, "directory 'fullPath' attribute should be set");
-               
-                // cleanup
-                directory.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create:true, exclusive:true, directory does not exist
-        this.root.getDirectory(dirName, {create: true, exclusive:true}, testDir, this.fail); 
-    });
-    test("DirectoryEntry.getDirectory: create directory that already exists", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var dirName = "de.create.existing.dir",
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            getDir = function(directory) {
-                // create:true, exclusive:false, directory exists
-                that.root.getDirectory(dirName, {create:true}, testDir, that.fail);             
-            },
-            testDir = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "directory entry should not be null");
-                equal(directory.isFile, false, "directory 'isFile' attribute should be false");
-                equal(directory.isDirectory, true, "directory 'isDirectory' attribute should be true");
-                equal(directory.name, dirName, "directory 'name' attribute should be set");
-                equal(directory.fullPath, dirPath, "directory 'fullPath' attribute should be set");
-                
-                // cleanup
-                directory.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create directory to kick off test
-        this.root.getDirectory(dirName, {create:true}, getDir, this.fail); 
-    });
-    test("DirectoryEntry.getDirectory: create directory that already exists (exclusive)", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var dirName = "de.create.exclusive.existing.dir",
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            existingDir,
-            getDir = function(directory) {
-                existingDir = directory;
-                // create:true, exclusive:true, directory exists
-                that.root.getDirectory(dirName, {create:true, exclusive:true}, null, testDir);             
-            },
-            testDir = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "creating exclusive directory that already exists is an error");
-                equal(error.code, FileError.PATH_EXISTS_ERR, "error code should be FileError.PATH_EXISTS_ERR");
-                
-                // cleanup
-                existingDir.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create directory to kick off test
-        this.root.getDirectory(dirName, {create:true}, getDir, this.fail); 
-    });
-    test("DirectoryEntry.getDirectory: get Entry for existing directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var dirName = "de.get.dir",
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            getDir = function(directory) {
-                // create:false, exclusive:false, directory exists
-                that.root.getDirectory(dirName, {create:false}, testDir, that.fail);             
-            },
-            testDir = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "directory entry should not be null");
-                equal(directory.isFile, false, "directory 'isFile' attribute should be false");
-                equal(directory.isDirectory, true, "directory 'isDirectory' attribute should be true");
-                equal(directory.name, dirName, "directory 'name' attribute should be set");
-                equal(directory.fullPath, dirPath, "directory 'fullPath' attribute should be set");
-                
-                // cleanup
-                directory.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create directory to kick off test
-        this.root.getDirectory(dirName, {create:true}, getDir, this.fail); 
-    });
-    test("DirectoryEntry.getDirectory: get DirectoryEntry for invalid path", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var dirName = "de:invalid:path",
-            that = this,
-            testDir = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "retrieving a directory using an invalid path is an error");
-                equal(error.code, FileError.ENCODING_ERR, "error code should be FileError.ENCODING_ERR");
-                
-                // cleanup
-                QUnit.start();
-            };
-                
-        // create:false, exclusive:false, invalid path
-        this.root.getDirectory(dirName, {create:false}, null, testDir); 
-    });
-    test("DirectoryEntry.getDirectory: get DirectoryEntry for existing file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "de.existing.file",
-            existingFile,
-            filePath = this.root.fullPath + '/' + fileName,
-            that = this,
-            getDir = function(file) {
-                existingFile = file;
-                // create:false, exclusive:false, existing file
-                that.root.getDirectory(fileName, {create:false}, null, testDir);             
-            },
-            testDir = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "retrieving directory for existing file is an error");
-                equal(error.code, FileError.TYPE_MISMATCH_ERR, "error code should be FileError.TYPE_MISMATCH_ERR");
-                
-                // cleanup
-                existingFile.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create file to kick off test
-        this.root.getFile(fileName, {create:true}, getDir, this.fail); 
-    });
-    test("DirectoryEntry.getFile: get FileEntry for existing directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var dirName = "de.existing.dir",
-            existingDir,
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            getFile = function(directory) {
-                existingDir = directory;
-                // create:false, exclusive:false, existing directory
-                that.root.getFile(dirName, {create:false}, null, testFile);             
-            },
-            testFile = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "retrieving file for existing directory is an error");
-                equal(error.code, FileError.TYPE_MISMATCH_ERR, "error code should be FileError.TYPE_MISMATCH_ERR");
-               
-                // cleanup
-                existingDir.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create directory to kick off test
-        this.root.getDirectory(dirName, {create:true}, getFile, this.fail); 
-    });
-    test("DirectoryEntry.removeRecursively on directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var dirName = "de.removeRecursively",
-            subDirName = "dir",
-            dirPath = this.root.fullPath + '/' + dirName,
-            //subDirPath = this.root.fullPath + '/' + subDirName,
-            subDirPath = dirPath + '/' + subDirName,
-            that = this,
-            entryCallback = function(entry) {
-                // delete directory
-                var deleteDirectory = function(directory) {
-                    entry.removeRecursively(testRemove, that.fail);  
-                }; 
-                // create a sub-directory within directory
-                entry.getDirectory(subDirName, {create: true}, deleteDirectory, that.fail);
-                },
-                testRemove = function() {
-                    // test that removed directory no longer exists
-                    that.root.getDirectory(dirName, {create:false}, null, testDirExists);
-                },
-                testDirExists = function(error){
-                    ok(typeof error !== 'undefined' && error !== null, "removed directory should not exist");
-                    equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                    QUnit.start();
-                };
-
-        // create a new directory entry to kick off test
-        this.root.getDirectory(dirName, {create:true}, entryCallback, this.fail);
-    });
-    test("DirectoryEntry.createReader: create reader on existing directory", function() {
-        expect(2);
-        
-        // create reader for root directory 
-        var reader = this.root.createReader();
-        ok(typeof reader !== 'undefined' && reader !== null, "reader object should not be null");
-        ok(typeof reader.readEntries === 'function', "reader object should have a 'readEntries' method");
-    });
-    module('DirectoryReader interface', {
-        // setup function will run before each test
-        setup: function() {
-            this.root = getFileSystemRoot();
-            this.fail = function(error) {
-                console.log('file error: ' + error.code);
-            };   
-        }
-    });
-    test("DirectoryReader.readEntries: read contents of existing directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-        
-        var reader,
-         testEntries = function(entries) {
-                ok(typeof entries !== 'undefined' && entries !== null, "directory entries should not be null");
-                ok(entries.constructor === Array, "readEntries should return an array of entries");
-                QUnit.start();
-            };
+            // create:true, exclusive:false, directory does not exist
+            runs(function() {
+                root.getDirectory(dirName, {create: true}, getDir, fail);
+            });
+
+            waitsFor(function() { return getDir.wasCalled; }, "getDir never called", Tests.TEST_TIMEOUT);
+        });
+
+        it("DirectoryEntry.getDirectory: create new directory", function() {
+            var dirName = "de.create.dir",
+                dirPath = root.fullPath + '/' + dirName,
+                win = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.name).toBe(dirName);
+                    expect(directory.fullPath).toBe(dirPath);
+                    
+                    // cleanup
+                    directory.remove(null, fail);
+                }),
+                fail = createFail('DirectoryEntry');
+                    
+            // create:true, exclusive:false, directory does not exist
+            runs(function() {
+                root.getDirectory(dirName, {create: true}, win, fail); 
+            });
+
+            waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(win).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        
+        it("DirectoryEntry.getDirectory: create new directory (exclusive)", function() {
+            var dirName = "de.create.exclusive.dir",
+                dirPath = root.fullPath + '/' + dirName,
+                win = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.name).toBe(dirName);
+                    expect(directory.fullPath).toBe(dirPath);
+                   
+                    // cleanup
+                    directory.remove(null, fail);
+                }),
+                fail = createFail('DirectoryEntry');
+            // create:true, exclusive:true, directory does not exist
+            runs(function() {
+                root.getDirectory(dirName, {create: true, exclusive:true}, win, fail); 
+            });
+
+            waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(win).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("DirectoryEntry.getDirectory: create directory that already exists", function() {
+            var dirName = "de.create.existing.dir",
+                dirPath = root.fullPath + '/' + dirName,
+                getDir = jasmine.createSpy().andCallFake(function(directory) {
+                    // create:true, exclusive:false, directory exists
+                    runs(function() {
+                        root.getDirectory(dirName, {create:true}, win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                win = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.name).toBe(dirName);
+                    expect(directory.fullPath).toBe(dirPath);
+                    
+                    // cleanup
+                    directory.remove(null, fail);
+                }),
+                fail = createFail('DirectoryEntry');
+                    
+            // create directory to kick off it
+            runs(function() {
+                root.getDirectory(dirName, {create:true}, getDir, this.fail); 
+            });
+
+            waitsFor(function() { return getDir.wasCalled; }, "getDir never called", Tests.TEST_TIMEOUT);
+        });
+        it("DirectoryEntry.getDirectory: create directory that already exists (exclusive)", function() {
+            var dirName = "de.create.exclusive.existing.dir",
+                dirPath = root.fullPath + '/' + dirName,
+                existingDir,
+                getDir = jasmine.createSpy().andCallFake(function(directory) {
+                    existingDir = directory;
+                    // create:true, exclusive:true, directory exists
+                    runs(function() {
+                        root.getDirectory(dirName, {create:true, exclusive:true}, win, fail);
+                    });
+
+                    waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(fail).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.PATH_EXISTS_ERR);
+                    
+                    // cleanup
+                    existingDir.remove(null, fail);
+                }),
+                win = createWin('DirectoryEntry');
+                    
+            // create directory to kick off it
+            runs(function() {
+                root.getDirectory(dirName, {create:true}, getDir, fail);
+            });
+            
+            waitsFor(function() { return getDir.wasCalled; }, "getDir never called", Tests.TEST_TIMEOUT);
+        });
+        it("DirectoryEntry.getDirectory: get Entry for existing directory", function() {
+            var dirName = "de.get.dir",
+                dirPath = root.fullPath + '/' + dirName,
+                getDir = jasmine.createSpy().andCallFake(function(directory) {
+                    // create:false, exclusive:false, directory exists
+                    runs(function() {
+                        root.getDirectory(dirName, {create:false}, win, fail);
+                    });
+
+                    waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                win = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.name).toBe(dirName);
+                    
+                    expect(directory.fullPath).toBe(dirPath);
+                    
+                    // cleanup
+                    directory.remove(null, fail);
+                }),
+                fail = createFail('DirectoryEntry');
+                    
+            // create directory to kick off it
+            root.getDirectory(dirName, {create:true}, getDir, fail);
+        });
+        it("DirectoryEntry.getDirectory: get DirectoryEntry for invalid path", function() {
+            var dirName = "de:invalid:path",
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.ENCODING_ERR);
+                }),
+                win = createWin('DirectoryEntry');
+                    
+            // create:false, exclusive:false, invalid path
+            runs(function() {
+                root.getDirectory(dirName, {create:false}, win, fail); 
+            });
+
+            waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+            });
+        });
+        it("DirectoryEntry.getDirectory: get DirectoryEntry for existing file", function() {
+            var fileName = "de.existing.file",
+                existingFile,
+                filePath = root.fullPath + '/' + fileName,
+                getDir = jasmine.createSpy().andCallFake(function(file) {
+                    existingFile = file;
+                    // create:false, exclusive:false, existing file
+                    runs(function() {
+                        root.getDirectory(fileName, {create:false}, win, fail);
+                    });
+
+                    waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(fail).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.TYPE_MISMATCH_ERR);
+                    
+                    // cleanup
+                    existingFile.remove(null, null);
+                }),
+                win = createWin('DirectoryEntry');
+                    
+            // create file to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, getDir, fail);
+            });
+
+            waitsFor(function() { return getDir.wasCalled; }, "getDir was called", Tests.TEST_TIMEOUT);
+        });
+        it("DirectoryEntry.getFile: get FileEntry for existing directory", function() {
+            var dirName = "de.existing.dir",
+                existingDir,
+                dirPath = root.fullPath + '/' + dirName,
+                getFile = jasmine.createSpy().andCallFake(function(directory) {
+                    existingDir = directory;
+                    // create:false, exclusive:false, existing directory
+                    runs(function() {
+                        root.getFile(dirName, {create:false}, win, fail);
+                    });
+
+                    waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(fail).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.TYPE_MISMATCH_ERR);
+                   
+                    // cleanup
+                    existingDir.remove(null, null);
+                }),
+                win = createWin('DirectoryEntry');
+                    
+            // create directory to kick off it
+            runs(function() {
+                root.getDirectory(dirName, {create:true}, getFile, fail);
+            });
+
+            waitsFor(function() { return getFile.wasCalled; }, "getFile never called", Tests.TEST_TIMEOUT);
+        });
+        it("DirectoryEntry.removeRecursively on directory", function() {
+            var dirName = "de.removeRecursively",
+                subDirName = "dir",
+                dirPath = root.fullPath + '/' + dirName,
+                //subDirPath = this.root.fullPath + '/' + subDirName,
+                subDirPath = dirPath + '/' + subDirName,
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // delete directory
+                    var deleteDirectory = jasmine.createSpy().andCallFake(function(directory) {
+                        runs(function() {
+                            entry.removeRecursively(remove, fail);
+                        });
+
+                        waitsFor(function() { return remove.wasCalled; }, "remove never called", Tests.TEST_TIMEOUT);
+                    });
+                    // create a sub-directory within directory
+                    runs(function() {
+                        entry.getDirectory(subDirName, {create: true}, deleteDirectory, fail);
+                    });
+
+                    waitsFor(function() { return deleteDirectory.wasCalled; }, "deleteDirectory never called", Tests.TEST_TIMEOUT);
+                }),
+                remove = jasmine.createSpy().andCallFake(function() {
+                    // it that removed directory no longer exists
+                    runs(function() {
+                        root.getDirectory(dirName, {create:false}, win, dirExists);
+                    });
+
+                    waitsFor(function() { return dirExists.wasCalled; }, "dirExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(dirExists).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                    });
+                }),
+                dirExists = jasmine.createSpy().andCallFake(function(error){
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                }),
+                fail = createFail('DirectoryEntry'),
+                win = createWin('DirectoryEntry');
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                root.getDirectory(dirName, {create:true}, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("createReader: create reader on existing directory", function() {
+            // create reader for root directory 
+            var reader = root.createReader();
+            expect(reader).toBeDefined();
+            expect(typeof reader.readEntries).toBe('function');
+        });
+        it("removeRecursively on root file system", function() {
+            var remove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NO_MODIFICATION_ALLOWED_ERR);
+                }),
+                win = createWin('DirectoryEntry');
+
+            // remove root file system
+            runs(function() {
+                root.removeRecursively(win, remove);
+            });
+
+            waitsFor(function() { return remove.wasCalled; }, "remove never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(win).not.toHaveBeenCalled();
+                expect(remove).toHaveBeenCalled();
+            });
+        });
+    });
+
+    describe('DirectoryReader interface', function() {
+        describe("readEntries", function() {
+            it("should read contents of existing directory", function() {
+                var reader,
+                    win = jasmine.createSpy().andCallFake(function(entries) {
+                        expect(entries).toBeDefined();
+                        expect(entries instanceof Array).toBe(true);
+                    }),
+                    fail = createFail('DirectoryReader');
                 
-        // create reader for root directory 
-        reader = this.root.createReader();
-        ok(typeof reader !== 'undefined' && reader !== null, "reader object should not be null");
-        ok(typeof reader.readEntries === 'function', "reader object should have a 'readEntries' method");
-        
-        // read entries
-        reader.readEntries(testEntries, this.fail);
-    });
-    test("DirectoryReader.readEntries: read contents of directory that has been removed", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-        
-        var dirName = "de.createReader.notfound",
-            dirPath = this.root.fullPath + '/' + dirName,
-            that = this,
-            entryCallback = function(directory) {
+                // create reader for root directory 
+                reader = root.createReader();
                 // read entries
-                var readEntries = function() {
-                    var reader = directory.createReader();
-                    reader.readEntries(null, testReader);
-                };
-                // delete directory
-                directory.removeRecursively(readEntries, that.fail);  
-            },
-            testReader = function(error) {
-                var testDirectoryExists = function(error) {
-                    ok(typeof error !== 'undefined' && error !== null, "reading entries on a directory that does not exist is an error")
-                    equal(error.code, FileError.NOT_FOUND_ERR, "removed directory should not exist");
-                    QUnit.start();
-                };
-                ok(typeof error !== 'undefined' && error !== null, "reading entries on a directory that does not exist is an error")
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                that.root.getDirectory(dirName, {create:false}, null, testDirectoryExists);
-            };
+                runs(function() {
+                    reader.readEntries(win, fail);
+                });
+
+                waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+                runs(function() {
+                    expect(win).toHaveBeenCalled();
+                    expect(fail).not.toHaveBeenCalled();
+                });
+            });
+            it("should read contents of directory that has been removed", function() {
+                var dirName = "de.createReader.notfound",
+                    dirPath = root.fullPath + '/' + dirName,
+                    entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                        // read entries
+                        var readEntries = jasmine.createSpy().andCallFake(function() {
+                            var reader = directory.createReader();
+                            
+                            runs(function() {
+                                reader.readEntries(win, itReader);
+                            });
+
+                            waitsFor(function() { return itReader.wasCalled; }, "itReader never called", Tests.TEST_TIMEOUT);
+                        });
+                        // delete directory
+                        runs(function() {
+                            directory.removeRecursively(readEntries, fail);
+                        });
+
+                        waitsFor(function() { return readEntries.wasCalled; }, "readEntries never called", Tests.TEST_TIMEOUT);
+                    }),
+                    itReader = jasmine.createSpy().andCallFake(function(error) {
+                        var itDirectoryExists = jasmine.createSpy().andCallFake(function(error) {
+                            expect(error).toBeDefined();
+                            expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                        });
+
+                        expect(error).toBeDefined();
+                        expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+
+                        runs(function() {
+                            root.getDirectory(dirName, {create:false}, win, itDirectoryExists);
+                        });
+
+                        waitsFor(function() { return itDirectoryExists.wasCalled; }, "itDirectoryExists never called", Tests.TEST_TIMEOUT);
+
+                        runs(function() {
+                            expect(itDirectoryExists).toHaveBeenCalled();
+                            expect(win).not.toHaveBeenCalled();
+                        });
+                    }),
+                    fail = createFail('DirectoryReader'),
+                    win = createWin('DirectoryReader');
+
+                // create a new directory entry to kick off it
+                runs(function() {
+                    root.getDirectory(dirName, {create:true}, entryCallback, fail);
+                });
+
+                waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+            });
+        });
+    });
+
+    describe('File', function() {
+        it("constructor should be defined", function() {
+            expect(File).toBeDefined();
+            expect(typeof File).toBe('function');
+        });
+        it("should be define File attributes", function() {
+            var file = new File();
+            expect(file.name).toBeDefined();
+            expect(file.fullPath).toBeDefined();
+            expect(file.type).toBeDefined();
+            expect(file.lastModifiedDate).toBeDefined();
+            expect(file.size).toBeDefined();
+        });
+    });
+
+    describe('FileEntry', function() {
+        it("should be define FileEntry methods", function() {
+            var fileName = "fe.methods",
+                itFileEntry = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(typeof fileEntry.createWriter).toBe('function');
+                    expect(typeof fileEntry.file).toBe('function');
+                    
+                    // cleanup 
+                    fileEntry.remove(null, fail);
+                }),
+                fail = createFail('FileEntry');
+                    
+            // create a new file entry to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, itFileEntry, fail);
+            });
+
+            waitsFor(function() { return itFileEntry.wasCalled; }, "itFileEntry never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itFileEntry).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("createWriter should return a FileWriter object", function() {
+            var fileName = "fe.createWriter",
+                itFile,
+                entryCallback = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    itFile = fileEntry;
+
+                    runs(function() {
+                        fileEntry.createWriter(itWriter, fail);
+                    });
+
+                    waitsFor(function() { return itWriter.wasCalled; }, "itWriter", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itWriter).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itWriter = jasmine.createSpy().andCallFake(function(writer) {
+                    expect(writer).toBeDefined();
+                    expect(writer instanceof FileWriter).toBe(true);
+                    
+                    // cleanup 
+                    itFile.remove(null, fail);
+                }),
+                fail = createFail('FileEntry');
+                    
+            // create a new file entry to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("file should return a File object", function() {
+            var fileName = "fe.file",
+                newFile,
+                entryCallback = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    newFile = fileEntry;
+                    
+                    runs(function() {
+                        fileEntry.file(itFile, fail);
+                    });
+
+                    waitsFor(function() { return itFile.wasCalled; }, "itFile never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itFile).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itFile = jasmine.createSpy().andCallFake(function(file) {
+                    expect(file).toBeDefined();
+                    expect(file instanceof File).toBe(true);
+                    
+                    // cleanup 
+                    newFile.remove(null, fail);
+                }),
+                fail = createFail('FileEntry');
+             
+            // create a new file entry to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("file: on File that has been removed", function() {
+            var fileName = "fe.no.file",
+                entryCallback = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    // create File object
+                    var getFile = jasmine.createSpy().andCallFake(function() {
+                        runs(function() {
+                            fileEntry.file(win, itFile);
+                        });
+
+                        waitsFor(function() { return itFile.wasCalled; }, "itFile never called", Tests.TEST_TIMEOUT);
+
+                        runs(function() {
+                            expect(itFile).toHaveBeenCalled();
+                            expect(win).not.toHaveBeenCalled();
+                        });
+                    });
+                    // delete file
+                    runs(function() {
+                        fileEntry.remove(getFile, fail);
+                    });
+
+                    waitsFor(function() { return getFile.wasCalled; }, "getFile never called", Tests.TEST_TIMEOUT);
+                }),
+                itFile = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                }),
+                fail = createFail('FileEntry'),
+                win = createWin('FileEntry');
+                    
+            // create a new file entry to kick off it
+            runs(function() {
+                root.getFile(fileName, {create:true}, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+    });
+    describe('Entry', function() {
+        it("Entry object", function() {
+            var fileName = "entry",
+                fullPath = root.fullPath + '/' + fileName,
+                fail = createFail('Entry'),
+                itEntry = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.name).toBe(fileName);
+                    expect(entry.fullPath).toBe(fullPath);
+                    expect(typeof entry.getMetadata).toBe('function');
+                    expect(typeof entry.moveTo).toBe('function');
+                    expect(typeof entry.copyTo).toBe('function');
+                    expect(typeof entry.toURL).toBe('function');
+                    expect(typeof entry.remove).toBe('function');
+                    expect(typeof entry.getParent).toBe('function');
+                    expect(typeof entry.createWriter).toBe('function');
+                    expect(typeof entry.file).toBe('function');
 
-        // create a new directory entry to kick off test
-        this.root.getDirectory(dirName, {create:true}, entryCallback, this.fail);
-    });
-    test("DirectoryEntry.removeRecursively on root file system", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var testRemove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "removing root file system should generate an error");
-                equal(error.code, FileError.NO_MODIFICATION_ALLOWED_ERR, "error code should be FileError.NO_MODIFICATION_ALLOWED_ERR");
-                QUnit.start();
-            };
-
-        // remove root file system
-        this.root.removeRecursively(null, testRemove);
-    });
-    module('File interface');
-    test("File constructor should be defined", function() {
-        expect(1);
-        ok(typeof File === 'function', "File constructor should be a function.");
-    });
-    test("File attributes should be defined", function() {
-        expect(5);
-        var file = new File();
-        ok(typeof file.name !== 'undefined', "File object should have a 'name' attribute");
-        ok(typeof file.fullPath !== 'undefined', "File object should have a 'fullPath' attribute");
-        ok(typeof file.type !== 'undefined', "File object should have a 'type' attribute");
-        ok(typeof file.lastModifiedDate !== 'undefined', "File object should have a 'lastModifiedDate' attribute");
-        ok(typeof file.size !== 'undefined', "File object should have a 'size' attribute");
-    });
-    module('FileEntry interface', {
-        // setup function will run before each test
-        setup: function() {
-            this.root = getFileSystemRoot();
-            this.fail = function(error) {
-                console.log('file error: ' + error.code);
-            };   
-        }
-    });
-    test("FileEntry methods should be defined", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var fileName = "fe.methods",
-            that = this,
-            testFileEntry = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "FileEntry should not be null");
-                ok(typeof fileEntry.createWriter === 'function', "FileEntry should have a 'createWriter' method");
-                ok(typeof fileEntry.file === 'function', "FileEntry should have a 'file' method");
-                
-                // cleanup 
-                fileEntry.remove(null, that.fail);
-                QUnit.start();
-            };
-                
-        // create a new file entry to kick off test
-        this.root.getFile(fileName, {create:true}, testFileEntry, this.fail);
-    });
-    test("FileEntry.createWriter should return a FileWriter object", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "fe.createWriter",
-            that = this,
-            testFile,
-            entryCallback = function(fileEntry) {
-                testFile = fileEntry;
-                fileEntry.createWriter(testWriter, that.fail);
-            },
-            testWriter = function(writer) {
-                ok(typeof writer !== 'undefined' && writer !== null, "FileWriter object should not be null");
-                ok(writer.constructor === FileWriter, "writer should be a FileWriter object");
-                
-                // cleanup 
-                testFile.remove(null, that.fail);
-                QUnit.start();                
-            };
-                
-        // create a new file entry to kick off test
-        this.root.getFile(fileName, {create:true}, entryCallback, this.fail);
-    });
-    test("FileEntry.file should return a File object", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "fe.file",
-            that = this,
-            newFile,
-            entryCallback = function(fileEntry) {
-                newFile = fileEntry;
-                fileEntry.file(testFile, that.fail);
-            },
-            testFile = function(file) {
-                ok(typeof file !== 'undefined' && file !== null, "File object should not be null");
-                ok(file.constructor === File, "File object should be a File");
-                
-                // cleanup 
-                newFile.remove(null, that.fail);
-                QUnit.start();                
-            };
-                
-        // create a new file entry to kick off test
-        this.root.getFile(fileName, {create:true}, entryCallback, this.fail);
-    });
-    test("FileEntry.file: on File that has been removed", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "fe.no.file",
-            that = this,
-            entryCallback = function(fileEntry) {
-                // create File object
-                var getFile = function() {
-                    fileEntry.file(null, testFile);
-                };
-                // delete file
-                fileEntry.remove(getFile, that.fail);
-            },
-            testFile = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "invoking FileEntry.file on a file that does not exist is an error");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                QUnit.start();                
-            };
-                
-        // create a new file entry to kick off test
-        this.root.getFile(fileName, {create:true}, entryCallback, this.fail);
-    });
-    module('Entry interface', {
-        // setup function will run before each test
-        setup: function() {
-            var that = this;
-            this.root = getFileSystemRoot();
-            this.fail = function(error) {
-                console.log('file error: ' + error.code);
-            };
-            this.unexpectedSuccess = function() {
-                console.log('!!! success function called when not expected !!!');
-            };
-            // deletes specified file or directory
-            this.deleteEntry = function(name, success, error) {
-                // deletes entry, if it exists
-                window.resolveLocalFileSystemURI(that.root.toURL() + '/' + name, 
-                        function(entry) {
-                            console.log('Deleting: ' + entry.fullPath);
-                            if (entry.isDirectory === true) {
-                                entry.removeRecursively(success, error); 
-                            }
-                            else {
-                                entry.remove(success, error);
-                            }
-                        }, 
-                        // doesn't exist
-                        success);
-            };
-            // deletes and re-creates the specified file
-            this.createFile = function(fileName, success, error) {
-                that.deleteEntry(fileName, function() {
-                    console.log('Creating file: ' + that.root.fullPath + '/' + fileName);
-                    that.root.getFile(fileName, {create: true}, success, error);                
-                }, error);
-            };
-            // deletes and re-creates the specified directory
-            this.createDirectory = function(dirName, success, error) {
-                that.deleteEntry(dirName, function() {
-                   console.log('Creating directory: ' + that.root.fullPath + '/' + dirName);
-                   that.root.getDirectory(dirName, {create: true}, success, error); 
-                }, error);
-            };
-        }
-    });
-    test("Entry object", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(13);
-
-        var fileName = "entry",
-            that = this,
-            fullPath = this.root.fullPath + '/' + fileName,
-            testEntry = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "entry should not be null.");
-                equal(entry.isFile, true, "entry.isFile should be true");
-                equal(entry.isDirectory, false, "entry.isDirectory should be false");
-                equal(entry.name, fileName, "entry object 'name' property should be set");
-                equal(entry.fullPath, fullPath, "entry object 'fullPath' property should be set");
-                ok(typeof entry.getMetadata === 'function', "entry object should have a 'getMetadata' function.");
-                ok(typeof entry.moveTo === 'function', "entry object should have a 'moveTo' function.");
-                ok(typeof entry.copyTo === 'function', "entry object should have a 'copyTo' function.");
-                ok(typeof entry.toURL === 'function', "entry object should have a 'toURL' function.");
-                ok(typeof entry.remove === 'function', "entry object should have a 'remove' function.");
-                ok(typeof entry.getParent === 'function', "entry object should have a 'getParent' function.");
-                ok(typeof entry.createWriter === 'function', "entry object should have a 'createWriter' function.");
-                ok(typeof entry.file === 'function', "entry object should have a 'file' function.");
-                
-                // cleanup
-                that.deleteEntry(fileName);
-                QUnit.start();
-            };
+                    // cleanup
+                    deleteEntry(fileName);
+                });
+
+            // create a new file entry
+            runs(function() {
+                createFile(fileName, itEntry, fail);
+            });
+
+            waitsFor(function() { return itEntry.wasCalled; }, "itEntry", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itEntry).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("Entry.getMetadata on file", function() {
+            var fileName = "entry.metadata.file",
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    runs(function() {
+                        entry.getMetadata(itMetadata, fail);
+                    });
+
+                    waitsFor(function() { return itMetadata.wasCalled; }, "itMetadata never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itMetadata).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = createFail('Entry'),
+                itMetadata = jasmine.createSpy().andCallFake(function(metadata) {
+                    expect(metadata).toBeDefined();
+                    expect(metadata.modificationTime instanceof Date).toBe(true);
 
-        // create a new file entry
-        this.createFile(fileName, testEntry, this.fail);
-    });
-    test("Entry.getMetadata on file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var fileName = "entry.metadata.file",
-            that = this,
-            entryCallback = function(entry) {
-                entry.getMetadata(testMetadata, this.fail);
-            },
-            testMetadata = function(metadata) {
-                ok(typeof metadata !== 'undefined' && metadata !== null, "metadata should not be null.");
-                ok(metadata.modificationTime instanceof Date, "metadata.modificationTime should be Date object");
-                ok(isNaN(metadata.modificationTime.getTime()) !== true, "metadata.modificationTime should not be an Invalid Date");
-
-                // cleanup
-                that.deleteEntry(fileName);
-                QUnit.start();
-            };
-        
-        // create a new file entry
-        this.createFile(fileName, entryCallback, this.fail);
-    });
-    test("Entry.getMetadata on directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var dirName = "entry.metadata.dir",
-            that = this,
-            entryCallback = function(entry) {
-                entry.getMetadata(testMetadata, this.fail);
-            },
-            testMetadata = function(metadata) {
-                ok(typeof metadata !== 'undefined' && metadata !== null, "metadata should not be null.");
-                ok(metadata.modificationTime instanceof Date, "metadata.modificationTime should be Date object");
-                ok(isNaN(metadata.modificationTime.getTime()) !== true, "metadata.modificationTime should not be an Invalid Date");
-
-                // cleanup
-                that.deleteEntry(dirName);
-                QUnit.start();
-            };
-        
-        // create a new directory entry
-        this.createDirectory(dirName, entryCallback, this.fail);
-    });
-    test("Entry.getParent on file in root file system", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var fileName = "entry.parent.file",
-            that = this,
-            rootPath = this.root.fullPath,
-            entryCallback = function(entry) {
-                entry.getParent(testParent, this.fail);
-            },
-            testParent = function(parent) {
-                ok(typeof parent !== 'undefined' && parent !== null, "parent directory should not be null.");
-                equal(parent.fullPath, rootPath, "parent fullPath should be root file system");
-                ok(typeof parent.getParent === 'function', "entry object should have a 'getParent' function.");
-
-                // cleanup
-                that.deleteEntry(fileName);
-                QUnit.start();
-            };
-    
-        // create a new file entry
-        this.createFile(fileName, entryCallback, this.fail);
-    });
-    test("Entry.getParent on directory in root file system", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var dirName = "entry.parent.dir",
-            that = this,
-            rootPath = this.root.fullPath,
-            entryCallback = function(entry) {
-                entry.getParent(testParent, this.fail);
-            },
-            testParent = function(parent) {
-                ok(typeof parent !== 'undefined' && parent !== null, "parent directory should not be null.");
-                equal(parent.fullPath, rootPath, "parent fullPath should be root file system");
-                ok(typeof parent.getParent === 'function', "entry object should have a 'getParent' function.");
-
-                // cleanup
-                that.deleteEntry(dirName);
-                QUnit.start();
-            };
-
-        // create a new directory entry
-        this.createDirectory(dirName, entryCallback, this.fail);
-    });
-    test("Entry.getParent on root file system", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var rootPath = this.root.fullPath,
-         testParent = function(parent) {
-                ok(typeof parent !== 'undefined' && parent !== null, "parent directory should not be null.");
-                equal(parent.fullPath, rootPath, "parent fullPath should be root file system");
-                ok(typeof parent.getParent === 'function', "entry object should have a 'getParent' function.");
-                QUnit.start();
-            };
-
-        // create a new directory entry
-        this.root.getParent(testParent, this.fail);
-    });
-    test("Entry.toURL on file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var fileName = "entry.uri.file",
-            that = this,
-            rootPath = this.root.fullPath,
-            testURL = function(entry) {
-                var uri = entry.toURL();
-                ok(typeof uri !== 'undefined' && uri !== null, "URL should not be null.");
-                ok(uri.indexOf(rootPath) !== -1, "URL should contain root file system path");
-
-                // cleanup
-                that.deleteEntry(fileName);
-                QUnit.start();
-            };
-    
-        // create a new file entry
-        this.createFile(fileName, testURL, this.fail);
-    });
-    test("Entry.toURL on directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var dirName = "entry.uri.dir",
-            that = this,
-            rootPath = this.root.fullPath,
-            testURL = function(entry) {
-                var uri = entry.toURL();
-                ok(typeof uri !== 'undefined' && uri !== null, "URL should not be null.");
-                ok(uri.indexOf(rootPath) !== -1, "URL should contain root file system path");
-
-                // cleanup
-                that.deleteEntry(dirName);
-                QUnit.start();
-            };
-
-        // create a new directory entry
-        this.createDirectory(dirName, testURL, this.fail);
-    });
-    test("Entry.remove on file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var fileName = "entry.rm.file",
-            that = this,
-            fullPath = this.root.fullPath + '/' + fileName,
-         entryCallback = function(entry) {
-                var checkRemove = function() {
-                    that.root.getFile(fileName, null, that.unexpectedSuccess, testRemove);  
-                };
-                ok(typeof entry !== 'undefined' && entry !== null, "entry should not be null.");
-                entry.remove(checkRemove, that.fail);
-            },
-            testRemove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "file should not exist");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR"); 
-                // cleanup
-                that.deleteEntry(fileName);
-                QUnit.start();
-            };
-    
-        // create a new file entry
-        this.createFile(fileName, entryCallback, this.fail);
-    });
-    test("Entry.remove on empty directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(3);
-        
-        var dirName = "entry.rm.dir",
-            that = this,
-            fullPath = this.root.fullPath + '/' + dirName,
-            entryCallback = function(entry) {
-                var checkRemove = function() {
-                    that.root.getDirectory(dirName, null, that.unexpectedSuccess, testRemove);  
-                };
-                ok(typeof entry !== 'undefined' && entry !== null, "entry should not be null.");
-                entry.remove(checkRemove, that.fail);
-            },
-            testRemove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "directory should not exist");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR"); 
-                // cleanup
-                that.deleteEntry(dirName);                
-                QUnit.start();
-            };
-
-        // create a new directory entry
-        this.createDirectory(dirName, entryCallback, this.fail);
-    });
-    test("Entry.remove on non-empty directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-        
-        var dirName = "entry.rm.dir.not.empty",
-            that = this,
-            fullPath = this.root.fullPath + '/' + dirName,
-            fileName = "remove.txt",
-            entryCallback = function(entry) {
-                var checkFile = function(error) {
-                    ok(typeof error !== 'undefined' && error !== null, "removing non-empty directory should generate an error");
-                    equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                    // verify that dir still exists
-                    that.root.getDirectory(dirName, null, testRemove, that.fail);  
-                };
-                // delete directory
-                var deleteDirectory = function(fileEntry) {
-                    entry.remove(that.unexpectedSuccess, checkFile);  
-                }; 
-                // create a file within directory, then try to delete directory
-                entry.getFile(fileName, {create: true}, deleteDirectory, that.fail);
-            },
-            testRemove = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "entry should not be null.");
-                equal(entry.fullPath, fullPath, "dir entry should still exisit");
-                // cleanup
-                that.deleteEntry(dirName);
-                QUnit.start();
-            };
-
-        // create a new directory entry
-        this.createDirectory(dirName, entryCallback, this.fail);
-    });
-    test("Entry.remove on root file system", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var testRemove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "removing root file system should generate an error");
-                equal(error.code, FileError.NO_MODIFICATION_ALLOWED_ERR, "error code should be FileError.NO_MODIFICATION_ALLOWED_ERR");
-                QUnit.start();
-            };
-
-        // remove entry that doesn't exist
-        this.root.remove(null, testRemove);
-    });
-    test("Entry.copyTo: file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(10);
-        
-        var file1 = "entry.copy.file1",
-            file2 = "entry.copy.file2",
-            that = this,
-            fullPath = this.root.fullPath + '/' + file2,
-            entryCallback = function(entry) {
-                // copy file1 to file2
-                entry.copyTo(that.root, file2, testCopy, that.fail);
-            },
-            testCopy = function(entry) {
-                
-                ok(typeof entry !== 'undefined' && entry !== null, "copied file entry should not be null");
-                equals(entry.isFile, true, "entry 'isFile' attribute should be set to true");
-                equals(entry.isDirectory, false, "entry 'isDirectory' attribute should be set to false");
-                equals(entry.fullPath, fullPath, "entry 'fullPath' should be set correctly");
-                equals(entry.name, file2, "entry 'name' attribute should be set correctly");
-                that.root.getFile(file2, {create:false}, testFileExists, null);                           
-                
-            },
-            testFileExists = function(entry2) {
-                // a bit redundant since copy returned this entry already
-                ok(typeof entry2 !== 'undefined' && entry2 !== null, "copied file entry should not be null");
-                equals(entry2.isFile, true, "entry 'isFile' attribute should be set to true");
-                equals(entry2.isDirectory, false, "entry 'isDirectory' attribute should be set to false");
-                equals(entry2.fullPath, fullPath, "entry 'fullPath' should be set correctly");
-                equals(entry2.name, file2, "entry 'name' attribute should be set correctly");
-         
-                // cleanup
-                that.deleteEntry(file1);
-                that.deleteEntry(file2);
-                QUnit.start();
-            };
-
-        // create a new file entry to kick off test
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: file onto itself", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var file1 = "entry.copy.fos.file1",
-            that = this,
-            entryCallback = function(entry) {
-                // copy file1 onto itself
-                entry.copyTo(that.root, null, null, testCopy);
-            },
-         testCopy = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to copy an entry into its parent if a different name is not specified");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-
-                // cleanup
-                that.deleteEntry(file1);
-                QUnit.start();
-            };
-
-        // create a new file entry to kick off test
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(15);
-        
-        var file1 = "file1",
-            srcDir = "entry.copy.srcDir",
-            dstDir = "entry.copy.dstDir",
-            dstPath = this.root.fullPath + '/' + dstDir,
-            filePath = dstPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var copyDir = function(fileEntry) {
-                    // copy srcDir to dstDir
-                    directory.copyTo(that.root, dstDir, testCopy, that.fail);                    
-                };
-              // create a file within new directory
-              directory.getFile(file1, {create: true}, copyDir, that.fail);
-            },
-            testCopy = function(directory) {
-                
-                ok(typeof directory !== 'undefined' && directory !== null, "copied directory entry should not be null");
-                equals(directory.isFile, false, "entry 'isFile' attribute should be false");
-                equals(directory.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                equals(directory.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                equals(directory.name, dstDir, "entry 'name' attribute should be set correctly");
-         
-                that.root.getDirectory(dstDir, {create:false}, testDirExists, that.fail);
-           },
-            testDirExists = function(dirEntry) {
-                 ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "copied directory entry should not be null");
-                 equals(dirEntry.isFile, false, "entry 'isFile' attribute should be false");
-                 equals(dirEntry.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                 equals(dirEntry.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                 equals(dirEntry.name, dstDir, "entry 'name' attribute should be set correctly");
-                 
-                 dirEntry.getFile(file1, {create:false}, testFileExists, that.fail);
-         
-         };
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "copied directory entry should not be null");
-                equals(fileEntry.isFile, true, "entry 'isFile' attribute should be true");
-                equals(fileEntry.isDirectory, false, "entry 'isDirectory' attribute should be false");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-                equals(fileEntry.name, file1, "entry 'name' attribute should be set correctly");
-                
+                    // cleanup
+                    deleteEntry(fileName);
+                });
+            
+            // create a new file entry
+            createFile(fileName, entryCallback, fail);
+        });
+        it("Entry.getMetadata on directory", function() {
+            var dirName = "entry.metadata.dir",
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    runs(function() {
+                        entry.getMetadata(itMetadata, fail);
+                    });
+
+                    waitsFor(function() { return itMetadata.wasCalled; }, "itMetadata never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itMetadata).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = createFail('Entry'),
+                itMetadata = jasmine.createSpy().andCallFake(function(metadata) {
+                    expect(metadata).toBeDefined();
+                    expect(metadata.modificationTime instanceof Date).toBe(true);
 
-                // cleanup
-                that.deleteEntry(srcDir);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
+                    // cleanup
+                    deleteEntry(dirName);
+                });
+            
+            // create a new directory entry
+            runs(function() {
+                createDirectory(dirName, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("Entry.getParent on file in root file system", function() {
+            var fileName = "entry.parent.file",
+                rootPath = root.fullPath,
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    runs(function() {
+                        entry.getParent(itParent, fail);
+                    });
+
+                    waitsFor(function() { return itParent.wasCalled; }, "itCalled never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itParent).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itParent = jasmine.createSpy().andCallFake(function(parent) {
+                    expect(parent).toBeDefined();
+                    expect(parent.fullPath).toBe(rootPath);
 
-        // create a new directory entry to kick off test
-        this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: directory to backup at same root directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(15);
-        
-        var file1 = "file1",
-            srcDir = "entry.copy.srcDir",
-            dstDir = "entry.copy.srcDir-backup",
-            dstPath = this.root.fullPath + '/' + dstDir,
-            filePath = dstPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var copyDir = function(fileEntry) {
-                    // copy srcDir to dstDir
-                    directory.copyTo(that.root, dstDir, testCopy, that.fail);                    
-                };
-              // create a file within new directory
-              directory.getFile(file1, {create: true}, copyDir, that.fail);
-            },
-            testCopy = function(directory) {
-                
-                ok(typeof directory !== 'undefined' && directory !== null, "copied directory entry should not be null");
-                equals(directory.isFile, false, "entry 'isFile' attribute should be false");
-                equals(directory.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                equals(directory.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                equals(directory.name, dstDir, "entry 'name' attribute should be set correctly");
-         
-                that.root.getDirectory(dstDir, {create:false}, testDirExists, that.fail);
-           },
-            testDirExists = function(dirEntry) {
-                 ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "copied directory entry should not be null");
-                 equals(dirEntry.isFile, false, "entry 'isFile' attribute should be false");
-                 equals(dirEntry.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                 equals(dirEntry.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                 equals(dirEntry.name, dstDir, "entry 'name' attribute should be set correctly");
+                    // cleanup
+                    deleteEntry(fileName);
+                });
+        
+            // create a new file entry
+            runs(function() {
+                createFile(fileName, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("Entry.getParent on directory in root file system", function() {
+            var dirName = "entry.parent.dir",
+                rootPath = root.fullPath,
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    runs(function() {
+                        entry.getParent(itParent, fail);
+                    });
+
+                    waitsFor(function() { return itParent.wasCalled; }, "itParent never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itParent).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itParent = jasmine.createSpy().andCallFake(function(parent) {
+                    expect(parent).toBeDefined();
+                    expect(parent.fullPath).toBe(rootPath);
+
+                    // cleanup
+                    deleteEntry(dirName);
+                });
+
+            // create a new directory entry
+            runs(function() {
+                createDirectory(dirName, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("Entry.getParent on root file system", function() {
+            var rootPath = root.fullPath,
+                itParent = jasmine.createSpy().andCallFake(function(parent) {
+                    expect(parent).toBeDefined();
+                    expect(parent.fullPath).toBe(rootPath);
+                }),
+                fail = createFail('Entry');
+
+            // create a new directory entry
+            runs(function() {
+                root.getParent(itParent, fail);
+            });
+
+            waitsFor(function() { return itParent.wasCalled; }, "itParent never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itParent).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("Entry.toURL on file", function() {
+            var fileName = "entry.uri.file",
+                rootPath = root.fullPath,
+                itURL = jasmine.createSpy().andCallFake(function(entry) {
+                    var uri = entry.toURL();
+                    expect(uri).toBeDefined();
+                    expect(uri.indexOf(rootPath)).not.toBe(-1);
+
+                    // cleanup
+                    deleteEntry(fileName);
+                }),
+                fail = createFail('Entry');
+        
+            // create a new file entry
+            runs(function() {
+                createFile(fileName, itURL, fail);
+            });
+
+            waitsFor(function() { return itURL.wasCalled; }, "itURL never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itURL).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("Entry.toURL on directory", function() {
+            var dirName = "entry.uri.dir",
+                rootPath = root.fullPath,
+                itURL = jasmine.createSpy().andCallFake(function(entry) {
+                    var uri = entry.toURL();
+                    expect(uri).toBeDefined();
+                    expect(uri.indexOf(rootPath)).not.toBe(-1);
+
+                    // cleanup
+                    deleteEntry(dirName);
+                }),
+                fail = createFail('Entry');
+
+            // create a new directory entry
+            runs(function() {
+                createDirectory(dirName, itURL, fail);
+            });
+
+            waitsFor(function() { return itURL.wasCalled; }, "itURL never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itURL).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("Entry.remove on file", function() {
+            var fileName = "entry.rm.file",
+                fullPath = root.fullPath + '/' + fileName,
+                win = createWin('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    var checkRemove = jasmine.createSpy().andCallFake(function() {
+                        runs(function() {
+                            root.getFile(fileName, null, win, itRemove);
+                        });
+
+                        waitsFor(function() { return itRemove.wasCalled; }, "itRemove never called", Tests.TEST_TIMEOUT);
+
+                        runs(function() {
+                            expect(win).not.toHaveBeenCalled();
+                            expect(fail).not.toHaveBeenCalled();
+                            expect(itRemove).toHaveBeenCalled();
+                        });
+                    });
+                    expect(entry).toBeDefined();
+                    
+                    runs(function() {
+                        entry.remove(checkRemove, fail);
+                    });
+
+                    waitsFor(function() { return checkRemove.wasCalled; }, "checkRemove never called", Tests.TEST_TIMEOUT);
+                }),
+                itRemove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                    // cleanup
+                    deleteEntry(fileName);
+                }),
+                fail = createFail('Entry');
+        
+            // create a new file entry
+            runs(function() {
+                createFile(fileName, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("remove on empty directory", function() {
+            var dirName = "entry.rm.dir",
+                fullPath = root.fullPath + '/' + dirName,
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    var checkRemove = jasmine.createSpy().andCallFake(function() {
+                        runs(function() {
+                            root.getDirectory(dirName, null, win, itRemove);
+                        });
+
+                        waitsFor(function() { return itRemove.wasCalled; }, "itRemove never called", Tests.TEST_TIMEOUT);
+
+                        runs(function() {
+                            expect(itRemove).toHaveBeenCalled();
+                            expect(win).not.toHaveBeenCalled();
+                            expect(fail).not.toHaveBeenCalled();
+                        });
+                    });
+
+                    expect(entry).toBeDefined();
+
+                    runs(function() {
+                        entry.remove(checkRemove, fail);
+                    });
+
+                    waitsFor(function() { return checkRemove.wasCalled; }, "checkRemove never called", Tests.TEST_TIMEOUT);
+                }),
+                itRemove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                    // cleanup
+                    deleteEntry(dirName);
+                }),
+                win = createWin('Entry'),
+                fail = createFail('Entry');
+
+            // create a new directory entry
+            runs(function() {
+                createDirectory(dirName, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("remove on non-empty directory", function() {
+            var dirName = "entry.rm.dir.not.empty",
+                fullPath = root.fullPath + '/' + dirName,
+                fileName = "remove.txt",
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    var checkFile = jasmine.createSpy().andCallFake(function(error) {
+                        expect(error).toBeDefined();
+                        expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                        // verify that dir still exists
+                        runs(function() {
+                            root.getDirectory(dirName, null, itRemove, fail);
+                        });
+
+                        waitsFor(function() { return itRemove.wasCalled; }, "itRemove never called", Tests.TEST_TIMEOUT);
+
+                        runs(function() {
+                            expect(win).not.toHaveBeenCalled();
+                            expect(fail).not.toHaveBeenCalled();
+                            expect(itRemove).toHaveBeenCalled();
+                        });
+                    });
+                    // delete directory
+                    var deleteDirectory = jasmine.createSpy().andCallFake(function(fileEntry) {
+                        runs(function() {
+                            entry.remove(win, checkFile);
+                        });
+
+                        waitsFor(function() { return checkFile.wasCalled; }, "checkFile never called", Tests.TEST_TIMEOUT);
+                    });
+                    // create a file within directory, then try to delete directory
+                    runs(function() {
+                        entry.getFile(fileName, {create: true}, deleteDirectory, fail);
+                    });
+
+                    waitsFor(function() { return deleteDirectory.wasCalled; }, "deleteDirectory never called", Tests.TEST_TIMEOUT);
+                }),
+                itRemove = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.fullPath).toBe(fullPath);
+                    // cleanup
+                    deleteEntry(dirName);
+                }),
+                win = createWin('Entry'),
+                fail = createFail('Entry');
+
+            // create a new directory entry
+            runs(function() {
+                createDirectory(dirName, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("remove on root file system", function() {
+            var itRemove = jasmine.createSpy().andCallFake(function(error) {
+                expect(error).toBeDefined();
+                expect(error.code).toBe(FileError.NO_MODIFICATION_ALLOWED_ERR);
+            }),
+            win = createWin('Entry');
+
+            // remove entry that doesn't exist
+            runs(function() {
+                root.remove(win, itRemove);
+            });
+
+            waitsFor(function() { return itRemove.wasCalled; }, "itRemove never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(win).not.toHaveBeenCalled();
+                expect(itRemove).toHaveBeenCalled();
+            });
+        });
+        it("copyTo: file", function() {
+            var file1 = "entry.copy.file1",
+                file2 = "entry.copy.file2",
+                fullPath = root.fullPath + '/' + file2,
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // copy file1 to file2
+                    runs(function() {
+                        entry.copyTo(root, file2, itCopy, fail);
+                    });
+
+                    waitsFor(function() { return itCopy.wasCalled; }, "itCopy never called", Tests.TEST_TIMEOUT);
+                }),
+                itCopy = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.fullPath).toBe(fullPath);
+                    expect(entry.name).toBe(file2);
+
+                    runs(function() {
+                        root.getFile(file2, {create:false}, itFileExists, fail);
+                    });
+
+                    waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(itFileExists).toHaveBeenCalled();
+                    });
+                }),
+                itFileExists = jasmine.createSpy().andCallFake(function(entry2) {
+                    // a bit redundant since copy returned this entry already
+                    expect(entry2).toBeDefined();
+                    expect(entry2.isFile).toBe(true);
+                    expect(entry2.isDirectory).toBe(false);
+                    expect(entry2.fullPath).toBe(fullPath);
+                    expect(entry2.name).toBe(file2);
                  
-                 dirEntry.getFile(file1, {create:false}, testFileExists, that.fail);
-         
-         };
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "copied directory entry should not be null");
-                equals(fileEntry.isFile, true, "entry 'isFile' attribute should be true");
-                equals(fileEntry.isDirectory, false, "entry 'isDirectory' attribute should be false");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-                equals(fileEntry.name, file1, "entry 'name' attribute should be set correctly");
-                
+                    // cleanup
+                    deleteEntry(file1);
+                    deleteEntry(file2);
+                });
+
+            // create a new file entry to kick off it
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("copyTo: file onto itself", function() {
+            var file1 = "entry.copy.fos.file1",
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // copy file1 onto itself
+                    runs(function() {
+                        entry.copyTo(root, null, win, itCopy);
+                    });
+
+                    waitsFor(function() { return itCopy.wasCalled; }, "itCopy never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itCopy).toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                    });
+                }),
+                fail = createFail('Entry'),
+                win = createWin('Entry'),
+                itCopy = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
 
-                // cleanup
-                that.deleteEntry(srcDir);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
+                    // cleanup
+                    deleteEntry(file1);
+                });
+
+            // create a new file entry to kick off it
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("copyTo: directory", function() {
+            var file1 = "file1",
+                srcDir = "entry.copy.srcDir",
+                dstDir = "entry.copy.dstDir",
+                dstPath = root.fullPath + '/' + dstDir,
+                filePath = dstPath + '/' + file1,
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    var copyDir = jasmine.createSpy().andCallFake(function(fileEntry) {
+                        // copy srcDir to dstDir
+                        runs(function() {
+                            directory.copyTo(root, dstDir, itCopy, fail);
+                        });
+
+                        waitsFor(function() { return itCopy.wasCalled; }, "itCopy never called", Tests.TEST_TIMEOUT);
+                    });
+
+                    // create a file within new directory
+                    runs(function() {
+                        directory.getFile(file1, {create: true}, copyDir, fail);
+                    });
+
+                    waitsFor(function() { return copyDir.wasCalled; }, "copyDir never called", Tests.TEST_TIMEOUT);
+                }),
+                itCopy = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.fullPath).toBe(dstPath);
+                    expect(directory.name).toBe(dstDir);
+             
+                    runs(function() {
+                        root.getDirectory(dstDir, {create:false}, itDirExists, fail);
+                    });
+
+                    waitsFor(function() { return itDirExists.wasCalled; }, "itDirExists never called", Tests.TEST_TIMEOUT);
+                }),
+                itDirExists = jasmine.createSpy().andCallFake(function(dirEntry) {
+                     expect(dirEntry).toBeDefined();
+                     expect(dirEntry.isFile).toBe(false);
+                     expect(dirEntry.isDirectory).toBe(true);
+                     expect(dirEntry.fullPath).toBe(dstPath);
+                     expect(dirEntry.name).toBe(dstDir);
+                     
+                     runs(function() {
+                         dirEntry.getFile(file1, {create:false}, itFileExists, fail);
+                     });
+
+                     waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+                     runs(function() {
+                         expect(itFileExists).toHaveBeenCalled();
+                         expect(fail).not.toHaveBeenCalled();
+                     });
+                }),
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.isFile).toBe(true);
+                    expect(fileEntry.isDirectory).toBe(false);
+                    expect(fileEntry.fullPath).toBe(filePath);
+                    expect(fileEntry.name).toBe(file1);
 
-        // create a new directory entry to kick off test
-        this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: directory onto itself", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(6);
-        
-        var file1 = "file1",
-            srcDir = "entry.copy.dos.srcDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            filePath = srcPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var copyDir = function(fileEntry) {
-                    // copy srcDir onto itself
-                    directory.copyTo(that.root, null, null, testCopy);                    
-                };
-              // create a file within new directory
-              directory.getFile(file1, {create: true}, copyDir, that.fail);
-            },
-            testCopy = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to copy an entry into its parent if a different name is not specified");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                
-                that.root.getDirectory(srcDir, {create:false}, testDirectoryExists, null);
-            },
-             testDirectoryExists = function(dirEntry) {
-                // returning confirms existence so just check fullPath entry
-                ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "original directory should exist.");
-                equals(dirEntry.fullPath, srcPath, "entry 'fullPath' should be set correctly");
+                    // cleanup
+                    deleteEntry(srcDir);
+                    deleteEntry(dstDir);
+                }),
+                fail = createFail('Entry');
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("copyTo: directory to backup at same root directory", function() {
+            var file1 = "file1",
+                srcDir = "entry.copy.srcDirSame",
+                dstDir = "entry.copy.srcDirSame-backup",
+                dstPath = root.fullPath + '/' + dstDir,
+                filePath = dstPath + '/' + file1,
+                fail = createFail('Entry copyTo: directory to backup at same root'),
+                entryCallback = function(directory) {
+                    var copyDir = function(fileEntry) {
+                        // copy srcDir to dstDir
+                        directory.copyTo(root, dstDir, itCopy, fail);
+                    };
+                    // create a file within new directory
+                    directory.getFile(file1, {create: true}, copyDir, fail);
+                },
+                itCopy = function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.fullPath).toBe(dstPath);
+                    expect(directory.name).toBe(dstDir);
              
-                dirEntry.getFile(file1, {create:false}, testFileExists, null);
-             },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-                
-                // cleanup
-                that.deleteEntry(srcDir);
-                QUnit.start();
-            };
+                    root.getDirectory(dstDir, {create:false}, itDirExists, fail);
+                },
+                itDirExists = function(dirEntry) {
+                     expect(dirEntry).toBeDefined();
+                     expect(dirEntry.isFile).toBe(false);
+                     expect(dirEntry.isDirectory).toBe(true);
+                     expect(dirEntry.fullPath).toBe(dstPath);
+                     expect(dirEntry.name).toBe(dstDir);
+                     
+                     dirEntry.getFile(file1, {create:false}, itFileExists, fail);
+                },
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    var cleanSrc = jasmine.createSpy();
+                    var cleanDst = jasmine.createSpy();
+                    runs(function() {
+                        expect(fileEntry).toBeDefined();
+                        expect(fileEntry.isFile).toBe(true);
+                        expect(fileEntry.isDirectory).toBe(false);
+                        expect(fileEntry.fullPath).toBe(filePath);
+                        expect(fileEntry.name).toBe(file1);
+                        expect(fail).not.toHaveBeenCalled();
 
-        // create a new directory entry to kick off test
-        this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: directory into itself", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-        
-        var srcDir = "entry.copy.dis.srcDir",
-            dstDir = "entry.copy.dis.dstDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            that = this,
-            entryCallback = function(directory) {
-                // copy source directory into itself
-                directory.copyTo(directory, dstDir, null, testCopy);                    
-            },
-            testCopy = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to copy a directory into itself");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                
-                that.root.getDirectory(srcDir, {create:false}, testDirectoryExists, null);
-            },
-            testDirectoryExists = function(dirEntry) {
-                // returning confirms existence so just check fullPath entry
-                ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "original directory should exist.");
-                equals(dirEntry.fullPath, srcPath, "entry 'fullPath' should be set correctly");
-         
-                // cleanup
-                that.deleteEntry(srcDir);
-                QUnit.start();
-            };
+                        // cleanup
+                        deleteEntry(srcDir, cleanSrc);
+                        deleteEntry(dstDir, cleanDst);
+                    });
+
+                    waitsFor(function() { return cleanSrc.wasCalled && cleanDst.wasCalled; }, "cleanSrc and cleanDst cleanup methods", Tests.TEST_TIMEOUT);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists", 10000);
+        });
+        it("copyTo: directory onto itself", function() {
+            var file1 = "file1",
+                srcDir = "entry.copy.dos.srcDir",
+                srcPath = root.fullPath + '/' + srcDir,
+                filePath = srcPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry copyTo: directory onto itself'),
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    var copyDir = jasmine.createSpy().andCallFake(function(fileEntry) {
+                        // copy srcDir onto itself
+                        runs(function() {
+                            directory.copyTo(root, null, win, itCopy); 
+                        });
+
+                        waitsFor(function() { return itCopy.wasCalled; }, "itCopy never called", Tests.TEST_TIMEOUT);
+                    });
+                    // create a file within new directory
+                    runs(function() {
+                        directory.getFile(file1, {create: true}, copyDir, fail);
+                    });
+
+                    waitsFor(function() { return copyDir.wasCalled; }, "copyDir never called", Tests.TEST_TIMEOUT);
+                }),
+                itCopy = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                    
+                    runs(function() { 
+                        root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
+                    });
+
+                    waitsFor(function() { return itDirectoryExists.wasCalled; }, "itDirectoryExists", Tests.TEST_TIMEOUT);
+                }),
+                itDirectoryExists = jasmine.createSpy().andCallFake(function(dirEntry) {
+                    // returning confirms existence so just check fullPath entry
+                    expect(dirEntry).toBeDefined();
+                    expect(dirEntry.fullPath).toBe(srcPath);
+                   
+                    runs(function() {
+                        dirEntry.getFile(file1, {create:false}, itFileExists, fail);
+                    });
+
+                    waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(itFileExists).toHaveBeenCalled();
+                    });
+                }),
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
+                    
+                    // cleanup
+                    deleteEntry(srcDir);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("copyTo: directory into itself", function() {
+            var srcDir = "entry.copy.dis.srcDir",
+                dstDir = "entry.copy.dis.dstDir",
+                fail = createFail('Entry'),
+                win = createWin('Entry'),
+                srcPath = root.fullPath + '/' + srcDir,
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    // copy source directory into itself
+                    runs(function() {
+                        directory.copyTo(directory, dstDir, win, itCopy);
+                    });
+
+                    waitsFor(function() { return itCopy.wasCalled; }, "itCopy", Tests.TEST_TIMEOUT);
+                }),
+                itCopy = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                    
+                    runs(function() {
+                        root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
+                    });
+
+                    waitsFor(function() { return itDirectoryExists.wasCalled; }, "itDirectoryExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itDirectoryExists).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itDirectoryExists = jasmine.createSpy().andCallFake(function(dirEntry) {
+                    // returning confirms existence so just check fullPath entry
+                    expect(dirEntry).toBeDefined();
+                    expect(dirEntry.fullPath).toBe(srcPath);
 
-        // create a new directory entry to kick off test
-        this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: directory that does not exist", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-        
-        var file1 = "entry.copy.dnf.file1", 
-            dstDir = "entry.copy.dnf.dstDir",
-            filePath = this.root.fullPath + '/' + file1,
-            dstPath = this.root.fullPath + '/' + dstDir,
-            that = this,
-            entryCallback = function(entry) {
-                // copy file to target directory that does not exist
-                directory = new DirectoryEntry();
-                directory.fullPath = dstPath;
-                entry.copyTo(directory, null, null, testCopy);                 
-            },
-            testCopy = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to copy to a directory that does not exist");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                that.root.getFile(file1, {create: false}, testFileExists, null);
-            },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original file should exist");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-         
-                // cleanup
-                that.deleteEntry(file1);
-                QUnit.start();
-            };
+                    // cleanup
+                    deleteEntry(srcDir);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("copyTo: directory that does not exist", function() {
+            var file1 = "entry.copy.dnf.file1", 
+                dstDir = "entry.copy.dnf.dstDir",
+                filePath = root.fullPath + '/' + file1,
+                dstPath = root.fullPath + '/' + dstDir,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // copy file to target directory that does not exist
+                    runs(function() {
+                        directory = new DirectoryEntry();
+                        directory.fullPath = dstPath;
+                        entry.copyTo(directory, null, win, itCopy);
+                    });
+
+                    waitsFor(function() { return itCopy.wasCalled; }, "itCopy never called", Tests.TEST_TIMEOUT);
+                }),
+                itCopy = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                    runs(function() {
+                        root.getFile(file1, {create: false}, itFileExists, fail);
+                    });
+
+                    waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itFileExists).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
 
-        // create a new file entry to kick off test
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: invalid target name", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var file1 = "entry.copy.itn.file1",
-            file2 = "bad:file:name",
-            that = this,
-            filePath = this.root.fullPath + '/' + file1,
-            entryCallback = function(entry) {
-                // copy file1 to file2
-                entry.copyTo(that.root, file2, null, testCopy);
-            },
-            testCopy = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "invalid file name should result in error");
-                equal(error.code, FileError.ENCODING_ERR, "error code should be FileError.ENCODING_ERR");
-
-                // cleanup
-                that.deleteEntry(file1);
-                QUnit.start();
-            };
-
-        // create a new file entry
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: file to same parent", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-        
-        var file1 = "entry.move.fsp.file1",
-            file2 = "entry.move.fsp.file2",
-            that = this,
-            srcPath = this.root.fullPath + '/' + file1,
-            dstPath = this.root.fullPath + '/' + file2,
-            entryCallback = function(entry) {
-                // move file1 to file2
-                entry.moveTo(that.root, file2, testMove, that.fail);
-            },
-            testMove = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "file entry should not be null");
-                equals(entry.isFile, true, "entry 'isFile' attribute should be set to true");
-                equals(entry.isDirectory, false, "entry 'isDirectory' attribute should be set to false");
-                equals(entry.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                equals(entry.name, file2, "entry 'name' attribute should be set correctly");
+                    // cleanup
+                    deleteEntry(file1);
+                });
+
+            // create a new file entry to kick off it
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("copyTo: invalid target name", function() {
+            var file1 = "entry.copy.itn.file1",
+                file2 = "bad:file:name",
+                filePath = root.fullPath + '/' + file1,
+                fail = createFail('Entry'),
+                win = createWin('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // copy file1 to file2
+                    runs(function() {
+                        entry.copyTo(root, file2, win, itCopy);
+                    });
+
+                    waitsFor(function() { return itCopy.wasCalled; }, "itCopy never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                        expect(itCopy).toHaveBeenCalled();
+                    });
+                }),
+                itCopy = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.ENCODING_ERR);
+
+                    // cleanup
+                    deleteEntry(file1);
+                });
+
+            // create a new file entry
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: file to same parent", function() {
+            var file1 = "entry.move.fsp.file1",
+                file2 = "entry.move.fsp.file2",
+                srcPath = root.fullPath + '/' + file1,
+                dstPath = root.fullPath + '/' + file2,
+                fail = createFail('Entry'),
+                win = createWin('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // move file1 to file2
+                    runs(function() {
+                        entry.moveTo(root, file2, itMove, fail);
+                    });
+
+                    waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                }),
+                itMove = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.fullPath).toBe(dstPath);
+                    expect(entry.name).toBe(file2);
          
-                that.root.getFile(file2, {create:false}, testMovedExists, null);
-            },
-            testMovedExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "moved file should exist");
-                equals(fileEntry.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-               
-                that.root.getFile(file1, {create:false}, null, testOrig);
-            },
-            testOrig = function(error) {
-                //ok(navigator.fileMgr.testFileExists(srcPath) === false, "original file should not exist.");
-                ok(typeof error !== 'undefined' && error !== null, "it is an error if original file exists after a move");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
+                    runs(function() {
+                        root.getFile(file2, {create:false}, itMovedExists, fail);
+                    });
+
+                    waitsFor(function() { return itMovedExists.wasCalled; }, "itMovedExists never called", Tests.TEST_TIMEOUT);
+                }),
+                itMovedExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(dstPath);
+                           
+                    runs(function() {
+                        root.getFile(file1, {create:false}, win, itOrig);
+                    });
+
+                    waitsFor(function() { return itOrig.wasCalled; }, "itOrig never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(itOrig).toHaveBeenCalled();
+                    });
+                }),
+                itOrig = jasmine.createSpy().andCallFake(function(error) {
+                    //expect(navigator.fileMgr.itFileExists(srcPath) === false, "original file should not exist.");
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
          
+                    // cleanup
+                    deleteEntry(file1);
+                    deleteEntry(file2);
+                });
+
+            // create a new file entry to kick off it
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: file to new parent", function() {
+            var file1 = "entry.move.fnp.file1",
+                dir = "entry.move.fnp.dir",
+                srcPath = root.fullPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                dstPath = root.fullPath + '/' + dir + '/' + file1,
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // move file1 to new directory
+                    var moveFile = jasmine.createSpy().andCallFake(function(directory) {
+                        var itMove = jasmine.createSpy().andCallFake(function(entry) {
+                            expect(entry).toBeDefined();
+                            expect(entry.isFile).toBe(true);
+                            expect(entry.isDirectory).toBe(false);
+                            expect(entry.fullPath).toBe(dstPath);
+                            expect(entry.name).toBe(file1);
+                            // it the moved file exists
+                            runs(function() {
+                                directory.getFile(file1, {create:false}, itMovedExists, fail);
+                            });
+
+                            waitsFor(function() { return itMovedExists.wasCalled; }, "itMovedExists never called", Tests.TEST_TIMEOUT);
+                        });
+                        // move the file
+                        runs(function() {
+                            entry.moveTo(directory, null, itMove, fail);
+                        });
+
+                        waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                    });
          
-                // cleanup
-                that.deleteEntry(file1);
-                that.deleteEntry(file2);
-                QUnit.start();
-            };
-
-        // create a new file entry to kick off test
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: file to new parent", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-        
-        var file1 = "entry.move.fnp.file1",
-            dir = "entry.move.fnp.dir",
-            that = this,
-            srcPath = this.root.fullPath + '/' + file1,
-            dstPath = this.root.fullPath + '/' + dir + '/' + file1,
-            entryCallback = function(entry) {
-                // move file1 to new directory
-                var moveFile = function(directory) {
+                    // create a parent directory to move file to
+                    runs(function() {
+                        root.getDirectory(dir, {create: true}, moveFile, fail);
+                    });
+
+                    waitsFor(function() { return moveFile.wasCalled; }, "moveFile never called", Tests.TEST_TIMEOUT);
+                }),
+                itMovedExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(dstPath);
+                 
+                    runs(function() {
+                        root.getFile(file1, {create:false}, win, itOrig);
+                    });
+
+                    waitsFor(function() { return itOrig.wasCalled; }, "itOrig never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(itOrig).toHaveBeenCalled();
+                    });
+                }),
+                itOrig = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                  
+                    // cleanup
+                    deleteEntry(file1);
+                    deleteEntry(dir);
+                });
+
+            // ensure destination directory is cleaned up first
+            runs(function() {
+                deleteEntry(dir, function() {
+                    // create a new file entry to kick off it
+                    createFile(file1, entryCallback, fail);
+                }, fail);
+            });
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: directory to same parent", function() {
+            var file1 = "file1",
+                srcDir = "entry.move.dsp.srcDir",
+                dstDir = "entry.move.dsp.dstDir",
+                srcPath = root.fullPath + '/' + srcDir,
+                dstPath = root.fullPath + '/' + dstDir,
+                filePath = dstPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    var moveDir = jasmine.createSpy().andCallFake(function(fileEntry) {
+                        // move srcDir to dstDir
+                        runs(function() {
+                            directory.moveTo(root, dstDir, itMove, fail);
+                        });
+
+                        waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                    });
+                    // create a file within directory
+                    runs(function() {
+                        directory.getFile(file1, {create: true}, moveDir, fail);
+                    });
+
+                    waitsFor(function() { return moveDir.wasCalled; }, "moveDir never called", Tests.TEST_TIMEOUT);
+                }),
+                itMove = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.fullPath).toBe(dstPath);
+                    expect(directory.name).toBe(dstDir);
+                    // it that moved file exists in destination dir
                     
-                    var testMove = function(entry) {
-                        ok(typeof entry !== 'undefined' && entry !== null, "file entry should not be null");
-                        equals(entry.isFile, true, "entry 'isFile' attribute should be set to true");
-                        equals(entry.isDirectory, false, "entry 'isDirectory' attribute should be set to false");
-                        equals(entry.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                        equals(entry.name, file1, "entry 'name' attribute should be set correctly");
-                        // test the moved file exists
-                        directory.getFile(file1, {create:false}, testMovedExists, null);
-                    };
-                    // move the file
-                    entry.moveTo(directory, null, testMove, that.fail);
-                };
-         
-                // create a parent directory to move file to
-                that.root.getDirectory(dir, {create: true}, moveFile, that.fail);
-            },
-            testMovedExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "moved file should exist");
-                equals(fileEntry.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-         
-                that.root.getFile(file1, {create:false}, null, testOrig);
-            },
-            testOrig = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error if original file exists after a move");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                
-                // cleanup
-                that.deleteEntry(file1);
-                that.deleteEntry(dir);
-                QUnit.start();
-            };
-
-        // ensure destination directory is cleaned up before test
-        this.deleteEntry(dir, function() {
-            // create a new file entry to kick off test
-            that.createFile(file1, entryCallback, that.fail);            
-        }, this.fail);
-    });
-    test("Entry.moveTo: directory to same parent", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-        
-        var file1 = "file1",
-            srcDir = "entry.move.dsp.srcDir",
-            dstDir = "entry.move.dsp.dstDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            dstPath = this.root.fullPath + '/' + dstDir,
-            filePath = dstPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var moveDir = function(fileEntry) {
-                    // move srcDir to dstDir
-                    directory.moveTo(that.root, dstDir, testMove, that.fail);                    
-                };
-              // create a file within directory
-              directory.getFile(file1, {create: true}, moveDir, that.fail);
-            },
-            testMove = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "new directory entry should not be null");
-                equals(directory.isFile, false, "entry 'isFile' attribute should be false");
-                equals(directory.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                equals(directory.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                equals(directory.name, dstDir, "entry 'name' attribute should be set correctly");
-                // test that moved file exists in destination dir
-                directory.getFile(file1, {create:false}, testMovedExists, null);
-            },
-            testMovedExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "moved file should exist within moved directory");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-                // test that the moved file no longer exists in original dir
-                that.root.getFile(file1, {create:false}, null, testOrig);
-            },
-            testOrig = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error if original file exists after a move");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-         
-                // cleanup
-                that.deleteEntry(srcDir);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
-
-        // ensure destination directory is cleaned up before test
-        this.deleteEntry(dstDir, function() {
-            // create a new directory entry to kick off test
-            that.createDirectory(srcDir, entryCallback, that.fail);
-        }, this.fail);
-    });
-    test("Entry.moveTo: directory to same parent with same name", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-        
-        var file1 = "file1",
-            srcDir = "entry.move.dsp.srcDir",
-            dstDir = "entry.move.dsp.srcDir-backup",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            dstPath = this.root.fullPath + '/' + dstDir,
-            filePath = dstPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var moveDir = function(fileEntry) {
-                    // move srcDir to dstDir
-                    directory.moveTo(that.root, dstDir, testMove, that.fail);                    
-                };
-              // create a file within directory
-              directory.getFile(file1, {create: true}, moveDir, that.fail);
-            },
-            testMove = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "new directory entry should not be null");
-                equals(directory.isFile, false, "entry 'isFile' attribute should be false");
-                equals(directory.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                equals(directory.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                equals(directory.name, dstDir, "entry 'name' attribute should be set correctly");
-                // test that moved file exists in destination dir
-                directory.getFile(file1, {create:false}, testMovedExists, null);
-            },
-            testMovedExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "moved file should exist within moved directory");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-                // test that the moved file no longer exists in original dir
-                that.root.getFile(file1, {create:false}, null, testOrig);
-            },
-            testOrig = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error if original file exists after a move");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-         
-                // cleanup
-                that.deleteEntry(srcDir);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
-
-        // ensure destination directory is cleaned up before test
-        this.deleteEntry(dstDir, function() {
-            // create a new directory entry to kick off test
-            that.createDirectory(srcDir, entryCallback, that.fail);
-        }, this.fail);
-    });
-    test("Entry.moveTo: directory to new parent", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-        
-        var file1 = "file1",
-            srcDir = "entry.move.dnp.srcDir",
-            dstDir = "entry.move.dnp.dstDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            dstPath = this.root.fullPath + '/' + dstDir,
-            filePath = dstPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var moveDir = function(fileEntry) {
-                    // move srcDir to dstDir
-                    directory.moveTo(that.root, dstDir, testMove, that.fail);                    
-                };
-              // create a file within directory
-              directory.getFile(file1, {create: true}, moveDir, that.fail);
-            },
-            testMove = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "new directory entry should not be null");
-                equals(directory.isFile, false, "entry 'isFile' attribute should be false");
-                equals(directory.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                equals(directory.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                equals(directory.name, dstDir, "entry 'name' attribute should be set correctly");
-                // test that moved file exists in destination dir
-                directory.getFile(file1, {create:false}, testMovedExists, null);
-            },
-            testMovedExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "moved file should exist within moved directory");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-                // test that the moved file no longer exists in original dir
-                that.root.getFile(file1, {create:false}, null, testOrig);
-            },
-            testOrig = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error if original file exists after a move");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                
-                // cleanup
-                that.deleteEntry(srcDir);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
-
-        // ensure destination directory is cleaned up before test
-        this.deleteEntry(dstDir, function() {
-            // create a new directory entry to kick off test
-            that.createDirectory(srcDir, entryCallback, that.fail);
-        }, this.fail);
-    });
-    test("Entry.moveTo: directory onto itself", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(6);
-        
-        var file1 = "file1",
-            srcDir = "entry.move.dos.srcDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            filePath = srcPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var moveDir = function(fileEntry) {
-                    // move srcDir onto itself
-                    directory.moveTo(that.root, null, null, testMove);                    
-                };
-              // create a file within new directory
-              directory.getFile(file1, {create: true}, moveDir, that.fail);
-            },
-            testMove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to move an entry into its parent if a different name is not specified");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                
-                // test that original dir still exists
-                that.root.getDirectory(srcDir, {create:false}, testDirectoryExists, null);
-            },
-            testDirectoryExists = function(dirEntry) {
-                // returning confirms existence so just check fullPath entry
-                ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "original directory should exist.");
-                equals(dirEntry.fullPath, srcPath, "entry 'fullPath' should be set correctly");
-         
-                dirEntry.getFile(file1, {create:false}, testFileExists, null);
-            },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-                        
-                // cleanup
-                that.deleteEntry(srcDir);
-                QUnit.start();
-            };
-
-        // create a new directory entry to kick off test
-        this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: directory into itself", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-        
-        var srcDir = "entry.move.dis.srcDir",
-            dstDir = "entry.move.dis.dstDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            that = this,
-            entryCallback = function(directory) {
-                // move source directory into itself
-                directory.moveTo(directory, dstDir, null, testMove);                    
-            },
-            testMove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to move a directory into itself");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                // make sure original directory still exists
-                that.root.getDirectory(srcDir, {create:false}, testDirectoryExists, null);
-            },
-            testDirectoryExists = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "original directory should exist.");
-                equals(entry.fullPath, srcPath, "entry 'fullPath' should be set correctly");
-         
-                // cleanup
-                that.deleteEntry(srcDir);
-                QUnit.start();
-            };
-
-        // create a new directory entry to kick off test
-        this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: file onto itself", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-        
-        var file1 = "entry.move.fos.file1",
-            filePath = this.root.fullPath + '/' + file1,
-            that = this,
-            entryCallback = function(entry) {
-                // move file1 onto itself
-                entry.moveTo(that.root, null, null, testMove);
-            },
-            testMove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to move an entry into its parent if a different name is not specified");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                
-                //test that original file still exists
-                that.root.getFile(file1, {create:false}, testFileExists, null);
-            },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
+                    runs(function() {
+                        directory.getFile(file1, {create:false}, itMovedExists, fail);
+                    });
+
+                    waitsFor(function() { return itMovedExists.wasCalled; }, "itMovedExists never called", Tests.TEST_TIMEOUT);
+                }),
+                itMovedExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
+
+                    // check that the moved file no longer exists in original dir
+                    runs(function() {
+                        root.getFile(file1, {create:false}, win, itOrig);
+                    });
+
+                    waitsFor(function() { return itOrig.wasCalled; }, "itOrig never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(itOrig).toHaveBeenCalled();
+                    });
+                }),
+                itOrig = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+             
+                    // cleanup
+                    deleteEntry(srcDir);
+                    deleteEntry(dstDir);
+                });
+
+            // ensure destination directory is cleaned up before it
+            runs(function() {
+                deleteEntry(dstDir, function() {
+                    // create a new directory entry to kick off it
+                    createDirectory(srcDir, entryCallback, fail);
+                }, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCAllback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: directory to same parent with same name", function() {
+            var file1 = "file1",
+                srcDir = "entry.move.dsp.srcDir",
+                dstDir = "entry.move.dsp.srcDir-backup",
+                srcPath = root.fullPath + '/' + srcDir,
+                dstPath = root.fullPath + '/' + dstDir,
+                filePath = dstPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    var moveDir = jasmine.createSpy().andCallFake(function(fileEntry) {
+                        // move srcDir to dstDir
+                        runs(function() {
+                            directory.moveTo(root, dstDir, itMove, fail);
+                        });
+
+                        waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                    });
+                    // create a file within directory
+                    runs(function() {
+                        directory.getFile(file1, {create: true}, moveDir, fail);
+                    });
+
+                    waitsFor(function() { return moveDir.wasCalled; }, "moveDir never called", Tests.TEST_TIMEOUT);
+                }),
+                itMove = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.fullPath).toBe(dstPath);
+                    expect(directory.name).toBe(dstDir);
+                    // check that moved file exists in destination dir
+                    runs(function() {
+                        directory.getFile(file1, {create:false}, itMovedExists, null);
+                    });
+
+                    waitsFor(function() { return itMovedExists.wasCalled; }, "itMovedExists never called", Tests.TEST_TIMEOUT);
+                }),
+                itMovedExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
+                    // check that the moved file no longer exists in original dir
+                    runs(function() {
+                        root.getFile(file1, {create:false}, win, itOrig);
+                    });
+
+                    waitsFor(function() { return itOrig.wasCalled; }, "itOrig never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(itOrig).toHaveBeenCalled();
+                    });
+                }),
+                itOrig = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+             
+                    // cleanup
+                    deleteEntry(srcDir);
+                    deleteEntry(dstDir);
+                });
+
+            // ensure destination directory is cleaned up before it
+            runs(function() {
+                deleteEntry(dstDir, function() {
+                    // create a new directory entry to kick off it
+                    createDirectory(srcDir, entryCallback, fail);
+                }, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: directory to new parent", function() {
+            var file1 = "file1",
+                srcDir = "entry.move.dnp.srcDir",
+                dstDir = "entry.move.dnp.dstDir",
+                srcPath = root.fullPath + '/' + srcDir,
+                dstPath = root.fullPath + '/' + dstDir,
+                filePath = dstPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    var moveDir = jasmine.createSpy().andCallFake(function(fileEntry) {
+                        // move srcDir to dstDir
+                        runs(function() {
+                            directory.moveTo(root, dstDir, itMove, fail);
+                        });
+
+                        waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                    });
+                    // create a file within directory
+                    runs(function() {
+                        directory.getFile(file1, {create: true}, moveDir, fail);
+                    });
+
+                    waitsFor(function() { return moveDir.wasCalled; }, "moveDir never called", Tests.TEST_TIMEOUT);
+                }),
+                itMove = jasmine.createSpy().andCallFake(function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.fullPath).toBe(dstPath);
+                    expect(directory.name).toBe(dstDir);
+                    // it that moved file exists in destination dir
+                    runs(function() {
+                        directory.getFile(file1, {create:false}, itMovedExists, fail);
+                    });
+
+                    waitsFor(function() { return itMovedExists.wasCalled; }, "itMovedExists never called", Tests.TEST_TIMEOUT);
+                }),
+                itMovedExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
+                    // it that the moved file no longer exists in original dir
+                    runs(function() {
+                        root.getFile(file1, {create:false}, win, itOrig);
+                    });
+
+                    waitsFor(function() { return itOrig.wasCalled; }, "itOrig never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(itOrig).toHaveBeenCalled();
+                    });
+                }),
+                itOrig = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                  
+                    // cleanup
+                    deleteEntry(srcDir);
+                    deleteEntry(dstDir);
+                });
+
+            // ensure destination directory is cleaned up before it
+            runs(function() {
+                deleteEntry(dstDir, function() {
+                    // create a new directory entry to kick off it
+                    createDirectory(srcDir, entryCallback, fail);
+                }, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: directory onto itself", function() {
+            var file1 = "file1",
+                srcDir = "entry.move.dos.srcDir",
+                srcPath = root.fullPath + '/' + srcDir,
+                filePath = srcPath + '/' + file1,
+                fail = createFail('Entry'),
+                win = createWin('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    var moveDir = jasmine.createSpy().andCallFake(function(fileEntry) {
+                        // move srcDir onto itself
+                        runs(function() {
+                            directory.moveTo(root, null, win, itMove);
+                        });
+
+                        waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                    });
+                    // create a file within new directory
+                    runs(function() {
+                        directory.getFile(file1, {create: true}, moveDir, fail);
+                    });
+
+                    waitsFor(function() { return moveDir.wasCalled; }, "moveDir never called", Tests.TEST_TIMEOUT);
+                }),
+                itMove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                     
+                    // it that original dir still exists
+                    runs(function() {
+                        root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
+                    });
+
+                    waitsFor(function() { return itDirectoryExists.wasCalled; }, "itDirectoryExists", Tests.TEST_TIMEOUT);
+                }),
+                itDirectoryExists = jasmine.createSpy().andCallFake(function(dirEntry) {
+                    // returning confirms existence so just check fullPath entry
+                    expect(dirEntry).toBeDefined();
+                    expect(dirEntry.fullPath).toBe(srcPath);
+                 
+                    runs(function() {
+                        dirEntry.getFile(file1, {create:false}, itFileExists, fail);
+                    });
+
+                    waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itFileExists).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
+                    
+                    // cleanup
+                    deleteEntry(srcDir);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: directory into itself", function() {
+            var srcDir = "entry.move.dis.srcDir",
+                dstDir = "entry.move.dis.dstDir",
+                srcPath = root.fullPath + '/' + srcDir,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(directory) {
+                    // move source directory into itself
+                    runs(function() {
+                        directory.moveTo(directory, dstDir, win, itMove);
+                    });
+
+                    waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                }),
+                itMove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                    // make sure original directory still exists
+                    runs(function() {
+                        root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
+                    });
+
+                    waitsFor(function() { return itDirectoryExists.wasCalled; }, "itDirectoryExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(fail).not.toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                        expect(itDirectoryExists).toHaveBeenCalled();
+                    });
+                }),
+                itDirectoryExists = jasmine.createSpy().andCallFake(function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.fullPath).toBe(srcPath);
+                 
+                    // cleanup
+                    deleteEntry(srcDir);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: file onto itself", function() {
+            var file1 = "entry.move.fos.file1",
+                filePath = root.fullPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = jasmine.createSpy().andCallFake(function(entry) {
+                    // move file1 onto itself
+                    runs(function() {
+                        entry.moveTo(root, null, win, itMove);
+                    });
+
+                    waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+                }),
+                itMove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                    
+                    //it that original file still exists
+                    runs(function() {
+                        root.getFile(file1, {create:false}, itFileExists, fail);
+                    });
+
+                    waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+                    runs(function() {
+                        expect(itFileExists).toHaveBeenCalled();
+                        expect(win).not.toHaveBeenCalled();
+                        expect(fail).not.toHaveBeenCalled();
+                    });
+                }),
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
          
-                // cleanup
-                that.deleteEntry(file1);
-                QUnit.start();
-            };
-
-        // create a new file entry to kick off test
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: file onto existing directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(6);
-        
-        var file1 = "entry.move.fod.file1",
-            dstDir = "entry.move.fod.dstDir",
-            subDir = "subDir",
-            dirPath = this.root.fullPath + '/' + dstDir + '/' + subDir,
-            filePath = this.root.fullPath + '/' + file1,
-            that = this,
-            entryCallback = function(entry) {
-                var createSubDirectory = function(directory) {
-                    var moveFile = function(subDirectory) {
-                        var testMove = function(error) {
-                            ok(typeof error !== 'undefined' && error !== null, "it is an error to move a file onto an existing directory");
-                            equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                            // test that original dir still exists
-                            directory.getDirectory(subDir, {create:false}, testDirectoryExists, null);
+                    // cleanup
+                    deleteEntry(file1);
+                });
+
+            // create a new file entry to kick off it
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return entryCallback.wasCalled; }, "entryCAllback never called", Tests.TEST_TIMEOUT);
+        });
+        it("moveTo: file onto existing directory", function() {
+            var file1 = "entry.move.fod.file1",
+                dstDir = "entry.move.fod.dstDir",
+                subDir = "subDir",
+                dirPath = root.fullPath + '/' + dstDir + '/' + subDir,
+                filePath = root.fullPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = function(entry) {
+                    var createSubDirectory = function(directory) {
+                        var moveFile = function(subDirectory) {
+                            var itMove = function(error) {
+                                expect(error).toBeDefined();
+                                expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                                // check that original dir still exists
+                                directory.getDirectory(subDir, {create:false}, itDirectoryExists, fail);
+                            };
+                            // move file1 onto sub-directory
+                            entry.moveTo(directory, subDir, win, itMove);
                         };
-                        // move file1 onto sub-directory
-                        entry.moveTo(directory, subDir, null, testMove);                    
+                        // create sub-directory 
+                        directory.getDirectory(subDir, {create: true}, moveFile, fail);
                     };
-                    // create sub-directory 
-                    directory.getDirectory(subDir, {create: true}, moveFile, that.fail);                    
-                };
-                // create top level directory 
-                that.root.getDirectory(dstDir, {create: true}, createSubDirectory, that.fail);
-            },
-            testDirectoryExists = function(dirEntry) {
-                ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "original directory contents should exist.");
-                equals(dirEntry.fullPath, dirPath, "entry 'fullPath' should be set correctly");
-                // test that original file still exists
-                that.root.getFile(file1, {create:false},testFileExists, null);
-            },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-
-                // cleanup
-                that.deleteEntry(file1);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
-
-        // ensure destination directory is cleaned up before test
-        this.deleteEntry(dstDir, function() {
-            // create a new file entry to kick off test
-            that.createFile(file1, entryCallback, that.fail);
-        }, this.fail);
-    });
-    test("Entry.moveTo: directory onto existing file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(6);
-        
-        var file1 = "entry.move.dof.file1",
-            srcDir = "entry.move.dof.srcDir",
-            dirPath = this.root.fullPath + '/' + srcDir,
-            filePath = this.root.fullPath + '/' + file1,
-            that = this,
-            entryCallback = function(entry) {
+                    // create top level directory 
+                    root.getDirectory(dstDir, {create: true}, createSubDirectory, fail);
+                },
+                itDirectoryExists = function(dirEntry) {
+                    expect(dirEntry).toBeDefined();
+                    expect(dirEntry.fullPath).toBe(dirPath);
+                    // check that original file still exists
+                    root.getFile(file1, {create:false},itFileExists, fail);
+                },
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
+
+                    // cleanup
+                    deleteEntry(file1);
+                    deleteEntry(dstDir);
+                });
+
+            // ensure destination directory is cleaned up before it
+            runs(function() {
+                deleteEntry(dstDir, function() {
+                    // create a new file entry to kick off it
+                    createFile(file1, entryCallback, fail);
+                }, fail);
+            });
+
+            waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+            
+            runs(function() {
+                expect(itFileExists).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("moveTo: directory onto existing file", function() {
+            var file1 = "entry.move.dof.file1",
+                srcDir = "entry.move.dof.srcDir",
+                dirPath = root.fullPath + '/' + srcDir,
+                filePath = root.fullPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = function(entry) {
                     var moveDir = function(fileEntry) {
                         // move directory onto file
-                        entry.moveTo(that.root, file1, null, testMove);                    
+                        entry.moveTo(root, file1, win, itMove);
                     };
-                // create file
-                that.root.getFile(file1, {create: true}, moveDir, that.fail);
-            },
-            testMove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to move a directory onto an existing file");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                // test that original directory exists
-                that.root.getDirectory(srcDir, {create:false}, testDirectoryExists, null);
-            },
-            testDirectoryExists = function(dirEntry) {
-                // returning confirms existence so just check fullPath entry
-                ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "original directory should exist.");
-                equals(dirEntry.fullPath, dirPath, "entry 'fullPath' should be set correctly");
-                // test that original file exists
-                that.root.getFile(file1, {create:false}, testFileExists, null);
-            },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-         
+                    // create file
+                    root.getFile(file1, {create: true}, moveDir, fail);
+                },
+                itMove = function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                    // it that original directory exists
+                    root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
+                },
+                itDirectoryExists = function(dirEntry) {
+                    // returning confirms existence so just check fullPath entry
+                    expect(dirEntry).toBeDefined();
+                    expect(dirEntry.fullPath).toBe(dirPath);
+                    // it that original file exists
+                    root.getFile(file1, {create:false}, itFileExists, fail);
+                },
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
          
-                // cleanup
-                that.deleteEntry(file1);
-                that.deleteEntry(srcDir);
-                QUnit.start();
-            };
-
-          // create a new directory entry to kick off test
-          this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.copyTo: directory onto existing file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(6);
-        
-        var file1 = "entry.copy.dof.file1",
-            srcDir = "entry.copy.dof.srcDir",
-            dirPath = this.root.fullPath + '/' + srcDir,
-            filePath = this.root.fullPath + '/' + file1,
-            that = this,
-            entryCallback = function(entry) {
+                    // cleanup
+                    deleteEntry(file1);
+                    deleteEntry(srcDir);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itFileExists).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("copyTo: directory onto existing file", function() {
+            var file1 = "entry.copy.dof.file1",
+                srcDir = "entry.copy.dof.srcDir",
+                dirPath = root.fullPath + '/' + srcDir,
+                filePath = root.fullPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = function(entry) {
                     var copyDir = function(fileEntry) {
                         // move directory onto file
-                        entry.copyTo(that.root, file1, null, testMove);                    
-                    };
-                // create file
-                that.root.getFile(file1, {create: true}, copyDir, that.fail);
-            },
-            testMove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to copy a directory onto an existing file");
-                equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
-                //test that original dir still exists
-                that.root.getDirectory(srcDir, {create:false}, testDirectoryExists, null);
-            },
-            testDirectoryExists = function(dirEntry) {
-                // returning confirms existence so just check fullPath entry
-                ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "original directory should exist.");
-                equals(dirEntry.fullPath, dirPath, "entry 'fullPath' should be set correctly");
-                // test that original file still exists
-                that.root.getFile(file1, {create:false}, testFileExists, null);
-            },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
-         
-                // cleanup
-                that.deleteEntry(file1);
-                that.deleteEntry(srcDir);
-                QUnit.start();
-            };
-
-          // create a new directory entry to kick off test
-          this.createDirectory(srcDir, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: directory onto directory that is not empty", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(6);
-        
-        var srcDir = "entry.move.dod.srcDir",
-            dstDir = "entry.move.dod.dstDir",
-            subDir = "subDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            dstPath = this.root.fullPath + '/' + dstDir + '/' + subDir,
-            that = this,
-            entryCallback = function(entry) {
-                var createSubDirectory = function(directory) {
-                    var moveDir = function(subDirectory) {
-                        // move srcDir onto dstDir (not empty)
-                        entry.moveTo(that.root, dstDir, null, testMove);                    
+                        entry.copyTo(root, file1, win, itMove);
                     };
-                    var testMove = function(error) {
-                        ok(typeof error !== 'undefined' && error !== null, "it is an error to move a directory onto a directory that is not empty");
-                        equal(error.code, FileError.INVALID_MODIFICATION_ERR, "error code should be FileError.INVALID_MODIFICATION_ERR");
+                    // create file
+                    root.getFile(file1, {create: true}, copyDir, fail);
+                },
+                itMove = function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                    //check that original dir still exists
+                    root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
+                },
+                itDirectoryExists = function(dirEntry) {
+                    // returning confirms existence so just check fullPath entry
+                    expect(dirEntry).toBeDefined();
+                    expect(dirEntry.fullPath).toBe(dirPath);
+                    // it that original file still exists
+                    root.getFile(file1, {create:false}, itFileExists, fail);
+                },
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
          
-                        // test that destination directory still exists
-                        directory.getDirectory(subDir, {create:false}, testDirectoryExists, null);
+                    // cleanup
+                    deleteEntry(file1);
+                    deleteEntry(srcDir);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createDirectory(srcDir, entryCallback, fail);
+            });
+
+            waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itFileExists).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("moveTo: directory onto directory that is not empty", function() {
+            var srcDir = "entry.move.dod.srcDir",
+                dstDir = "entry.move.dod.dstDir",
+                subDir = "subDir",
+                srcPath = root.fullPath + '/' + srcDir,
+                dstPath = root.fullPath + '/' + dstDir + '/' + subDir,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = function(entry) {
+                    var createSubDirectory = function(directory) {
+                        var moveDir = function(subDirectory) {
+                            // move srcDir onto dstDir (not empty)
+                            entry.moveTo(root, dstDir, win, itMove);
+                        };
+                        var itMove = function(error) {
+                            expect(error).toBeDefined();
+                            expect(error.code).toBe(FileError.INVALID_MODIFICATION_ERR);
+                     
+                            // it that destination directory still exists
+                            directory.getDirectory(subDir, {create:false}, itDirectoryExists, fail);
+                        };
+                        // create sub-directory 
+                        directory.getDirectory(subDir, {create: true}, moveDir, fail);
                     };
-                    // create sub-directory 
-                    directory.getDirectory(subDir, {create: true}, moveDir, that.fail);                    
-                };
-                // create top level directory 
-                that.root.getDirectory(dstDir, {create: true}, createSubDirectory, that.fail);
-            },
-            testDirectoryExists = function(dirEntry) {
-                // returning confirms existence so just check fullPath entry
-                ok(typeof dirEntry !== 'undefined' && dirEntry !== null, "original directory should exist.");
-                equals(dirEntry.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                // test that source directory exists
-                that.root.getDirectory(srcDir,{create:false}, testSrcDirectoryExists, null);
-            },
-            testSrcDirectoryExists = function(srcEntry){
-                ok(typeof srcEntry !== 'undefined' && srcEntry !== null, "original directory should exist.");
-                equals(srcEntry.fullPath, srcPath, "entry 'fullPath' should be set correctly");
-                // cleanup
-                that.deleteEntry(srcDir);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
-
-        // ensure destination directory is cleaned up before test
-        this.deleteEntry(dstDir, function() {
-            // create a new file entry to kick off test
-            that.createDirectory(srcDir, entryCallback, that.fail);
-        }, this.fail);
-    });
-    test("Entry.moveTo: file replace existing file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-        
-        var file1 = "entry.move.frf.file1",
-            file2 = "entry.move.frf.file2",
-            file1Path = this.root.fullPath + '/' + file1,
-            file2Path = this.root.fullPath + '/' + file2,
-            that = this,
-            entryCallback = function(entry) {
+                    // create top level directory 
+                    root.getDirectory(dstDir, {create: true}, createSubDirectory, fail);
+                },
+                itDirectoryExists = function(dirEntry) {
+                    // returning confirms existence so just check fullPath entry
+                    expect(dirEntry).toBeDefined();
+                    expect(dirEntry.fullPath).toBe(dstPath);
+                    // it that source directory exists
+                    root.getDirectory(srcDir,{create:false}, itSrcDirectoryExists, fail);
+                },
+                itSrcDirectoryExists = jasmine.createSpy().andCallFake(function(srcEntry){
+                    expect(srcEntry).toBeDefined();
+                    expect(srcEntry.fullPath).toBe(srcPath);
+                    // cleanup
+                    deleteEntry(srcDir);
+                    deleteEntry(dstDir);
+                });
+
+            // ensure destination directory is cleaned up before it
+            runs(function() {
+                deleteEntry(dstDir, function() {
+                    // create a new file entry to kick off it
+                    createDirectory(srcDir, entryCallback, fail);
+                }, fail);
+            });
+
+            waitsFor(function() { return itSrcDirectoryExists.wasCalled; }, "itSrcDirectoryExists never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itSrcDirectoryExists).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("moveTo: file replace existing file", function() {
+            var file1 = "entry.move.frf.file1",
+                file2 = "entry.move.frf.file2",
+                file1Path = root.fullPath + '/' + file1,
+                file2Path = root.fullPath + '/' + file2,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = function(entry) {
                     var moveFile = function(fileEntry) {
                         // replace file2 with file1
-                        entry.moveTo(that.root, file2, testMove, that.fail);                    
+                        entry.moveTo(root, file2, itMove, fail);
                     };
-                // create file
-                that.root.getFile(file2, {create: true}, moveFile, that.fail);
-            },
-         testMove = function(entry) {
-                ok(typeof entry !== 'undefined' && entry !== null, "file entry should not be null")
-                equals(entry.isFile, true, "entry 'isFile' attribute should be true");
-                equals(entry.isDirectory, false, "entry 'isDirectory' attribute should be false");
-                equals(entry.fullPath, file2Path, "entry 'fullPath' should be set correctly");
-                equals(entry.name, file2, "entry 'name' attribute should be set correctly");
-                
-                // test that old file does not exists
-                that.root.getFile(file1, {create:false}, null, testFileMoved);
-            },
-         testFileMoved = function(error){
-                ok(typeof error !== 'undefined' && error !== null, "it is an error if original file exists after a move");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                // test that new file exists
-                that.root.getFile(file2, {create:false}, testFileExists, null);
-            },
-         testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, file2Path, "entry 'fullPath' should be set correctly");
-         
-                // cleanup
-                that.deleteEntry(file1);
-                that.deleteEntry(file2);
-                QUnit.start();
-            };
-
-          // create a new directory entry to kick off test
-          this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: directory replace empty directory", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(9);
-        
-        var file1 = "file1",
-            srcDir = "entry.move.drd.srcDir",
-            dstDir = "entry.move.drd.dstDir",
-            srcPath = this.root.fullPath + '/' + srcDir,
-            dstPath = this.root.fullPath + '/' + dstDir,
-            filePath = dstPath + '/' + file1,
-            that = this,
-            entryCallback = function(directory) {
-                var mkdir = function(fileEntry) {
-                    // create destination directory
-                    that.root.getDirectory(dstDir, {create: true}, moveDir, that.fail);
-                };
-                var moveDir = function(fileEntry) {
-                    // move srcDir to dstDir
-                    directory.moveTo(that.root, dstDir, testMove, that.fail);                    
-                };
-              // create a file within source directory
-              directory.getFile(file1, {create: true}, mkdir, that.fail);
-            },
-            testMove = function(directory) {
-                ok(typeof directory !== 'undefined' && directory !== null, "new directory entry should not be null");
-                equals(directory.isFile, false, "entry 'isFile' attribute should be false");
-                equals(directory.isDirectory, true, "entry 'isDirectory' attribute should be true");
-                equals(directory.fullPath, dstPath, "entry 'fullPath' should be set correctly");
-                equals(directory.name, dstDir, "entry 'name' attribute should be set correctly");
-                // test that old directory contents have been moved
-                directory.getFile(file1, {create:false}, testFileExists, null);
-            },
-            testFileExists = function(fileEntry) {
-                ok(typeof fileEntry !== 'undefined' && fileEntry !== null, "original directory contents should exist.");
-                equals(fileEntry.fullPath, filePath, "entry 'fullPath' should be set correctly");
+                    // create file
+                    root.getFile(file2, {create: true}, moveFile,fail);
+                },
+                itMove = function(entry) {
+                    expect(entry).toBeDefined();
+                    expect(entry.isFile).toBe(true);
+                    expect(entry.isDirectory).toBe(false);
+                    expect(entry.fullPath).toBe(file2Path);
+                    expect(entry.name).toBe(file2);
+                    
+                    // it that old file does not exists
+                    root.getFile(file1, {create:false}, win, itFileMoved);
+                },
+                itFileMoved = function(error){
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                    // it that new file exists
+                    root.getFile(file2, {create:false}, itFileExists, fail);
+                },
+                itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(file2Path);
          
-                // test that old directory no longer exists
-                that.root.getDirectory(srcDir, {create:false}, null, testRemoved);
-            },
-            testRemoved = function(error){
-                ok(typeof error !== 'undefined' && error !== null, "it is an error if original file exists after a move");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                
-                // cleanup
-                that.deleteEntry(srcDir);
-                that.deleteEntry(dstDir);
-                QUnit.start();
-            };
-
-        // ensure destination directory is cleaned up before test
-        this.deleteEntry(dstDir, function() {
-            // create a new directory entry to kick off test
-            that.createDirectory(srcDir, entryCallback, that.fail);
-        }, this.fail);
-    });
-    test("Entry.moveTo: directory that does not exist", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var file1 = "entry.move.dnf.file1", 
-            dstDir = "entry.move.dnf.dstDir",
-            filePath = this.root.fullPath + '/' + file1,
-            dstPath = this.root.fullPath + '/' + dstDir,
-            that = this,
-            entryCallback = function(entry) {
-                // move file to directory that does not exist
-                directory = new DirectoryEntry();
-                directory.fullPath = dstPath;
-                entry.moveTo(directory, null, null, testMove);                 
-            },
-            testMove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "it is an error to move to a directory that does not exist");
-                equal(error.code, FileError.NOT_FOUND_ERR, "error code should be FileError.NOT_FOUND_ERR");
-                
-                // cleanup
-                that.deleteEntry(file1);
-                QUnit.start();
-            };
-
-        // create a new file entry to kick off test
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    test("Entry.moveTo: invalid target name", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var file1 = "entry.move.itn.file1",
-            file2 = "bad:file:name",
-            that = this,
-            filePath = this.root.fullPath + '/' + file1,
-            entryCallback = function(entry) {
-                // move file1 to file2
-                entry.moveTo(that.root, file2, null, testMove);
-            },
-            testMove = function(error) {
-                ok(typeof error !== 'undefined' && error !== null, "invalid file name should result in error");
-                equal(error.code, FileError.ENCODING_ERR, "error code should be FileError.ENCODING_ERR");
-
-                // cleanup
-                that.deleteEntry(file1);
-                QUnit.start();
-            };
-
-        // create a new file entry to kick off test
-        this.createFile(file1, entryCallback, this.fail);
-    });
-    module('FileReader model');
-    test("FileReader object should have correct methods", function() {
-        expect(6);
-        var reader = new FileReader();
-        ok(reader !== null, "new FileReader() should not be null.");
-        ok(typeof reader.readAsBinaryString === 'function', "FileReader object should have a readAsBinaryString function.");
-        ok(typeof reader.readAsDataURL === 'function', "FileReader object should have a readAsDataURL function.");
-        ok(typeof reader.readAsText === 'function', "FileReader object should have a readAsText function.");
-        ok(typeof reader.readAsArrayBuffer === 'function', "FileReader object should have a readAsArrayBuffer function.");
-        ok(typeof reader.abort === 'function', "FileReader object should have an abort function.");
-    });
-    module('FileReader read', {
-        setup: function() {
-            this.root = getFileSystemRoot(); 
-            this.fail = function(error) {
-                console.log('file error: ' + error.code);
-            };            
-        }
-    });
-    test("should read file properly, File object", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(1);
+                    // cleanup
+                    deleteEntry(file1);
+                    deleteEntry(file2);
+                });
+
+            // create a new directory entry to kick off it
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itFileExists).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("moveTo: directory replace empty directory", function() {
+            var file1 = "file1",
+                srcDir = "entry.move.drd.srcDir",
+                dstDir = "entry.move.drd.dstDir",
+                srcPath = root.fullPath + '/' + srcDir,
+                dstPath = root.fullPath + '/' + dstDir,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                filePath = dstPath + '/' + file1,
+                entryCallback = function(directory) {
+                    var mkdir = function(fileEntry) {
+                        // create destination directory
+                        root.getDirectory(dstDir, {create: true}, moveDir, fail);
+                    };
+                    var moveDir = function(fileEntry) {
+                        // move srcDir to dstDir
+                        directory.moveTo(root, dstDir, itMove, fail);
+                    };
+                    // create a file within source directory
+                    directory.getFile(file1, {create: true}, mkdir, fail);
+                },
+                itMove = function(directory) {
+                    expect(directory).toBeDefined();
+                    expect(directory.isFile).toBe(false);
+                    expect(directory.isDirectory).toBe(true);
+                    expect(directory.fullPath).toBe(dstPath);
+                    expect(directory.name).toBe(dstDir);
+                    // check that old directory contents have been moved
+                    directory.getFile(file1, {create:false}, itFileExists, fail);
+                },
+                itFileExists = function(fileEntry) {
+                    expect(fileEntry).toBeDefined();
+                    expect(fileEntry.fullPath).toBe(filePath);
+                 
+                    // check that old directory no longer exists
+                    root.getDirectory(srcDir, {create:false}, win, itRemoved);
+                },
+                itRemoved = jasmine.createSpy().andCallFake(function(error){
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
+                    
+                    // cleanup
+                    deleteEntry(srcDir);
+                    deleteEntry(dstDir);
+                });
+
+            // ensure destination directory is cleaned up before it
+            runs(function() {
+                deleteEntry(dstDir, function() {
+                    // create a new directory entry to kick off it
+                    createDirectory(srcDir, entryCallback, fail);
+                }, fail);
+            });
+
+            waitsFor(function() { return itRemoved.wasCalled; }, "itRemoved never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itRemoved).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("moveTo: directory that does not exist", function() {
+            var file1 = "entry.move.dnf.file1", 
+                dstDir = "entry.move.dnf.dstDir",
+                filePath = root.fullPath + '/' + file1,
+                dstPath = root.fullPath + '/' + dstDir,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = function(entry) {
+                    // move file to directory that does not exist
+                    directory = new DirectoryEntry();
+                    directory.fullPath = dstPath;
+                    entry.moveTo(directory, null, win, itMove);
+                },
+                itMove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.NOT_FOUND_ERR);
             
+                    // cleanup
+                    deleteEntry(file1);
+                });
+
+            // create a new file entry to kick off it
+            runs(function() {
+                createFile(file1, entryCallback, fail);
+            });
+
+            waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itMove).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("moveTo: invalid target name", function() {
+            var file1 = "entry.move.itn.file1",
+                file2 = "bad:file:name",
+                filePath = root.fullPath + '/' + file1,
+                win = createWin('Entry'),
+                fail = createFail('Entry'),
+                entryCallback = function(entry) {
+                    // move file1 to file2
+                    entry.moveTo(root, file2, win, itMove);
+                },
+                itMove = jasmine.createSpy().andCallFake(function(error) {
+                    expect(error).toBeDefined();
+                    expect(error.code).toBe(FileError.ENCODING_ERR);
+
+                    // cleanup
+                    deleteEntry(file1);
+                });
+
+            // create a new file entry to kick off it
+            runs(function() {
+                createFile(file1,entryCallback, fail);
+            });
+
+            waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(itMove).toHaveBeenCalled();
+                expect(win).not.toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+    });
+
+    describe('FileReader', function() {
+        it("should have correct methods", function() {
+            var reader = new FileReader();
+            expect(reader).toBeDefined();
+            expect(typeof reader.readAsBinaryString).toBe('function');
+            expect(typeof reader.readAsDataURL).toBe('function');
+            expect(typeof reader.readAsText).toBe('function');
+            expect(typeof reader.readAsArrayBuffer).toBe('function');
+            expect(typeof reader.abort).toBe('function');
+        });
+    });
+
+    describe('read method', function(){
+        it("should read file properly, File object", function() {
             // path of file
-        var fileName = "reader.txt",
-            filePath = this.root.fullPath + '/' + fileName;
-            // file content
-            rule = "There is an exception to every rule.  Except this one.",
-            // creates a FileWriter object
-            create_writer = function(fileEntry) {
-                fileEntry.createWriter(write_file, this.fail);
-            },
-            // writes file and reads it back in
-            write_file = function(writer) {
-                writer.onwriteend = read_file; 
-                writer.write(rule);
-            },
-            // reads file and compares content to what was written
-            read_file = function(evt) {
-                var reader = new FileReader();
-                reader.onloadend = function(evt) {
-                    console.log("read success");
-                    console.log(evt.target.result);
-                    ok(evt.target.result === rule, "reader.result should be equal to the text written.");
-                    QUnit.start();
+            var fileName = "reader.txt",
+                // file content
+                rule = "There is an exception to every rule.  Except this one.",
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(evt).toBeDefined();
+                    expect(evt.target.result).toBe(rule);
+                }),
+                fail = createFail('FileReader'),
+                filePath = root.fullPath + '/' + fileName;
+                // creates a FileWriter object
+                create_writer = function(fileEntry) {
+                    fileEntry.createWriter(write_file, fail);
+                },
+                // writes file and reads it back in
+                write_file = function(writer) {
+                    writer.onwriteend = read_file;
+                    writer.write(rule);
+                },
+                // reads file and compares content to what was written
+                read_file = function(evt) {
+                    var reader = new FileReader();
+                    reader.onloadend = verifier;
+                    var myFile = new File();
+
+                    myFile.fullPath = filePath; 
+                    reader.readAsText(myFile);
                 };
-                var myFile = new File();
-                myFile.fullPath = filePath; 
-                reader.readAsText(myFile);
-            };
-        
-        // create a file, write to it, and read it in again
-        this.root.getFile(fileName, {create: true}, create_writer, this.fail);
-    });
-    test("should read file properly in Chinese Traditional , File object", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(1);
             
+            // create a file, write to it, and read it in again
+            runs(function() {
+                root.getFile(fileName, {create: true}, create_writer, fail);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).not.toHaveBeenCalled();
+                expect(verifier).toHaveBeenCalled();
+            });
+        });
+        it("should read empty file properly", function() {
             // path of file
-        var fileName = "reader.txt",
-            filePath = this.root.fullPath + '/' + fileName;
-            // file content
-            rule = "每個規則有一個例外。除了這一個",
-            // creates a FileWriter object
-            create_writer = function(fileEntry) {
-                fileEntry.createWriter(write_file, this.fail);
-            },
-            // writes file and reads it back in
-            write_file = function(writer) {
-                writer.onwriteend = read_file; 
-                writer.write(rule);
-            },
-            // reads file and compares content to what was written
-            read_file = function(evt) {
-                var reader = new FileReader();
-                reader.onloadend = function(evt) {
-                    console.log("read success");
-                    console.log(evt.target.result);
-                    ok(evt.target.result === rule, "reader.result should be equal to the text written.");
-                    QUnit.start();
+            var fileName = "empty.txt",
+                filePath = root.fullPath + '/' + fileName;
+                // file content
+                rule = "",
+                fail = createFail('FileReader'),
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(evt).toBeDefined();
+                    expect(evt.target.result).toBe(rule);
+                }),
+                // reads file and compares content to what was written
+                read_file = function(evt) {
+                    var reader = new FileReader();
+                    reader.onloadend = verifier;
+                    var myFile = new File();
+                    myFile.fullPath = filePath; 
+                    reader.readAsText(myFile);
                 };
-                var myFile = new File();
-                myFile.fullPath = filePath; 
-                reader.readAsText(myFile);
-            };
-        
-        // create a file, write to it, and read it in again
-        this.root.getFile(fileName, {create: true}, create_writer, this.fail);
-    });
- 
-    test("should read empty file properly", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(1);
             
-            // path of file
-        var fileName = "empty.txt",
-            filePath = this.root.fullPath + '/' + fileName;
-            // file content
-            rule = "",
-            // reads file and compares content to what was written
-            read_file = function(evt) {
-                var reader = new FileReader();
-                reader.onloadend = function(evt) {
-                    console.log("read success");
-                    console.log(evt.target.result);
-                    ok(evt.target.result === rule, "reader.result should be equal to the empty string.");
-                    QUnit.start();
-                };
-                var myFile = new File();
-                myFile.fullPath = filePath; 
+            // create a file, write to it, and read it in again
+            runs(function() {
+                root.getFile(fileName, {create: true}, read_file, fail);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).not.toHaveBeenCalled();
+                expect(verifier).toHaveBeenCalled();
+            });
+        });
+        it("should error out on non-existent file", function() {
+            var reader = new FileReader();
+            var verifier = jasmine.createSpy().andCallFake(function(evt) {
+                expect(evt).toBeDefined();
+                expect(evt.target.error.code).toBe(FileError.NOT_FOUND_ERR);
+            });
+            reader.onerror = verifier;
+            var myFile = new File();
+            myFile.fullPath = root.fullPath + '/' + "doesnotexist.err"; 
+
+            runs(function() {
                 reader.readAsText(myFile);
-            };
-        
-        // create a file, write to it, and read it in again
-        this.root.getFile(fileName, {create: true}, read_file, this.fail);
-    });
-    test("should error out on non-existent file", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(1);
-            
-        var reader = new FileReader();
-        reader.onerror = function(evt) {
-            console.log("Properly got a file error as no file exists.");
-            ok(evt.target.error.code === 1, "Should throw a NOT_FOUND_ERR.");
-            QUnit.start();
-        }
-        var myFile = new File();
-        myFile.fullPath = this.root.fullPath + '/' + "doesnotexist.err"; 
-        reader.readAsText(myFile);
-    });
-    test("should read file properly, Data URL", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(1);
-            
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+            });
+        });
+        it("should read file properly, Data URL", function() {
             // path of file
-        var fileName = "reader.txt",
-            filePath = this.root.fullPath + '/' + fileName;
-            // file content
-            rule = "There is an exception to every rule.  Except this one.",
-            // creates a FileWriter object
-            create_writer = function(fileEntry) {
-                fileEntry.createWriter(write_file, this.fail);
-            },
-            // writes file and reads it back in
-            write_file = function(writer) {
-                writer.onwriteend = read_file; 
-                writer.write(rule);
-            },
-            // reads file and compares content to what was written
-            read_file = function(evt) {
-                var reader = new FileReader();
-                reader.onloadend = function(evt) {
-                    console.log("read success");
-                    console.log(evt.target.result);
-                    ok(evt.target.result.substr(0,23) === "data:text/plain;base64,", "reader.result should be base64 encoded.");
-                    QUnit.start();
-                };
-                var myFile = new File();
-                myFile.fullPath = filePath; 
-                reader.readAsDataURL(myFile);
-            };
-        
-        // create a file, write to it, and read it in again
-        this.root.getFile(fileName, {create: true}, create_writer, this.fail);
-    });
-    module('FileWriter model', {
-        // setup function will run before each test
-        setup: function() {
-            var that = this;
-            this.root = getFileSystemRoot(); 
-            this.fail = function(error) {
-                console.log('file error: ' + error.code);
-            };
-            // deletes file, if it exists, then invokes callback
-            this.deleteFile = function(fileName, callback) {
-                that.root.getFile(fileName, null, 
-                        // remove file system entry
-                        function(entry) {
-                            entry.remove(callback, that.fail); 
-                        },
-                        // doesn't exist
-                        callback);
-            };
-            // deletes and re-creates the specified file, then invokes callback
-            this.createFile = function(fileName, callback) {
-                // creates file
-                var create_file = function() {
-                    that.root.getFile(fileName, {create: true}, callback, that.fail);                
+            var fileName = "reader.txt",
+                filePath = root.fullPath + '/' + fileName,
+                fail = createFail('FileReader'),
+                // file content
+                rule = "There is an exception to every rule.  Except this one.",
+                // creates a FileWriter object
+                create_writer = function(fileEntry) {
+                    fileEntry.createWriter(write_file, fail);
+                },
+                // writes file and reads it back in
+                write_file = function(writer) {
+                    writer.onwriteend = read_file; 
+                    writer.write(rule);
+                },
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(evt).toBeDefined();
+                    expect(evt.target.result.substr(0,23)).toBe("data:text/plain;base64,");
+                }),
+                // reads file and compares content to what was written
+                read_file = function(evt) {
+                    var reader = new FileReader();
+                    reader.onloadend = verifier;
+                    var myFile = new File();
+                    myFile.fullPath = filePath; 
+                    reader.readAsDataURL(myFile);
                 };
-                
-                // deletes file, then re-creates it
-                that.deleteFile(fileName, create_file);
-            };
-        }
-    });    
-    test("FileWriter object should have correct methods", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        // retrieve a FileWriter object
-        var fileName = "writer.methods",
-            that = this,
-            test_writer = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    ok(typeof writer !== 'undefined' && writer !== null, "FileEntry.createWriter should return a FileWriter object.");
-                    ok(typeof writer.write === 'function', "FileWriter object should have a write function.");
-                    ok(typeof writer.seek === 'function', "FileWriter object should have a seek function.");
-                    ok(typeof writer.truncate === 'function', "FileWriter object should have a truncate function.");
-                    ok(typeof writer.abort === 'function', "FileWriter object should have an abort function.");
+            
+            // create a file, write to it, and read it in again
+            runs(function() {
+                root.getFile(fileName, {create: true}, create_writer, fail);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).not.toHaveBeenCalled();
+                expect(verifier).toHaveBeenCalled();
+            });
+        });
+    });
+
+    describe('FileWriter', function(){
+        it("should have correct methods", function() {
+            // retrieve a FileWriter object
+            var fileName = "writer.methods",
+                fail = createFail('FileWriter'),
+                verifier = jasmine.createSpy().andCallFake(function(writer) {
+                    expect(writer).toBeDefined();
+                    expect(typeof writer.write).toBe('function');
+                    expect(typeof writer.seek).toBe('function');
+                    expect(typeof writer.truncate).toBe('function');
+                    expect(typeof writer.abort).toBe('function');
 
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
-                }, this.fail);
-            };
+                    deleteFile(fileName);
+                }),
+                it_writer = function(fileEntry) {
+                    fileEntry.createWriter(verifier, fail);
+                };
 
-        // test FileWriter
-        this.root.getFile(fileName, {create: true}, test_writer, this.fail);                        
-    });
-    test("should be able to write and append to file, createWriter", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-
-        var that = this,
-            fileName = "writer.append",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = "There is an exception to every rule.",
-            // for testing file length
-            length = rule.length,
-            // writes initial file content
-            write_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        ok(writer.length === length, "should have written " + length + " bytes");
-                        ok(writer.position === length, "position should be at " + length);
-                        append_file(writer);
-                    };
-                    writer.write(rule); 
-                }, that.fail);
-            }, 
-            // appends to file
-            append_file = function(writer) {
-                var exception = "  Except this one.";            
-                writer.onwriteend = function(evt) {
-                    ok(writer.length === length, "file length should be " + length);
-                    ok(writer.position === length, "position should be at " + length);
+            // it FileWriter
+            runs(function() {
+                root.getFile(fileName, {create: true}, it_writer, fail);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).not.toHaveBeenCalled();
+                expect(verifier).toHaveBeenCalled();
+            });
+        });
+        it("should be able to write and append to file, createWriter", function() {
+            var fileName = "writer.append",
+                theWriter,
+                filePath = root.fullPath + '/' + fileName,
+                // file content
+                rule = "There is an exception to every rule.",
+                // for checkin file length
+                length = rule.length,
+                fail = createFail('FileWriter'),
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
+
+                    // append some more stuff
+                    var exception = "  Except this one.";
+                    theWriter.onwriteend = anotherVerifier;
+                    length += exception.length;
+                    theWriter.seek(theWriter.length);
+                    theWriter.write(exception);
+                }),
+                anotherVerifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
 
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
+                    deleteFile(fileName);
+                }),
+                // writes initial file content
+                write_file = function(fileEntry) {
+                    fileEntry.createWriter(function(writer) {
+                        theWriter = writer;
+                        writer.onwriteend = verifier;
+                        writer.write(rule);
+                    }, fail);
                 };
-                length += exception.length;
-                writer.seek(writer.length);
-                writer.write(exception); 
-            };
-        
-        // create file, then write and append to it
-        this.createFile(fileName, write_file);
-    });
-    test("should be able to write and append to file in Chinese Traditional, createWriter", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-
-        var that = this,
-            fileName = "writer.append",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = "每個規則有一個例外。",
-            // for testing file length
-            length = rule.length,
-            // writes initial file content
-            write_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        ok(writer.length === length, "should have written " + length + " bytes");
-                        ok(writer.position === length, "position should be at " + length);
-                        append_file(writer);
-                    };
-                    writer.write(rule); 
-                }, that.fail);
-            }, 
-            // appends to file
-            append_file = function(writer) {
-                var exception = "  除了這一個";            
-                writer.onwriteend = function(evt) {
-                    ok(writer.length === length, "file length should be " + length);
-                    ok(writer.position === length, "position should be at " + length);
+            
+            // create file, then write and append to it
+            runs(function() {
+                createFile(fileName, write_file);
+            });
+
+            waitsFor(function() { return anotherVerifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(fail).not.toHaveBeenCalled();
+                expect(verifier).toHaveBeenCalled();
+                expect(anotherVerifier).toHaveBeenCalled();
+            });
+        });
+        it("should be able to write and append to file, File object", function() {
+            var fileName = "writer.append",
+                theWriter,
+                filePath = root.fullPath + '/' + fileName,
+                // file content
+                rule = "There is an exception to every rule.",
+                // for checking file length
+                length = rule.length,
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
+
+                    // append some more stuff
+                    var exception = "  Except this one.";
+                    theWriter.onwriteend = anotherVerifier;
+                    length += exception.length;
+                    theWriter.seek(theWriter.length);
+                    theWriter.write(exception); 
+                }),
+                anotherVerifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
 
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
+                    deleteFile(fileName);
+                }),
+                // writes initial file content
+                write_file = function(file) {
+                    theWriter = new FileWriter(file);
+                    theWriter.onwriteend = verifier;
+                    theWriter.write(rule);
                 };
-                length += exception.length;
-                writer.seek(writer.length);
-                writer.write(exception); 
-            };
-        
-        // create file, then write and append to it
-        this.createFile(fileName, write_file);
-    });
- 
-    test("should be able to write and append to file, File object", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-
-        var that = this,
-            fileName = "writer.append",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = "There is an exception to every rule.",
-            // for testing file length
-            length = rule.length,
-            // writes initial file content
-            write_file = function(file) {
-                var writer = new FileWriter(file);
-                    writer.onwriteend = function(evt) {
-                        ok(writer.length === length, "should have written " + length + " bytes");
-                        ok(writer.position === length, "position should be at " + length);
-                        append_file(writer);
-                    };
-                    writer.write(rule); 
-            }, 
-            // appends to file
-            append_file = function(writer) {
-                var exception = "  Except this one.";            
-                writer.onwriteend = function(evt) {
-                    ok(writer.length === length, "file length should be " + length);
-                    ok(writer.position === length, "position should be at " + length);
+            
+            // create file, then write and append to it
+            runs(function() {
+                var file = new File();
+                file.fullPath = filePath;
+                write_file(file);
+            });
+
+            waitsFor(function() { return anotherVerifier.wasCalled; }, "verifier", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(anotherVerifier).toHaveBeenCalled();
+            });
+        });
+        it("should be able to seek to the middle of the file and write more data than file.length", function() {
+            var fileName = "writer.seek.write",
+                filePath = root.fullPath + '/' + fileName,
+                theWriter,
+                // file content
+                rule = "This is our sentence.",
+                // for iting file length
+                length = rule.length,
+                fail = createFail('FileWriter'),
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
+
+                    // append some more stuff
+                    var exception = "newer sentence.";
+                    theWriter.onwriteend = anotherVerifier;
+                    length = 12 + exception.length;
+                    theWriter.seek(12);
+                    theWriter.write(exception); 
+                }),
+                anotherVerifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
 
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
+                    deleteFile(fileName);
+                }),
+                // writes initial file content
+                write_file = function(fileEntry) {
+                    fileEntry.createWriter(function(writer) {
+                        theWriter = writer;
+                        theWriter.onwriteend = verifier;
+                        theWriter.write(rule);
+                    }, fail);
                 };
-                length += exception.length;
-                writer.seek(writer.length);
-                writer.write(exception); 
-            };
-        
-        // create file, then write and append to it
-        var file = new File();
-        file.fullPath = filePath;
-        write_file(file);
-    });
-    test("should be able to seek to the middle of the file and write more data than file.length", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-
-        var that = this,
-            fileName = "writer.seek.write",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = "This is our sentence.",
-            // for testing file length
-            length = rule.length,
-            // writes initial file content
-            write_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        ok(writer.length === length, "should have written " + length + " bytes");
-                        ok(writer.position === length, "position should be at " + length);
-                        append_file(writer);
-                    };
-                    writer.write(rule); 
-                }, that.fail);
-            }, 
-            // appends to file
-            append_file = function(writer) {
-                var exception = "newer sentence.";            
-                writer.onwriteend = function(evt) {
-                    ok(writer.length === length, "file length should be " + length);
-                    ok(writer.position === length, "position should be at " + length);
+            
+            // create file, then write and append to it
+            runs(function() {
+                createFile(fileName, write_file);
+            });
+
+            waitsFor(function() { return anotherVerifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(anotherVerifier).toHaveBeenCalled();
+            });
+        });
+        it("should be able to seek to the middle of the file and write less data than file.length", function() {
+            var fileName = "writer.seek.write2",
+                filePath = root.fullPath + '/' + fileName,
+                // file content
+                rule = "This is our sentence.",
+                theWriter,
+                fail = createFail('FileWriter'),
+                // for iting file length
+                length = rule.length,
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
+
+                    // append some more stuff
+                    var exception = "new.";
+                    theWriter.onwriteend = anotherVerifier;
+                    length = 8 + exception.length;
+                    theWriter.seek(8);
+                    theWriter.write(exception); 
+                }),
+                anotherVerifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
 
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
+                    deleteFile(fileName);
+                }),
+                // writes initial file content
+                write_file = function(fileEntry) {
+                    fileEntry.createWriter(function(writer) {
+                        theWriter = writer;
+                        theWriter.onwriteend = verifier;
+                        theWriter.write(rule);
+                    }, fail);
                 };
-                length = 12 + exception.length;
-                writer.seek(12);
-                writer.write(exception); 
-            };
-        
-        // create file, then write and append to it
-        this.createFile(fileName, write_file);
-    });
-    test("should be able to seek to the middle of the file and write less data than file.length", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(4);
-
-        var that = this,
-            fileName = "writer.seek.write2",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = "This is our sentence.",
-            // for testing file length
-            length = rule.length,
-            // writes initial file content
-            write_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        ok(writer.length === length, "should have written " + length + " bytes");
-                        ok(writer.position === length, "position should be at " + length);
-                        append_file(writer);
-                    };
-                    writer.write(rule); 
-                }, that.fail);
-            }, 
-            // appends to file
-            append_file = function(writer) {
-                var exception = "new.";            
-                writer.onwriteend = function(evt) {
-                    ok(writer.length === length, "file length should be " + length);
-                    ok(writer.position === length, "position should be at " + length);
+            
+            // create file, then write and append to it
+            runs(function() {
+                createFile(fileName, write_file);
+            });
+
+            waitsFor(function() { return anotherVerifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(anotherVerifier).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("should be able to write XML data", function() {
+            var fileName = "writer.xml",
+                filePath = root.fullPath + '/' + fileName,
+                fail = createFail('FileWriter'),
+                theWriter,
+                // file content
+                rule = '<?xml version="1.0" encoding="UTF-8"?>\n<it prop="ack">\nData\n</it>\n',
+                // for iting file length
+                length = rule.length,
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
 
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
+                    deleteFile(fileName);
+                }),
+                // writes file content
+                write_file = function(fileEntry) {
+                    fileEntry.createWriter(function(writer) {
+                        theWriter = writer;
+                        theWriter.onwriteend = verifier;
+                        theWriter.write(rule);
+                    }, fail);
                 };
-                length = 8 + exception.length;
-                writer.seek(8);
-                writer.write(exception); 
-            };
-        
-        // create file, then write and append to it
-        this.createFile(fileName, write_file);
-    });
-    test("should be able to write XML data", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-
-        var that = this,
-            fileName = "writer.xml",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = '<?xml version="1.0" encoding="UTF-8"?>\n<test prop="ack">\nData\n</test>\n',
-            // for testing file length
-            length = rule.length,
-            // writes file content
-            write_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        ok(writer.length === length, "should have written " + length + " bytes");
-                        ok(writer.position === length, "position should be at " + length);
+                
+            // creates file, then write XML data
+            runs(function() {
+                createFile(fileName, write_file);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("should be able to write JSON data", function() {
+            var fileName = "writer.json",
+                filePath = root.fullPath + '/' + fileName,
+                theWriter,
+                // file content
+                rule = '{ "name": "Guy Incognito", "email": "here@there.com" }',
+                fail = createFail('FileWriter'),
+                // for iting file length
+                length = rule.length,
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(length);
+                    expect(theWriter.position).toBe(length);
 
-                        // cleanup
-                        that.deleteFile(fileName);
-                        QUnit.start();
-                    };
-                    writer.write(rule); 
-                }, that.fail);
-            };
+                    // cleanup
+                    deleteFile(fileName);
+                }),
+                // writes file content
+                write_file = function(fileEntry) {
+                    fileEntry.createWriter(function(writer) {
+                        theWriter = writer;
+                        theWriter.onwriteend = verifier;
+                        theWriter.write(rule); 
+                    }, fail);
+                };
             
-        // creates file, then write XML data
-        this.createFile(fileName, write_file);
-    });
-    test("should be able to write JSON data", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-
-        var that = this,
-            fileName = "writer.json",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = '{ "name": "Guy Incognito", "email": "here@there.com" }',
-            // for testing file length
-            length = rule.length,
-            // writes file content
-            write_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        ok(writer.length === length, "should have written " + length + " bytes");
-                        ok(writer.position === length, "position should be at " + length);
-
-                        // cleanup
-                        that.deleteFile(fileName);
-                        QUnit.start();
-                    };
-                    writer.write(rule); 
-                }, that.fail);
-            };
-        
-        // creates file, then write JSON content
-        this.createFile(fileName, write_file);
-    });
-    test("should write and read special characters", function() {
-         QUnit.stop(Tests.TEST_TIMEOUT);
-         expect(1);
-         
-         var that = this,
-            // path of file
-            fileName = "reader.txt",
-            filePath = this.root.fullPath + '/' + fileName,
-            // file content
-            rule = "H\u00EBll\u00F5 Euro \u20AC\u00A1",
-            // creates a FileWriter object
-            create_writer = function(fileEntry) {
-                fileEntry.createWriter(write_file, this.fail);
-            },
-            // writes file and reads it back in
-            write_file = function(writer) {
-                writer.onwriteend = read_file; 
-                writer.write(rule);
-            },
-            // reads file and compares content to what was written
-            read_file = function(evt) {
-                var reader = new FileReader();
-                    reader.onloadend = function(evt) {
-                    console.log("read success");
-                    console.log(evt.target.result);
-                    ok(evt.target.result === rule, "reader.result should be equal to the text written.");
+            // creates file, then write JSON content
+            runs(function() {
+                createFile(fileName, write_file);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("should write and read special characters", function() {
+            var fileName = "reader.txt",
+                filePath = root.fullPath + '/' + fileName,
+                theWriter,
+                // file content
+                rule = "H\u00EBll\u00F5 Euro \u20AC\u00A1",
+                fail = createFail('FileWriter'),
+                // creates a FileWriter object
+                create_writer = function(fileEntry) {
+                    fileEntry.createWriter(write_file, fail);
+                },
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(evt).toBeDefined();
+                    expect(evt.target.result).toBe(rule);
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
+                    deleteFile(fileName);
+                }),
+                // writes file and reads it back in
+                write_file = function(writer) {
+                    theWriter = writer;
+                    theWriter.onwriteend = read_file; 
+                    theWriter.write(rule);
+                },
+                // reads file and compares content to what was written
+                read_file = function(evt) {
+                    var reader = new FileReader();
+                    reader.onloadend = verifier;
+                    var myFile = new File();
+                    myFile.fullPath = filePath;
+                    reader.readAsText(myFile);
                 };
-                var myFile = new File();
-                myFile.fullPath = filePath; 
-                reader.readAsText(myFile);
-            };
-         
-         // create a file, write to it, and read it in again
-         this.createFile(fileName, create_writer, this.fail);
-         });
-    test("should be able to seek", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(5);
-        
-        var that = this,
-            fileName = "writer.seek",
-            // file content
-            rule = "There is an exception to every rule.  Except this one.",
-            // for testing file length
-            length = rule.length,
-            // writes file content and tests writer.seek
-            seek_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        ok(writer.position == length, "position should be at " + length); 
-                        writer.seek(-5);
-                        ok(writer.position == (length-5), "position should be at " + (length-5)); 
-                        writer.seek(100);
-                        ok(writer.position == length, "position should be at " + length); 
-                        writer.seek(10);
-                        ok(writer.position == 10, "position should be at 10"); 
 
-                        // cleanup
-                        that.deleteFile(fileName);
-                        QUnit.start();
-                    };
-                    writer.seek(-100);
-                    ok(writer.position == 0, "position should be at 0");        
-                    writer.write(rule);
-                }, that.fail);
-            };
-            
-        // creates file, then write JSON content
-        this.createFile(fileName, seek_file);
-    });
-    test("should be able to truncate", function() {
-        QUnit.stop(Tests.TEST_TIMEOUT);
-        expect(2);
-        
-        var that = this,
-            fileName = "writer.truncate",
-            rule = "There is an exception to every rule.  Except this one.",
-            // writes file content 
-            write_file = function(fileEntry) {
-                fileEntry.createWriter(function(writer) {
-                    writer.onwriteend = function(evt) {
-                        truncate_file(writer);
-                    }; 
-                    writer.write(rule);
-                }, that.fail);
-            },
-            // and tests writer.truncate
-            truncate_file = function(writer) {
-                writer.onwriteend = function(evt) {
-                    ok(writer.length == 36, "file length should be 36");
-                    ok(writer.position == 36, "position should be at 36");  
+            // create a file, write to it, and read it in again
+            runs(function() {
+                createFile(fileName, create_writer, fail);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("should be able to seek", function() {
+            var fileName = "writer.seek",
+                // file content
+                rule = "There is an exception to every rule.  Except this one.",
+                theWriter,
+                // for iting file length
+                length = rule.length,
+                fail = createFail('FileWriter'),
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.position).toBe(length);
+                    theWriter.seek(-5);
+                    expect(theWriter.position).toBe(length-5);
+                    theWriter.seek(length + 100);
+                    expect(theWriter.position).toBe(length);
+                    theWriter.seek(10);
+                    expect(theWriter.position).toBe(10);
+
+                    // cleanup
+                    deleteFile(fileName);
+                }),
+                // writes file content and its writer.seek
+                seek_file = function(fileEntry) {
+                    fileEntry.createWriter(function(writer) {
+                        theWriter = writer;
+                        theWriter.onwriteend = verifier;
+                        theWriter.seek(-100);
+                        expect(theWriter.position).toBe(0);
+                        theWriter.write(rule);
+                    }, fail);
+                };
+                
+            // creates file, then write JSON content
+            runs(function() {
+                createFile(fileName, seek_file);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
+        it("should be able to truncate", function() {
+            var fileName = "writer.truncate",
+                rule = "There is an exception to every rule.  Except this one.",
+                fail = createFail('FileWRiter'),
+                theWriter,
+                // writes file content 
+                write_file = function(fileEntry) {
+                    fileEntry.createWriter(function(writer) {
+                        theWriter = writer;
+                        theWriter.onwriteend = function(evt) {
+                            truncate_file(theWriter);
+                        }; 
+                        theWriter.write(rule);
+                    }, fail);
+                },
+                verifier = jasmine.createSpy().andCallFake(function(evt) {
+                    expect(theWriter.length).toBe(36);
+                    expect(theWriter.position).toBe(36);
                     
                     // cleanup
-                    that.deleteFile(fileName);
-                    QUnit.start();
-                }; 
-                writer.truncate(36);                
-            };
-
-        // creates file, writes to it, then truncates it
-        this.createFile(fileName, write_file);
+                    deleteFile(fileName);
+                }),
+                // and its writer.truncate
+                truncate_file = function(writer) {
+                    writer.onwriteend = verifier;
+                    writer.truncate(36);
+                };
+
+            // creates file, writes to it, then truncates it
+            runs(function() {
+                createFile(fileName, write_file);
+            });
+
+            waitsFor(function() { return verifier.wasCalled; }, "verifier never called", Tests.TEST_TIMEOUT);
+
+            runs(function() {
+                expect(verifier).toHaveBeenCalled();
+                expect(fail).not.toHaveBeenCalled();
+            });
+        });
     });
-};
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/geolocation.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/geolocation.tests.js
index 7890b40f..718d582e 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/geolocation.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/geolocation.tests.js
@@ -1,90 +1,100 @@
-Tests.prototype.GeoLocationTests = function() {	
-	module('Geolocation (navigator.geolocation)');
-	test("should exist", function() {
-  		expect(1);
-  		ok(navigator.geolocation != null, "navigator.geolocation should not be null.");
+describe('Geolocation (navigator.geolocation)', function () {
+	it("should exist", function() {
+        expect(navigator.geolocation).toBeDefined();
 	});
-	test("should contain a getCurrentPosition function", function() {
-		expect(2);
-		ok(typeof navigator.geolocation.getCurrentPosition != 'undefined' && navigator.geolocation.getCurrentPosition != null, "navigator.geolocation.getCurrentPosition should not be null.");
-		ok(typeof navigator.geolocation.getCurrentPosition == 'function', "navigator.geolocation.getCurrentPosition should be a function.");
+
+	it("should contain a getCurrentPosition function", function() {
+		expect(typeof navigator.geolocation.getCurrentPosition).toBeDefined();
+		expect(typeof navigator.geolocation.getCurrentPosition == 'function').toBe(true);
 	});
-	test("should contain a watchPosition function", function() {
-		expect(2);
-		ok(typeof navigator.geolocation.watchPosition != 'undefined' && navigator.geolocation.watchPosition != null, "navigator.geolocation.watchPosition should not be null.");
-		ok(typeof navigator.geolocation.watchPosition == 'function', "navigator.geolocation.watchPosition should be a function.");
+
+	it("should contain a watchPosition function", function() {
+		expect(typeof navigator.geolocation.watchPosition).toBeDefined();
+		expect(typeof navigator.geolocation.watchPosition == 'function').toBe(true);
 	});
-	test("should contain a clearWatch function", function() {
-		expect(2);
-		ok(typeof navigator.geolocation.clearWatch != 'undefined' && navigator.geolocation.clearWatch != null, "navigator.geolocation.watchPosition should not be null.");
-		ok(typeof navigator.geolocation.clearWatch == 'function', "navigator.geolocation.clearWatch should be a function.");
+
+	it("should contain a clearWatch function", function() {
+		expect(typeof navigator.geolocation.clearWatch).toBeDefined();
+		expect(typeof navigator.geolocation.clearWatch == 'function').toBe(true);
 	});
-	test("getCurrentPosition success callback should be called with a Position object", function() {
-		expect(2);
-		QUnit.stop(15000);
-		var win = function(p) {
-			ok(p.coords != null, "Position object returned in getCurrentPosition success callback has a 'coords' property.");
-			ok(p.timestamp != null, "Position object returned in getCurrentPosition success callback has a 'timestamp' property.");
-			QUnit.start();
-		};
-		var fail = function() { 
-        ok(false, "Error callback fired, test failed.");
-        QUnit.start();
-    };
-		navigator.geolocation.getCurrentPosition(win, fail, {
-        maximumAge:300000 // 5 minutes maximum age of cached position
-    });
+
+	it("getCurrentPosition success callback should be called with a Position object", function() {
+		var win = jasmine.createSpy().andCallFake(function(a) {
+                expect(p.coords).not.toBe(null);
+                expect(p.timestamp).not.toBe(null);
+            }),
+            fail = jasmine.createSpy();
+
+        runs(function () {
+            navigator.geolocation.getCurrentPosition(win, fail, {
+                maximumAge:300000 // 5 minutes maximum age of cached position
+            });
+        });
+
+        waitsFor(function () { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+        runs(function () {
+            expect(fail).not.toHaveBeenCalled();
+        });
 	});
-  test("getCurrentPosition success callback should be called with a cached Position", function() {
-    expect(1);
-    QUnit.stop(Tests.TEST_TIMEOUT);
-    var win = function(p) {
-      ok(p.coords instanceof Position, "Position object returned is an instance of Position");
-      QUnit.start();
-    };
-    var fail = function(e) {
-      ok(false, "Error callback called, test failed.");
-    };
-    navigator.geolocation.getCurrentPosition(win, fail, {
-        maximumAge:300000 // 5 minutes
-    });
-  });
-  test("getCurrentPosition error callback should be called if we set timeout to 0 and maximumAge to a very small number", function() {
-    expect(1);
-    QUnit.stop(Tests.TEST_TIMEOUT);
-    var win = function(p) {
-      ok(false, "success callback called, test failed.");
-      QUnit.start();
-    };
-    var fail = function(e) {
-      ok(true, "error callback called");
-      QUnit.start();
-    };
-    navigator.geolocation.getCurrentPosition(win, fail, {
-        maximumAge: 0,
-        timeout: 0
+
+	it("getCurrentPosition success callback should be called with a cached Position", function() {
+		var win = jasmine.createSpy().andCallFake(function(a) {
+                expect(p.coords instanceof Position).toBe(true);
+            }),
+            fail = jasmine.createSpy();
+
+        runs(function () {
+            navigator.geolocation.getCurrentPosition(win, fail, {
+                maximumAge:300000 // 5 minutes 
+            });
+        });
+
+        waitsFor(function () { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
+
+        runs(function () {
+            expect(fail).not.toHaveBeenCalled();
+        });
+	});
+
+    it("getCurrentPosition error callback should be called if we set timeout to 0 and maximumAge to a very small number", function() {
+        var win = jasmine.createSpy(),
+            fail = jasmine.createSpy();
+
+        runs(function () {
+            navigator.geolocation.getCurrentPosition(win, fail, {
+                maximumAge: 0,
+                timeout: 0
+            });
+        });
+
+        waitsFor(function () { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
+
+        runs(function () {
+            expect(win).not.toHaveBeenCalled();
+        });
     });
-  });
+
 	// TODO: Need to test error callback... how?
 	// TODO: Need to test watchPosition success callback, test that makes sure clearPosition works (how to test that a timer is getting cleared?)
-	module('Geolocation model');
-	test("should be able to define a Position object with coords and timestamp properties", function() {
-		expect(3);
-		var pos = new Position({}, new Date());
-		ok(pos != null, "new Position() should not be null.");
-		ok(typeof pos.coords != 'undefined' && pos.coords != null, "new Position() should include a 'coords' property.");
-		ok(typeof pos.timestamp != 'undefined' && pos.timestamp != null, "new Position() should include a 'timestamp' property.");
-	});
-	test("should be able to define a Coordinates object with latitude, longitude, accuracy, altitude, heading, speed and altitudeAccuracy properties", function() {
-		expect(8);
-		var coords = new Coordinates(1,2,3,4,5,6,7);
-		ok(coords != null, "new Coordinates() should not be null.");
-		ok(typeof coords.latitude != 'undefined' && coords.latitude != null, "new Coordinates() should include a 'latitude' property.");
-		ok(typeof coords.longitude != 'undefined' && coords.longitude != null, "new Coordinates() should include a 'longitude' property.");
-		ok(typeof coords.accuracy != 'undefined' && coords.accuracy != null, "new Coordinates() should include a 'accuracy' property.");
-		ok(typeof coords.altitude != 'undefined' && coords.altitude != null, "new Coordinates() should include a 'altitude' property.");
-		ok(typeof coords.heading != 'undefined' && coords.heading != null, "new Coordinates() should include a 'heading' property.");
-		ok(typeof coords.speed != 'undefined' && coords.speed != null, "new Coordinates() should include a 'speed' property.");
-		ok(typeof coords.altitudeAccuracy != 'undefined' && coords.altitudeAccuracy != null, "new Coordinates() should include a 'altitudeAccuracy' property.");
-	});
-};
+    describe("Geolocation model", function () {
+        it("should be able to define a Position object with coords and timestamp properties", function() {
+            var pos = new Position({}, new Date());
+            expect(pos).toBeDefined();
+            expect(pos.coords).toBeDefined();
+            expect(pos.timestamp).toBeDefined();
+        });
+
+        it("should be able to define a Coordinates object with latitude, longitude, accuracy, altitude, heading, speed and altitudeAccuracy properties", function() {
+            var coords = new Coordinates(1,2,3,4,5,6,7);
+            expect(coords).toBeDefined();
+            expect(coords.latitude).toBeDefined();
+            expect(coords.longitude).toBeDefined();
+            expect(coords.accuracy).toBeDefined();
+            expect(coords.altitude).toBeDefined();
+            expect(coords.heading).toBeDefined();
+            expect(coords.speed).toBeDefined();
+            expect(coords.altitudeAccuracy).toBeDefined();
+        });
+    });
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/media.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/media.tests.js
index cf6ded41..d0e6c4f2 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/media.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/media.tests.js
@@ -1,152 +1,144 @@
-Tests.prototype.MediaTests = function() {	
-	module('Media');
-	test("should exist", function() {
-  		expect(1);
-		ok(typeof Media === "function" || typeof Media === "object", "'Media' should be defined as a function in global scope.");
+describe('Media', function () {
+	it("should exist", function() {
+        expect(Media).toBeDefined();
+		expect(typeof Media).toBe("function");
 	});
-    test("should have the following properties", function() {
+
+    it("should have the following properties", function() {
         var media1 = new Media("dummy");
-        expect(4);
-        ok(typeof media1.id != 'undefined' && media1.id != null, "'Media' should have an id property.");
-        ok(typeof media1.src != 'undefined', "'Media' should have an src property.");
-        ok(typeof media1._duration != 'undefined' && media1._duration != null, "'Media' should have an _duration property.");
-        ok(typeof media1._position != 'undefined' && media1._position != null, "'Media' should have an _position property.");
+        expect(media1.id).toBeDefined();
+        expect(media1.src).toBeDefined();
+        expect(media1._duration).toBeDefined();
+        expect(media1._position).toBeDefined();
         media1.release();
     });
-	test("should define constants for Media errors", function() {
-		expect(6);
-		ok(MediaError != null && typeof MediaError != 'undefined', "MediaError object exists in global scope.");
-        equals(MediaError.MEDIA_ERR_NONE_ACTIVE, 0, "MediaError.MEDIA_ERR_NONE_ACTIVE is equal to 0.");
-        equals(MediaError.MEDIA_ERR_ABORTED, 1, "MediaError.MEDIA_ERR_ABORTED is equal to 1.");
-		equals(MediaError.MEDIA_ERR_NETWORK, 2, "MediaError.MEDIA_ERR_NETWORK is equal to 2.");
-		equals(MediaError.MEDIA_ERR_DECODE, 3, "MediaError.MEDIA_ERR_DECODE is equal to 3.");
-		equals(MediaError.MEDIA_ERR_NONE_SUPPORTED, 4, "MediaError.MEDIA_ERR_NONE_SUPPORTED is equal to 4.");
+
+	it("should define constants for Media errors", function() {
+        expect(MediaError).toBeDefined();
+        expect(MediaError.MEDIA_ERR_NONE_ACTIVE).toBe(0);
+        expect(MediaError.MEDIA_ERR_ABORTED).toBe(1);
+		expect(MediaError.MEDIA_ERR_NETWORK).toBe(2);
+		expect(MediaError.MEDIA_ERR_DECODE).toBe(3);
+		expect(MediaError.MEDIA_ERR_NONE_SUPPORTED).toBe(4);
 	});
-    test("should contain a play function", function() {
+
+    it("should contain a play function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.play != 'undefined' && media1.play != null, "Media.play should not be null.");
-        ok(typeof media1.play == 'function', "Media.play should be a function.");
+        expect(media1.play).toBeDefined();
+        expect(typeof media1.play).toBe('function');
         media1.release();
     });
-    test("should contain a stop function", function() {
+
+    it("should contain a stop function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.stop != 'undefined' && media1.stop != null, "Media.stop should not be null.");
-        ok(typeof media1.stop == 'function', "Media.stop should be a function.");
+        expect(media1.stop).toBeDefined();
+        expect(typeof media1.stop).toBe('function');
         media1.release();
     });
-    test("should contain a seekTo function", function() {
+
+    it("should contain a seekTo function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.seekTo != 'undefined' && media1.seekTo != null, "Media.seekTo should not be null.");
-        ok(typeof media1.seekTo == 'function', "Media.seekTo should be a function.");
+        expect(media1.seekTo).toBeDefined();
+        expect(typeof media1.seekTo).toBe('function');
         media1.release();
     });
-    test("should contain a pause function", function() {
+
+    it("should contain a pause function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.pause != 'undefined' && media1.pause != null, "Media.pause should not be null.");
-        ok(typeof media1.pause == 'function', "Media.pause should be a function.");
+        expect(media1.pause).toBeDefined();
+        expect(typeof media1.pause).toBe('function');
         media1.release();
     });
-    test("should contain a getDuration function", function() {
+
+    it("should contain a getDuration function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.getDuration != 'undefined' && media1.getDuration != null, "Media.getDuration should not be null.");
-        ok(typeof media1.getDuration == 'function', "Media.getDuration should be a function.");
+        expect(media1.getDuration).toBeDefined();
+        expect(typeof media1.getDuration).toBe('function');
         media1.release();
     });
-    test("should contain a getCurrentPosition function", function() {
+
+    it("should contain a getCurrentPosition function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.getCurrentPosition != 'undefined' && media1.getCurrentPosition != null, "Media.getCurrentPosition should not be null.");
-        ok(typeof media1.getCurrentPosition == 'function', "Media.getCurrentPosition should be a function.");
+        expect(media1.getCurrentPosition).toBeDefined();
+        expect(typeof media1.getCurrentPosition).toBe('function');
         media1.release();
     });
-    test("should contain a startRecord function", function() {
+
+    it("should contain a startRecord function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.startRecord != 'undefined' && media1.startRecord != null, "Media.startRecord should not be null.");
-        ok(typeof media1.startRecord == 'function', "Media.startRecord should be a function.");
+        expect(media1.startRecord).toBeDefined();
+        expect(typeof media1.startRecord).toBe('function');
         media1.release();
     });
-    test("should contain a stopRecord function", function() {
+
+    it("should contain a stopRecord function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.stopRecord != 'undefined' && media1.stopRecord != null, "Media.stopRecord should not be null.");
-        ok(typeof media1.stopRecord == 'function', "Media.stopRecord should be a function.");
+        expect(media1.stopRecord).toBeDefined();
+        expect(typeof media1.stopRecord).toBe('function');
         media1.release();
     });
-    test("should contain a release function", function() {
+
+    it("should contain a release function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.release != 'undefined' && media1.release != null, "Media.release should not be null.");
-        ok(typeof media1.release == 'function', "Media.release should be a function.");
+        expect(media1.release).toBeDefined();
+        expect(typeof media1.release).toBe('function');
         media1.release();
     });
-    test("should contain a setVolume function", function() {
+
+    it("should contain a setVolume function", function() {
         var media1 = new Media();
-        expect(2);
-        ok(typeof media1.setVolume != 'undefined' && media1.setVolume != null, "Media.setVolume should not be null.");
-        ok(typeof media1.setVolume == 'function', "Media.setVolume should be a function.");
+        expect(media1.setVolume).toBeDefined();
+        expect(typeof media1.setVolume).toBe('function');
         media1.release();
     });
-	test("should return MediaError for bad filename", function() {
-		expect(2);
-		QUnit.stop(10000);
-		var badMedia = null;
-		var releaseMedia = function() {
-			badMedia.release();
-		};
-		var win = function() {
-			ok(0, "should NOT succeed with bad media file name");
-			releaseMedia();
-			QUnit.start();
-		};
-		var fail = function(result){
-			ok(typeof result == 'object', "Object returned in media.play failure callback is of type 'object' (actually MediaError).");
-			ok(result.code == MediaError.MEDIA_ERR_ABORTED, "Object returned in media.find failure callback has a code property which equal to MediaError.MEDIA_ERR_ABORTED");
-			releaseMedia();
-			QUnit.start(); 
-		};
-		badMedia = new Media("invalid.file.name", win,fail);
-		badMedia.play();
+
+	it("should return MediaError for bad filename", function() {
+		var badMedia = null,
+            win = jasmine.createSpy(),
+            fail = jasmine.createSpy().andCallFake(function (result) {
+                expect(result).toBeDefined();
+                expect(result.code).toBe(MediaError.MEDIA_ERR_ABORTED);
+            });
+            
+        runs(function () {
+            badMedia = new Media("invalid.file.name", win,fail);
+            badMedia.play();
+        });
+
+        waitsFor(function () { return fail.wasCalled; }, Tests.TEST_TIMEOUT);
+
+        runs(function () {
+            expect(win).not.toHaveBeenCalled();
+            badMedia.release();
+        });
 	});
-    test("position should be set properly", function() {
-        var media1 = new Media("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
+
+    it("position should be set properly", function() {
+        var media1 = new Media("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3"),
+            test = jasmine.createSpy().andCallFake(function(position) {
+                    console.log("position = " + position);
+                    expect(position).toBeGreaterThan(0.0);
+                    media1.stop()
+                    media1.release();
+                });
+
         media1.play();
-        expect(1);
-        QUnit.stop(15000);
-        setTimeout(
-                function() {
-                    media1.getCurrentPosition(
-                        function(position) {
-                            console.log("position = " + position);
-                            ok(position >= 0.0, "position should not be -1");
-                            QUnit.start();
-                            media1.stop()
-                            media1.release();
-                        },
-                        function(e) {
-                            QUnit.start();
-                        }
-                    );
-                }
-           , 5000);
+
+        waits(5000);
+
+        runs(function () {
+            media1.getCurrentPosition(test, function () {});
+        });
+
+        waitsFor(function () { return test.wasCalled; }, Tests.TEST_TIMEOUT);
     });
-    test("duration should be set properly", function() {
+
+    it("duration should be set properly", function() {
         var media1 = new Media("http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3");
         media1.play();
-        expect(1);
-        QUnit.stop(15000);
-        setTimeout(
-                function() {
-                    ok(media1.getDuration() >= 0.0, "duration should not be -1");
-                    QUnit.start();
-                    media1.stop()
-                    media1.release();
-                }
-           , 5000);
+        waits(5000);
+        runs(function () {
+            expect(media1.getDuration()).toBeGreaterThan(0.0);
+        });
     });
-};
\ No newline at end of file
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/network.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/network.tests.js
index af87d731..780097f3 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/network.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/network.tests.js
@@ -1,26 +1,25 @@
-Tests.prototype.NetworkTests = function() {
-	module('Network (navigator.network)');
-	test("should exist", function() {
-  		expect(1);
-  		ok(navigator.network != null, "navigator.network should not be null.");
+describe('Network (navigator.network)', function () {
+	it("should exist", function() {
+        expect(navigator.network).toBeDefined();
 	});
-    module('Network Information API');
-    test("connection should exist", function() {
-        expect(1);
-        ok(navigator.network.connection != null, "navigator.network.connection should not be null.");
+
+    describe('Network Information API', function () {
+        it("connection should exist", function() {
+            expect(navigator.network.connection).toBeDefined();
+        });
+
+        it("should contain connection properties", function() {
+            expect(navigator.network.connection.type).toBeDefined();
+        });
+
+        it("should define constants for connection status", function() {
+            expect(Connection.UNKNOWN).toBe("unknown");
+            expect(Connection.ETHERNET).toBe("ethernet");
+            expect(Connection.WIFI).toBe("wifi");
+            expect(Connection.CELL_2G).toBe("2g");
+            expect(Connection.CELL_3G).toBe("3g");
+            expect(Connection.CELL_4G).toBe("4g");
+            expect(Connection.NONE).toBe("none");
+        });
     });
-    test("should contain connection properties", function() {
-        expect(1);
-        ok(typeof navigator.network.connection.type != 'undefined', "navigator.network.connection.type is defined.");
-    });
-    test("should define constants for connection status", function() {
-        expect(7);
-        equals(Connection.UNKNOWN, "unknown", "Connection.UNKNOWN is equal to 'unknown'.");
-        equals(Connection.ETHERNET, "ethernet", "Connection.ETHERNET is equal to 'ethernet'.");
-        equals(Connection.WIFI, "wifi", "Connection.WIFI is equal to 'wifi'.");
-        equals(Connection.CELL_2G, "2g", "Connection.CELL_2G is equal to '2g'.");
-        equals(Connection.CELL_3G, "3g", "Connection.CELL_3G is equal to '3g'.");
-        equals(Connection.CELL_4G, "4g", "Connection.CELL_4G is equal to '4g'.");
-        equals(Connection.NONE, "none", "Connection.NONE is equal to 'none'.");
-    });
-};
\ No newline at end of file
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/notification.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/notification.tests.js
index 03e3885e..61c795db 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/notification.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/notification.tests.js
@@ -1,22 +1,20 @@
-Tests.prototype.NotificationTests = function() {	
-	module('Notification (navigator.notification)');
-	test("should exist", function() {
-  		expect(1);
-  		ok(navigator.notification != null, "navigator.notification should not be null.");
+describe('Notification (navigator.notification)', function () {
+	it("should exist", function() {
+        expect(navigator.notification).toBeDefined();
 	});
-	test("should contain a vibrate function", function() {
-		expect(2);
-		ok(typeof navigator.notification.vibrate != 'undefined' && navigator.notification.vibrate != null, "navigator.notification.vibrate should not be null.");
-		ok(typeof navigator.notification.vibrate == 'function', "navigator.notification.vibrate should be a function.");
+
+	it("should contain a vibrate function", function() {
+		expect(typeof navigator.notification.vibrate).toBeDefined();
+		expect(typeof navigator.notification.vibrate).toBe("function");
 	});
-	test("should contain a beep function", function() {
-		expect(2);
-		ok(typeof navigator.notification.beep != 'undefined' && navigator.notification.beep != null, "navigator.notification.beep should not be null.");
-		ok(typeof navigator.notification.beep == 'function', "navigator.notification.beep should be a function.");
+
+	it("should contain a beep function", function() {
+		expect(typeof navigator.notification.beep).toBeDefined();
+		expect(typeof navigator.notification.beep).toBe("function");
 	});
-	test("should contain a alert function", function() {
-		expect(2);
-		ok(typeof navigator.notification.alert != 'undefined' && navigator.notification.alert != null, "navigator.notification.alert should not be null.");
-		ok(typeof navigator.notification.alert == 'function', "navigator.notification.alert should be a function.");
+
+	it("should contain a alert function", function() {
+		expect(typeof navigator.notification.alert).toBeDefined();
+		expect(typeof navigator.notification.alert).toBe("function");
 	});
-};
\ No newline at end of file
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/platform.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/platform.tests.js
index 67fb28cf..6b1a0eda 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/platform.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/platform.tests.js
@@ -1,37 +1,35 @@
-Tests.prototype.PlatformTests = function() {	
-    module('Platform (cordova)');
-    test("should exist", function() {
-        expect(1);
-        ok(typeof cordova != 'undefined' && cordova != null, "cordova should not be null.");
+describe('Platform (cordova)', function () {
+    it("should exist", function() {
+        expect(cordova).toBeDefined();
     });
-    module('Platform (Cordova)');
-    test("should not exist", function() {
-        expect(1);
-        ok(typeof Cordova == 'undefined', "Cordova should be null.");
+    describe('Platform (Cordova)', function () {
+        it("should not exist", function() {
+            expect(window.Cordova).not.toBeDefined();
+        });
     });
-    module('Platform (PhoneGap)');
-    test("should exist", function() {
-        expect(1);
-        ok(typeof PhoneGap != 'undefined' && PhoneGap != null, "PhoneGap should not be null.");
+    describe('Platform (PhoneGap)', function () {
+        it("should exist", function() {
+            expect(PhoneGap).toBeDefined();
+        });
+
+        it("exec method should exist", function() {
+            expect(PhoneGap.exec).toBeDefined();
+            expect(typeof PhoneGap.exec).toBe('function');
+        });
+
+        it("addPlugin method should exist", function() {
+            expect(PhoneGap.addPlugin).toBeDefined();
+            expect(typeof PhoneGap.addPlugin).toBe('function');
+        });
+
+        it("addConstructor method should exist", function() {
+            expect(PhoneGap.addConstructor).toBeDefined();
+            expect(typeof PhoneGap.addConstructor).toBe('function');
+        });
     });
-    test("exec method should exist", function() {
-        expect(2);
-        ok(typeof PhoneGap.exec != 'undefined' && PhoneGap.exec != null, "PhoneGap.exec should not be null.");
-        ok(typeof PhoneGap.exec == 'function', "PhoneGap.exec should be a function.");
+    describe('Platform (window.plugins)', function () {
+        it("should exist", function() {
+            expect(window.plugins).toBeDefined();
+        });
     });
-    test("addPlugin method should exist", function() {
-        expect(2);
-        ok(typeof PhoneGap.addPlugin != 'undefined' && PhoneGap.addPlugin != null, "PhoneGap.addPlugin should not be null.");
-        ok(typeof PhoneGap.addPlugin == 'function', "PhoneGap.addPlugin should be a function.");
-    });
-    test("addConstructor method should exist", function() {
-        expect(2);
-        ok(typeof PhoneGap.addConstructor != 'undefined' && PhoneGap.addConstructor != null, "PhoneGap.addConstructor should not be null.");
-        ok(typeof PhoneGap.addConstructor == 'function', "PhoneGap.addConstructor should be a function.");
-    });
-    module('Platform (window.plugins)');
-    test("should exist", function() {
-        expect(1);
-        ok(typeof window.plugins != 'undefined' && window.plugins != null, "window.plugins should not be null.");
-    });
-};
\ No newline at end of file
+});
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/storage.tests.js b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/storage.tests.js
index 41476d84..a921de3b 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/storage.tests.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/autotest/tests/storage.tests.js
@@ -1,170 +1,161 @@
-Tests.prototype.StorageTests = function() 
-{
-  module("Session Storage");
-  test("should exist", function() {
-	expect(7);
-	ok(window.sessionStorage != null, "sessionStorage is defined");
-    ok(typeof window.sessionStorage.length != 'undefined', "sessionStorage.length is defined");
-    ok(typeof(window.sessionStorage.key) == "function", "sessionStorage.key is defined");
-    ok(typeof(window.sessionStorage.getItem) == "function", "sessionStorage.getItem is defined");
-    ok(typeof(window.sessionStorage.setItem) == "function", "sessionStorage.setItem is defined");
-    ok(typeof(window.sessionStorage.removeItem) == "function", "sessionStorage.removeItem is defined");
-    ok(typeof(window.sessionStorage.clear) == "function", "sessionStorage.clear is defined");
-  });
-  test("check length", function() {
-    expect(3);
-    ok(window.sessionStorage.length == 0, "length should be 0");
-    window.sessionStorage.setItem("key","value");
-    ok(window.sessionStorage.length == 1, "length should be 1");
-    window.sessionStorage.removeItem("key");   
-    ok(window.sessionStorage.length == 0, "length should be 0");
-  });
-  test("check key", function() {
-	expect(3);
-	ok(window.sessionStorage.key(0) == null, "key should be null");
-	window.sessionStorage.setItem("test","value");
-	ok(window.sessionStorage.key(0) == "test", "key should be 'test'");
-	window.sessionStorage.removeItem("test");   
-	ok(window.sessionStorage.key(0) == null, "key should be null");
-  });
-  test("check getItem", function() {
-	expect(3);
-    ok(window.sessionStorage.getItem("item") == null, "item should be null");
-    window.sessionStorage.setItem("item","value");
-    ok(window.sessionStorage.getItem("item") == "value", "The value of the item should be 'value'");
-    window.sessionStorage.removeItem("item");   
-    ok(window.sessionStorage.getItem("item") == null, "item should be null");
-  });
-  test("check setItem", function() {
-    expect(4);
-    ok(window.sessionStorage.getItem("item") == null, "item should be null");
-    window.sessionStorage.setItem("item","value");
-    ok(window.sessionStorage.getItem("item") == "value", "The value of the item should be 'value'");
-    window.sessionStorage.setItem("item","newval");
-    ok(window.sessionStorage.getItem("item") == "newval", "The value of the item should be 'newval'");
-    window.sessionStorage.removeItem("item");   
-    ok(window.sessionStorage.getItem("item") == null, "item should be null");
-  });
-  test("check removeItem", function() {
-    expect(3);
-    ok(window.sessionStorage.getItem("item") == null, "item should be null");
-    window.sessionStorage.setItem("item","value");
-    ok(window.sessionStorage.getItem("item") == "value", "The value of the item should be 'value'");
-    window.sessionStorage.removeItem("item");   
-    ok(window.sessionStorage.getItem("item") == null, "item should be null");
-  });
-  test("check clear", function() {
-    expect(11);
-    ok(window.sessionStorage.getItem("item1") == null, "item1 should be null");
-    ok(window.sessionStorage.getItem("item2") == null, "item2 should be null");
-    ok(window.sessionStorage.getItem("item3") == null, "item3 should be null");
-    window.sessionStorage.setItem("item1","value");
-    window.sessionStorage.setItem("item2","value");
-    window.sessionStorage.setItem("item3","value");
-    ok(window.sessionStorage.getItem("item1") == "value", "item1 should be null");
-    ok(window.sessionStorage.getItem("item2") == "value", "item2 should be null");
-    ok(window.sessionStorage.getItem("item3") == "value", "item3 should be null");	    
-    ok(window.sessionStorage.length == 3, "length should be 3");
-    window.sessionStorage.clear();
-    ok(window.sessionStorage.length == 0, "length should be 0");
-    ok(window.sessionStorage.getItem("item1") == null, "item1 should be null");
-    ok(window.sessionStorage.getItem("item2") == null, "item2 should be null");
-    ok(window.sessionStorage.getItem("item3") == null, "item3 should be null");	    
-  });
-  test("check dot notation", function() {
-    expect(3);
-    ok(window.sessionStorage.item == null, "item should be null");
-    window.sessionStorage.item = "value";
-    ok(window.sessionStorage.item == "value", "The value of the item should be 'value'");
-    window.sessionStorage.removeItem("item");   
-    ok(window.sessionStorage.item == null, "item should be null");
-  });
-  module("Local Storage");
-  test("should exist", function() {
-	expect(7);
-	ok(window.localStorage != null, "localStorage is defined");
-    ok(typeof window.localStorage.length != 'undefined', "localStorage.length is defined");
-    ok(typeof(window.localStorage.key) == "function", "localStorage.key is defined");
-    ok(typeof(window.localStorage.getItem) == "function", "localStorage.getItem is defined");
-    ok(typeof(window.localStorage.setItem) == "function", "localStorage.setItem is defined");
-    ok(typeof(window.localStorage.removeItem) == "function", "localStorage.removeItem is defined");
-    ok(typeof(window.localStorage.clear) == "function", "localStorage.clear is defined");
-  });  
-  test("check length", function() {
-    expect(3);
-    ok(window.localStorage.length == 0, "length should be 0");
-    window.localStorage.setItem("key","value");
-    ok(window.localStorage.length == 1, "length should be 1");
-    window.localStorage.removeItem("key");   
-    ok(window.localStorage.length == 0, "length should be 0");
-  });
-  test("check key", function() {
-    expect(3);
-    ok(window.localStorage.key(0) == null, "key should be null");
-    window.localStorage.setItem("test","value");
-    ok(window.localStorage.key(0) == "test", "key should be 'test'");
-    window.localStorage.removeItem("test");   
-    ok(window.localStorage.key(0) == null, "key should be null");
-  });
-  test("check getItem", function() {
-    expect(3);
-    ok(window.localStorage.getItem("item") == null, "item should be null");
-    window.localStorage.setItem("item","value");
-    ok(window.localStorage.getItem("item") == "value", "The value of the item should be 'value'");
-    window.localStorage.removeItem("item");   
-    ok(window.localStorage.getItem("item") == null, "item should be null");
-  });
-  test("check setItem", function() {
-    expect(4);
-    ok(window.localStorage.getItem("item") == null, "item should be null");
-    window.localStorage.setItem("item","value");
-    ok(window.localStorage.getItem("item") == "value", "The value of the item should be 'value'");
-    window.localStorage.setItem("item","newval");
-    ok(window.localStorage.getItem("item") == "newval", "The value of the item should be 'newval'");
-    window.localStorage.removeItem("item");   
-    ok(window.localStorage.getItem("item") == null, "item should be null");
-  });
-  test("check removeItem", function() {
-    expect(3);
-    ok(window.localStorage.getItem("item") == null, "item should be null");
-    window.localStorage.setItem("item","value");
-    ok(window.localStorage.getItem("item") == "value", "The value of the item should be 'value'");
-    window.localStorage.removeItem("item");   
-    ok(window.localStorage.getItem("item") == null, "item should be null");
-  });
-  test("check clear", function() {
-    expect(11);
-    ok(window.localStorage.getItem("item1") == null, "item1 should be null");
-    ok(window.localStorage.getItem("item2") == null, "item2 should be null");
-    ok(window.localStorage.getItem("item3") == null, "item3 should be null");
-    window.localStorage.setItem("item1","value");
-    window.localStorage.setItem("item2","value");
-    window.localStorage.setItem("item3","value");
-    ok(window.localStorage.getItem("item1") == "value", "item1 should be null");
-    ok(window.localStorage.getItem("item2") == "value", "item2 should be null");
-    ok(window.localStorage.getItem("item3") == "value", "item3 should be null");	    
-    ok(window.localStorage.length == 3, "length should be 3");
-    window.localStorage.clear();
-    ok(window.localStorage.length == 0, "length should be 0");
-    ok(window.localStorage.getItem("item1") == null, "item1 should be null");
-    ok(window.localStorage.getItem("item2") == null, "item2 should be null");
-    ok(window.localStorage.getItem("item3") == null, "item3 should be null");	    
-  });
-  test("check dot notation", function() {
-    expect(3);
-    ok(window.localStorage.item == null, "item should be null");
-    window.localStorage.item = "value";
-    ok(window.localStorage.item == "value", "The value of the item should be 'value'");
-    window.localStorage.removeItem("item");   
-    ok(window.localStorage.item == null, "item should be null");
-  });
-  module("HTML 5 Storage");
-  test("should exist", function() {
-    expect(1);
-    ok(typeof(window.openDatabase) == "function", "Database is defined");
-  });
-  test("Should open a database", function() {
-    var db = openDatabase("Database", "1.0", "HTML5 Database API example", 200000);
-    ok(db != null, "Database should be opened");
-  });
-}
+describe("Session Storage", function () {
+    it("should exist", function () {
+        expect(window.sessionStorage).toBeDefined();
+        expect(typeof window.sessionStorage.length).not.toBe('undefined');
+        expect(typeof(window.sessionStorage.key)).toBe('function');
+        expect(typeof(window.sessionStorage.getItem)).toBe('function');
+        expect(typeof(window.sessionStorage.setItem)).toBe('function');
+        expect(typeof(window.sessionStorage.removeItem)).toBe('function');
+        expect(typeof(window.sessionStorage.clear)).toBe('function');
+    });
+
+    it("check length", function () {
+        expect(window.sessionStorage.length).toBe(0);
+        window.sessionStorage.setItem("key","value");
+        expect(window.sessionStorage.length).toBe(1);
+        window.sessionStorage.removeItem("key");   
+        expect(window.sessionStorage.length).toBe(0);
+    });
+
+    it("check key", function () {
+        expect(window.sessionStorage.key(0)).toBe(null);
+        window.sessionStorage.setItem("test","value");
+        expect(window.sessionStorage.key(0)).toBe("test");
+        window.sessionStorage.removeItem("test");   
+        expect(window.sessionStorage.key(0)).toBe(null);
+    });
+
+    it("check getItem", function() {
+        expect(window.sessionStorage.getItem("item")).toBe(null);
+        window.sessionStorage.setItem("item","value");
+        expect(window.sessionStorage.getItem("item")).toBe("value");
+        window.sessionStorage.removeItem("item");   
+        expect(window.sessionStorage.getItem("item")).toBe(null);
+    });
+
+    it("check setItem", function() {
+        expect(window.sessionStorage.getItem("item")).toBe(null);
+        window.sessionStorage.setItem("item","value");
+        expect(window.sessionStorage.getItem("item")).toBe("value");
+        window.sessionStorage.setItem("item","newval");
+        expect(window.sessionStorage.getItem("item")).toBe("newval");
+        window.sessionStorage.removeItem("item");   
+        expect(window.sessionStorage.getItem("item")).toBe(null);
+    });
+
+    it("can remove an item", function () {
+        expect(window.sessionStorage.getItem("item")).toBe(null);
+        window.sessionStorage.setItem("item","value");
+        expect(window.sessionStorage.getItem("item")).toBe("value");
+        window.sessionStorage.removeItem("item");   
+        expect(window.sessionStorage.getItem("item")).toBe(null);
+    });
+
+    it("check clear", function() {
+        window.sessionStorage.setItem("item1","value");
+        window.sessionStorage.setItem("item2","value");
+        window.sessionStorage.setItem("item3","value");
+        expect(window.sessionStorage.length).toBe(3);
+        window.sessionStorage.clear();
+        expect(window.sessionStorage.length).toBe(0);
+    });
+
+    it("check dot notation", function() {
+        expect(window.sessionStorage.item).not.toBeDefined();
+        window.sessionStorage.item = "value";
+        expect(window.sessionStorage.item).toBe("value");
+        window.sessionStorage.removeItem("item");   
+        expect(window.sessionStorage.item).not.toBeDefined();
+    });
+
+    describe("Local Storage", function () {
+        it("should exist", function() {
+            expect(window.localStorage).toBeDefined();
+            expect(window.localStorage.length).toBeDefined();
+            expect(typeof window.localStorage.key).toBe("function");
+            expect(typeof window.localStorage.getItem).toBe("function");
+            expect(typeof window.localStorage.setItem).toBe("function");
+            expect(typeof window.localStorage.removeItem).toBe("function");
+            expect(typeof window.localStorage.clear).toBe("function");
+        });  
+
+        it("check length", function() {
+            expect(window.localStorage.length).toBe(0);
+            window.localStorage.setItem("key","value");
+            expect(window.localStorage.length).toBe(1);
+            window.localStorage.removeItem("key");   
+            expect(window.localStorage.length).toBe(0);
+        });
+
+        it("check key", function() {
+            expect(window.localStorage.key(0)).toBe(null);
+            window.localStorage.setItem("test","value");
+            expect(window.localStorage.key(0)).toBe("test");
+            window.localStorage.removeItem("test");   
+            expect(window.localStorage.key(0)).toBe(null);
+        });
+
+        it("check getItem", function() {
+            expect(window.localStorage.getItem("item")).toBe(null);
+            window.localStorage.setItem("item","value");
+            expect(window.localStorage.getItem("item")).toBe("value");
+            window.localStorage.removeItem("item");   
+            expect(window.localStorage.getItem("item")).toBe(null);
+        });
+
+        it("check setItem", function() {
+            expect(window.localStorage.getItem("item")).toBe(null);
+            window.localStorage.setItem("item","value");
+            expect(window.localStorage.getItem("item")).toBe("value");
+            window.localStorage.setItem("item","newval");
+            expect(window.localStorage.getItem("item")).toBe("newval");
+            window.localStorage.removeItem("item");   
+            expect(window.localStorage.getItem("item")).toBe(null);
+        });
+
+        it("check removeItem", function() {
+            expect(window.localStorage.getItem("item")).toBe(null);
+            window.localStorage.setItem("item","value");
+            expect(window.localStorage.getItem("item")).toBe("value");
+            window.localStorage.removeItem("item");   
+            expect(window.localStorage.getItem("item")).toBe(null);
+        });
+
+        it("check clear", function() {
+            expect(window.localStorage.getItem("item1")).toBe(null);
+            expect(window.localStorage.getItem("item2")).toBe(null);
+            expect(window.localStorage.getItem("item3")).toBe(null);
+            window.localStorage.setItem("item1","value");
+            window.localStorage.setItem("item2","value");
+            window.localStorage.setItem("item3","value");
+            expect(window.localStorage.getItem("item1")).toBe("value");
+            expect(window.localStorage.getItem("item2")).toBe("value");
+            expect(window.localStorage.getItem("item3")).toBe("value");
+            expect(window.localStorage.length).toBe(3);
+            window.localStorage.clear();
+            expect(window.localStorage.length).toBe(0);
+            expect(window.localStorage.getItem("item1")).toBe(null);
+            expect(window.localStorage.getItem("item2")).toBe(null);
+            expect(window.localStorage.getItem("item3")).toBe(null);
+        });
+
+        it("check dot notation", function() {
+            expect(window.localStorage.item).not.toBeDefined();
+            window.localStorage.item = "value";
+            expect(window.localStorage.item).toBe("value");
+            window.localStorage.removeItem("item");   
+            expect(window.localStorage.item).not.toBeDefined();
+        });
+    });
+
+    describe("HTML 5 Storage", function () {
+        it("should exist", function() {
+            expect(window.openDatabase);
+        });
+
+        it("Should open a database", function() {
+            var db = openDatabase("Database", "1.0", "HTML5 Database API example", 200000);
+            expect(db).toBeDefined();
+        });
+    });
+});
diff --git a/lib/windows/templates/full/www/cordova-1.6.1.js b/lib/windows/tests/MobileSpecUnitTests/www/cordova-1.6.1.js
similarity index 100%
rename from lib/windows/templates/full/www/cordova-1.6.1.js
rename to lib/windows/tests/MobileSpecUnitTests/www/cordova-1.6.1.js
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/misc/index.html b/lib/windows/tests/MobileSpecUnitTests/www/misc/index.html
index 023678d3..ce47b742 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/misc/index.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/misc/index.html
@@ -43,12 +43,18 @@ <h1>Display Other Content</h1>
     </div>
     <h2>Action</h2>
     <div class="btn large" onclick="document.location='tel:5551212';" >Call 411</div>
+<<<<<<< HEAD
+    <a href="mailto:bob@abc.org?subject=My Subject&body=This is the body.%0D%0ANew line." class="btn large">Send Mail</a>
+    <a href="sms:5125551234?body=The SMS message." class="btn large">Send SMS</a>
+    <a href="http://www.google.com" class="btn large">Load Web Site</a>
+=======
     <a href="mailto:bob@abc.org?subject=My Subject&body=This is the body.%0D%0ANew line." class="btn large">Send Mail</div>
     <a href="sms:5125551234?body=The SMS message." class="btn large">Send SMS</div>
     <a href="http://www.google.com" class="btn large">Load Web Site</div>
+>>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
     <!--  Need new URL -->
     <!-- a href="http://handle.library.cornell.edu/control/authBasic/authTest/" class="btn large">Basic Auth: test/this</a -->
-    <a href="page2.html?me=test" class="btn large">Load another PhoneGap page</a>
+    <a href="page2.html" hrefbad="page2.html?me=test" class="btn large">Load another PhoneGap page</a>
     <h2>Android Only</h2>
     <a href="geo:0,0?q=11400 Burnet Rd, Austin, TX" class="btn large">Map IBM</a>
     <a href="market://search?q=google" class="btn large">Search Android market</a>
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/misc/page2.html b/lib/windows/tests/MobileSpecUnitTests/www/misc/page2.html
index ee6c398d..c38e2c7a 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/misc/page2.html
+++ b/lib/windows/tests/MobileSpecUnitTests/www/misc/page2.html
@@ -20,6 +20,10 @@ <h4>Name: <span id="name"> </span></h4>
         <h4>Width: <span id="width">  </span>,   Height: <span id="height"> 
                    </span>, Color Depth: <span id="colorDepth"></span></h4>
      </div>
+<<<<<<< HEAD
+      <div ><button class="backBtn" onclick="backHome();">Back</button></div>
+=======
       <div ><button onclick="history.back();">Back</button></div>
+>>>>>>> fixed html errors, and various html tweaks, doctype, &nbsp; javascript:
   </body>
 </html>
diff --git a/lib/windows/tests/MobileSpecUnitTests/www/phonegap.js b/lib/windows/tests/MobileSpecUnitTests/www/phonegap.js
index 044a06b3..bba56008 100644
--- a/lib/windows/tests/MobileSpecUnitTests/www/phonegap.js
+++ b/lib/windows/tests/MobileSpecUnitTests/www/phonegap.js
@@ -1,6 +1,6 @@
-document.write('<script type="text/javascript" charset="utf-8" src="../../cordova.wp7.js"></script>');
-document.write('<script type="text/javascript" charset="utf-8" src="../cordova.wp7.js"></script>');
-document.write('<script type="text/javascript" charset="utf-8" src="cordova.wp7.js"></script>');
+document.write('<script type="text/javascript" charset="utf-8" src="../../cordova-1.6.1.js"></script>');
+document.write('<script type="text/javascript" charset="utf-8" src="../cordova-1.6.1.js"></script>');
+document.write('<script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>');
 
 function backHome() {