diff --git a/jasmine.iws b/jasmine.iws
index 8ca22d3..dc331df 100644
--- a/jasmine.iws
+++ b/jasmine.iws
@@ -92,7 +92,7 @@
       <file leaf-file-name="bootstrap.js" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/test/bootstrap.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="230" column="37" selection-start="6830" selection-end="6830" vertical-scroll-proportion="0.74496645">
+            <state line="239" column="43" selection-start="6804" selection-end="6804" vertical-scroll-proportion="0.28954938">
               <folding />
             </state>
           </provider>
@@ -110,7 +110,7 @@
       <file leaf-file-name="jasmine.js" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/jasmine.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="63" column="6" selection-start="1593" selection-end="1593" vertical-scroll-proportion="0.40661478">
+            <state line="88" column="0" selection-start="2048" selection-end="2048" vertical-scroll-proportion="0.2422179">
               <folding />
             </state>
           </provider>
@@ -522,13 +522,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/jasmine.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="63" column="6" selection-start="1593" selection-end="1593" vertical-scroll-proportion="0.40661478">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/bootstrap.html">
       <provider editor-type-id="HtmlPreview">
         <state />
@@ -539,9 +532,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/jasmine.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="88" column="0" selection-start="2048" selection-end="2048" vertical-scroll-proportion="0.2422179">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/bootstrap.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="230" column="37" selection-start="6830" selection-end="6830" vertical-scroll-proportion="0.74496645">
+        <state line="239" column="43" selection-start="6804" selection-end="6804" vertical-scroll-proportion="0.28954938">
           <folding />
         </state>
       </provider>
diff --git a/lib/jasmine.js b/lib/jasmine.js
index 841df5e..5da421b 100755
--- a/lib/jasmine.js
+++ b/lib/jasmine.js
@@ -83,7 +83,8 @@ var it = function (description) {
     description: description,
     queue: [],
     currentTimeout: 0,
-    done: false,
+    finished: false,
+    suite: {next:function() {}},
     results: [],
 
     expects_that: function (actual) {
@@ -100,7 +101,7 @@ var it = function (description) {
     },
 
     finish: function() {
-      that.done = true;
+      that.finished = true;
     },
 
     execute: function () {
@@ -150,8 +151,8 @@ var Jasmine = jasmine_init();
 /*
  * TODO:
  * - add spec or description to results
- * - spec.execute needs to wait until the spec is done
- * - an async test will be killed after X ms if not done and then listed as failed with an "async fail" message of some sort
+ //* - spec.execute needs to wait until the spec is done
+ //* - an async test will be killed after X ms if not done and then listed as failed with an "async fail" message of some sort
  * - Suite to run tests in order, constructed with a function called describe
  * - Suite supports before
  * - Suite supports after
diff --git a/test/bootstrap.js b/test/bootstrap.js
index 9a5de2f..7ea28f2 100755
--- a/test/bootstrap.js
+++ b/test/bootstrap.js
@@ -54,7 +54,7 @@ var testMatchersComparisons = function () {
   reporter.test(expected.should_not_equal(false),
       'expects_that(true).should_not_equal(false) retruned false');
 
-  expected = new Matchers(true);  
+  expected = new Matchers(true);
   reporter.test(!(expected.should_not_equal(true)),
       'expects_that(true).should_not_equal(false) retruned true');
 }
@@ -117,7 +117,7 @@ var testSpecs = function () {
   reporter.test((yet_another_spec.results[0].passed == false),
       "Expectation that failed, passed");
 
-  var yet_yet_another_spec = it('spec with multiple assertions').runs( function () {
+  var yet_yet_another_spec = it('spec with multiple assertions').runs(function () {
     var foo = 'bar';
     var baz = 'quux';
 
@@ -162,78 +162,124 @@ var testAsyncSpecs = function () {
   foo = 0;
   a_spec = it('spec w/ queued statments').
       runs(function () {
-             setTimeout(function() {
-               foo++
-             }, 500);
-          }).waits(1000).
+    setTimeout(function() {
+      foo++
+    }, 500);
+  }).waits(1000).
       then(function() {
-        this.expects_that(foo).should_equal(1);
-      });
+    this.expects_that(foo).should_equal(1);
+  });
 
+  var mockSuite = {
+    next: function() {
+      reporter.test((a_spec.results.length === 1),
+          'Calling waits(): Spec queue did not run all functions');
+
+      reporter.test((a_spec.results[0].passed === true),
+          'Calling waits(): Queued expectation failed');
+    }
+  };
   a_spec.execute();
-  setTimeout(function(){
-    reporter.test((a_spec.results.length === 1),
-        'Calling waits(): Spec queue did not run all functions');
+  waitForDone(a_spec, mockSuite);
 
-    reporter.test((a_spec.results[0].passed === true),
-        'Calling waits(): Queued expectation failed');
-  }, 1250);
-
-  setTimeout(function() {
-    var bar = 0;
-    var another_spec = it('spec w/ queued statments').
-        runs(function () {
-               setTimeout(function() {
-                 bar++;
-               }, 250);
-            }).
-        waits(500).
-        then(function () {
-               setTimeout(function() {
-                 bar++;
-               }, 250);
-            }).
-        waits(1500).
-        then(function() {
-          this.expects_that(bar).should_equal(2);
-        });
-
-    another_spec.execute();
-    setTimeout(function(){
+  var bar = 0;
+  var another_spec = it('spec w/ queued statments').
+      runs(function () {
+    setTimeout(function() {
+      bar++;
+    }, 250);
+  }).
+      waits(500).
+      then(function () {
+    setTimeout(function() {
+      bar++;
+    }, 250);
+  }).
+      waits(1500).
+      then(function() {
+    this.expects_that(bar).should_equal(2);
+  });
+  mockSuite = {
+    next: function() {
       reporter.test((another_spec.queue.length === 3),
           'Calling 2 waits(): Spec queue was less than expected length');
       reporter.test((another_spec.results.length === 1),
           'Calling 2 waits(): Spec queue did not run all functions');
       reporter.test((another_spec.results[0].passed === true),
           'Calling 2 waits(): Queued expectation failed');
-    }, 2500);
-  }, 1500);
+    }
+  };
+  another_spec.execute();
+  waitForDone(another_spec, mockSuite);
 
-  setTimeout(function() {
-    var baz = 0;
-    var yet_another_spec = it('spec w/ async fail').
-        runs(function () {
-               setTimeout(function() {
-                 baz++;
-               }, 250);
-            }).
-        waits(100).
-        then(function() {
-          this.expects_that(baz).should_equal(1);
-        });
+  var baz = 0;
+  var yet_another_spec = it('spec w/ async fail').
+      runs(function () {
+    setTimeout(function() {
+      baz++;
+    }, 250);
+  }).
+      waits(100).
+      then(function() {
+    this.expects_that(baz).should_equal(1);
+  });
+
+  mockSuite = {
+    next: function() {
 
-    yet_another_spec.execute();
-    setTimeout(function(){
       reporter.test((yet_another_spec.queue.length === 2),
           'Calling 2 waits(): Spec queue was less than expected length');
       reporter.test((yet_another_spec.results.length === 1),
           'Calling 2 waits(): Spec queue did not run all functions');
       reporter.test((yet_another_spec.results[0].passed === false),
           'Calling 2 waits(): Queued expectation failed');
-    }, 2500);
-  }, 5000);
+    }
+  };
 
+  yet_another_spec.execute();
+  waitForDone(yet_another_spec, mockSuite);
+}
 
+var testAsyncSpecsWithMockSuite = function () {
+  var bar = 0;
+  var another_spec = it('spec w/ queued statments').
+      runs(function () {
+    setTimeout(function() {
+      bar++;
+    }, 250);
+  }).
+      waits(500).
+      then(function () {
+    setTimeout(function() {
+      bar++;
+    }, 250);
+  }).
+      waits(1500).
+      then(function() {
+    this.expects_that(bar).should_equal(2);
+  });
+
+  var mockSuite = {
+    next: function () {
+      reporter.test((another_spec.queue.length === 3),
+          'Calling 2 waits(): Spec queue was less than expected length');
+      reporter.test((another_spec.results.length === 1),
+          'Calling 2 waits(): Spec queue did not run all functions');
+      reporter.test((another_spec.results[0].passed === true),
+          'Calling 2 waits(): Queued expectation failed');
+    }
+  };
+  another_spec.execute();
+  waitForDone(another_spec, mockSuite);
+}
+
+var waitForDone = function(spec, mockSuite) {
+  var id = setInterval(function () {
+    if (spec.finished) {
+      clearInterval(id);
+      mockSuite.next();
+    }
+  }, 150);
 }
 
 var runTests = function () {
@@ -243,7 +289,8 @@ var runTests = function () {
   testMatchersReporting();
   testSpecs();
   testAsyncSpecs();
-  
+  testAsyncSpecsWithMockSuite();
+
   setTimeout(function() {
     $('spinner').hide();
     reporter.summary();