diff --git a/app/controllers/owner.coffee b/app/controllers/owner.coffee
index 5332c86d..44cf321e 100644
--- a/app/controllers/owner.coffee
+++ b/app/controllers/owner.coffee
@@ -34,9 +34,19 @@ Controller = Ember.Controller.extend
 
     repos = data.repositories.filter (item, index) -> 
       if item.active && item.default_branch.last_build != null
-        item.active
+        item
+    repos
 
-    console.log(repos)
+  ).property('model')
+
+  running: (->
+    data = @get('model')
+
+    repos = data.repositories.filter (item, index) -> 
+      if item.active 
+        if item.default_branch.last_build != null 
+          if item.default_branch.last_build.state == 'started'
+            item
     repos
 
   ).property('model')
diff --git a/app/templates/components/owner-repo-tile.hbs b/app/templates/components/owner-repo-tile.hbs
index 2910110f..5e866192 100644
--- a/app/templates/components/owner-repo-tile.hbs
+++ b/app/templates/components/owner-repo-tile.hbs
@@ -18,7 +18,7 @@
       {{/link-to}}</p>
     <p class="tile-commit column medium-3 small-6">
       <span class="icon icon-github"></span><a {{bind-attr href="repo.default_branch.last_build.commit.compare_url"}}>{{format-sha repo.default_branch.last_build.commit.sha}}</a></p>
-    <p class="tile-timeago column medium-3 small-6">
+    <p class="tile-duration column medium-3 small-6">
       <span class="icon icon-clock"></span>
       {{format-duration repo.default_branch.last_build.duration}}</p>
     <p class="tile-timeago column medium-2 small-6">
diff --git a/app/templates/owner.hbs b/app/templates/owner.hbs
index 7d06105a..a1d0e0d3 100644
--- a/app/templates/owner.hbs
+++ b/app/templates/owner.hbs
@@ -30,38 +30,19 @@
       <ul class="owner-tiles">
         {{#each repo in repos}}
           {{owner-repo-tile repo=repo}}
+        {{else}}
+          <li>No active repos</li>
         {{/each}}
       </ul>
     </section>
 
     <section role="tabpanel">
       <ul class="owner-tiles">
-        <li {{bind-attr class=":tile :tile--small :row repo.last_build.state :started"}}>
-          {{#if repo.private }}
-            <div class="tile-lock"><span class="icon icon-lock"></span></div>
-          {{/if}}
-          <div class="tile-status">
-            <span {{bind-attr class=":icon :icon-status repo.last_build.state :started"}}></span>
-            <span {{bind-attr class=":icon :request-kind repo.last_build.state :push"}}></span>
-          </div>
-          <div class="tile-main tile-header column medium-3">
-            <h3>owner</h3>
-            <h2>{{#link-to "repo" repo.owner.login repo.name}}repo name{{/link-to}}</h2>
-          </div>
-          <div class="tile-single column medium-9 end">
-            <p class="tile-job build-status column medium-3 small-6"><span class="icon icon-hash"></span>
-              {{#link-to "build" repo.owner.login repo.name repo.last_build.id}}
-                {{!-- {{repo.last_build.number}} {{repo.last_build.state}} --}}
-                1234 passed
-              {{/link-to}}</p>
-            <p class="tile-commit column medium-3 small-6">
-              <span class="icon icon-github"></span><a href="#">394348a</a></p>
-            <p class="tile-timeago column medium-3 small-6">
-              <span class="icon icon-clock"></span>currently running</p>
-            <p class="tile-timeago column medium-2 small-6">
-              <span class="icon icon-cal"></span>in queue{{!-- {{format-time repo.last_build.finished_at}} --}}</p>
-          </div>
-        </li>
+        {{#each repo in running}}
+          {{owner-repo-tile repo=repo}}
+        {{else}}
+          <li>No running builds</li>
+        {{/each}}
       </ul>
     </section>
 
diff --git a/tests/unit/components/owner-repo-tile-test.coffee b/tests/unit/components/owner-repo-tile-test.coffee
index 70577e00..d2afbfc0 100644
--- a/tests/unit/components/owner-repo-tile-test.coffee
+++ b/tests/unit/components/owner-repo-tile-test.coffee
@@ -2,16 +2,44 @@
 
 moduleForComponent 'owner-repo-tile', 'OwnerRepoTileComponent', {
   # specify the other units that are required for this test
-  # needs: ['component:foo', 'helper:bar']
+  needs: ['helper:format-time', 'helper:format-duration', 'helper:format-sha']
 }
 
 test 'it renders', ->
-  expect 2
 
-  # creates the component instance
-  component = @subject()
-  equal component._state, 'preRender'
+  attributes = {
+    slug: "travis-ci/travis-chat",
+    active: false,
+    private: false,
+    default_branch: {
+      name: "master",
+      last_build: {
+        number: "25",
+        state: "passed",
+        duration: 252,
+        event_type: "push",
+        previous_state: "passed",
+        started_at: "2013-07-08T11:03:19Z",
+        finished_at: "2013-07-08T11:06:50Z",
+        commit: {
+          sha: "16fff347ff55403caf44c53357855ebc32adf95d",
+          compare_url: "https://github.com/travis-ci/travis-chat/compare/3c4e9ea50141...16fff347ff55",
+        }
+      }
+    }
+  }
+
+
+  component = @subject(repo: attributes)
 
-  # appends the component to the page
   @append()
-  equal component._state, 'inDOM'
+
+  ok component.$().hasClass('passed'), 'component should have state class (passed)'
+  ok component.$('.icon-status').hasClass('passed'), 'status icon should have state class (passed)'
+  ok component.$('.request-kind').hasClass('push'), 'reuqest icon should have event type class (push)'
+  equal component.$('.tile-main h3').text().trim(), 'travis-ci', 'should display correct owner name'
+  equal component.$('.tile-main h2 a').text().trim(), 'travis-chat', 'should display correct repo name'
+  equal component.$('.build-status a').text().trim(), '25 passed', 'should display correct build number and state'
+  equal component.$('.tile-commit a').text().trim(), '16fff34', 'should display correct commit sha'
+  equal component.$('.tile-timeago').text().trim(), '2 years ago', 'should display correct build duration'
+  equal component.$('.tile-duration').text().trim(), '4 min 12 sec', 'should display correct build finished at time'