diff --git a/modules/simplytest_tugboat/assets/simplytest_tugboat_status.js b/modules/simplytest_tugboat/assets/simplytest_tugboat_status.js
index aaade81..9898b9a 100644
--- a/modules/simplytest_tugboat/assets/simplytest_tugboat_status.js
+++ b/modules/simplytest_tugboat/assets/simplytest_tugboat_status.js
@@ -31,12 +31,13 @@
                 }, 1000);
                 $('.percentage', progressbar).html(data.percent + '%');
                 $('.message', progressbar).html(data.message);
+                $('.log', progressbar).html(data.log);
                 if (data.percent == 100) {
 
                   // Putting in an intentional delay to let the tugboat API return the URL and STM to process it.
                   // Redirect to the tugboat "go to" page to get the tugboat URL.
                   window.location.href = Drupal.settings.basePath + 'tugboat/goto/' + Drupal.settings.simplytest_tugboat.id;;
-                } else {
+                } else if (data.percent < 100){
                   setTimeout(reload, 2000);
                 }
               }
diff --git a/modules/simplytest_tugboat/simplytest_tugboat.instance_status.inc b/modules/simplytest_tugboat/simplytest_tugboat.instance_status.inc
index a264472..6e025a0 100644
--- a/modules/simplytest_tugboat/simplytest_tugboat.instance_status.inc
+++ b/modules/simplytest_tugboat/simplytest_tugboat.instance_status.inc
@@ -198,7 +198,7 @@ function simplytest_tugboat_status_progress_page($id) {
       '#tag' => 'meta',
       '#attributes' => array(
         'http-equiv' => 'Refresh',
-        'content' => '2; URL=' . $url,
+        'content' => '5; URL=' . $url,
       ),
     );
     drupal_add_html_head($meta_refresh, 'simplytest_tugboat_status_meta_refresh');
@@ -213,6 +213,8 @@ function simplytest_tugboat_status_progress_page($id) {
 
   } else {
 
+    watchdog('message', 'State: ' . var_export($state, TRUE));
+
     // Redirect through a 'Refresh' meta tag if JavaScript is disabled.
     $meta_refresh = array(
       '#prefix' => '<noscript>',
@@ -221,7 +223,7 @@ function simplytest_tugboat_status_progress_page($id) {
       '#attributes' => array(
         'http-equiv' => 'Refresh',
         // Keep refreshing the current page, but mark each refresh with no_js.
-        'content' => '2; URL=' . url(current_path(), array('query' => array('no_js' => NULL))),
+        'content' => '5; URL=' . url(current_path(), array('query' => array('no_js' => NULL))),
       ),
     );
     drupal_add_html_head($meta_refresh, 'simplytest_tugboat_status_meta_refresh');
@@ -230,8 +232,8 @@ function simplytest_tugboat_status_progress_page($id) {
     return array(
       '#type' => 'container',
       '#attributes' => array(
-        'class' => array('simplytest-progress-bar'),
-      ),
+          'class' => array('simplytest-progress-bar'),
+       ),
       '#attached' => array(
         'js' => array(
           array(
@@ -249,6 +251,15 @@ function simplytest_tugboat_status_progress_page($id) {
         '#percent' => $state['percent'],
         '#message' => $state['message'],
       ),
+      'log' => array(
+        '#prefix' => '<div id="simplytest-log" class="log">',
+        '#markup' => $state['log'],
+	'#suffix' => '</div>',
+        //'#children' => t('number of items: ' . count($state['log'])),
+        '#cache' => array(
+          'expire' => time(),
+        ),
+      ),
     );
   }
 }
@@ -332,6 +343,7 @@ function simplytest_tugboat_status_state($instance_id) {
   $status_code = FALSE;
   $percent = 0;
   $message = t('No instance status found...');
+  $log = array();
 
   if (!empty($statuses)) {
     $instance_status = array_pop($statuses);
@@ -341,6 +353,8 @@ function simplytest_tugboat_status_state($instance_id) {
       $status_code = $status['code'];
       $percent = simplytest_tugboat_status_running_percentage($status['code']);
       $message = $status['message'];
+      $log = _simplytest_tugboat_get_log($instance_id);
+      //watchdog('message', 'regenerating log: ' . count($log));
     }
   }
 
@@ -348,6 +362,7 @@ function simplytest_tugboat_status_state($instance_id) {
     'code' => $status_code,
     'percent' => $percent,
     'message' => $message,
+    'log' => $log,
   ];
 }
 
diff --git a/modules/simplytest_tugboat/simplytest_tugboat.module b/modules/simplytest_tugboat/simplytest_tugboat.module
index b6d7a65..966a531 100644
--- a/modules/simplytest_tugboat/simplytest_tugboat.module
+++ b/modules/simplytest_tugboat/simplytest_tugboat.module
@@ -222,6 +222,44 @@ function _simplytest_tugboat_launch_instance($submission) {
   simplytest_tugboat_status_goto($ref);
 }
 
+/**
+ * Get instance log.
+ *
+ * @param $instance_id
+ */
+function _simplytest_tugboat_get_log($instance_id) {
+
+  $tugboat_repo = variable_get('tugboat_repository_id');
+
+  $return_data = array();
+  $error_string = '';
+
+  watchdog('message', 'we are in the log function for ' . $instance_id);
+   
+  
+  // Load the ID of the correct base preview ID.
+  $preview_id = simplytest_tugboat_load_preview_id($instance_id, FALSE);
+  
+  // Run the tugboat command.
+  $command = "log $preview_id";
+  $return_status = _tugboat_execute($command, $return_data, $error_string);
+  $log = array();
+  foreach ($return_data as $log_entry) {
+    $class = 'log-message';
+    if ($log_entry['level'] == 'error') {
+      $class = 'log-error';
+    } else if ($log_entry['level'] == 'stderr') {
+      $class = 'log-detail';
+    }
+    $message = $log_entry['message'];
+    // TODO - look at cleanup.
+    //$message = preg_replace('/[^A-Za-z0-9 .]/u','',$message);
+    $log[] = '<p class="' . $class . '">' . $message . "</p>";
+  }
+  return implode(' ', $log);
+}
+
+
 /**
  * Call tugboat and start spawning the new instance.
  *
@@ -254,7 +292,7 @@ function _simplytest_tugboat_execute_tugboat($instance_id) {
   simplytest_tugboat_status_update($instance_id, SIMPLYTEST_STATUS_PREPARE);
 
   // Load the ID of the correct base preview ID.
-  $base_preview_id = simplytest_tugboat_load_preview_id($context);
+  $base_preview_id = simplytest_tugboat_load_preview_id($context, TRUE);
 
   watchdog('message', 'Trying to load base preview ' . $base_preview_id);
 
@@ -294,8 +332,13 @@ function _simplytest_tugboat_execute_tugboat($instance_id) {
  * @param $context
  * @return string
  */
-function simplytest_tugboat_load_preview_id($context) {
-  $branch_name = 'base-' . $context;
+function simplytest_tugboat_load_preview_id($context, $base = TRUE) {
+  if ($base) {
+    $branch_name = 'base-' . $context;
+  } else {
+    $branch_name = $context;
+  }
+  watchdog('message', 'Loading preview ID for ' . $branch_name); 
   $previews = array();
   $error_string = '';
   $return_status = _tugboat_execute("ls previews", $previews, $error_string);
@@ -306,20 +349,31 @@ function simplytest_tugboat_load_preview_id($context) {
   $max_id = NULL;
 
   // Find the most recent preview ID for the base.
-  $acceptable_states = array(
-    'ready',
-    'suspended',
-    'refreshing',
-  );
+  if ($base) {
+    $acceptable_states = array(
+      'ready',
+      'suspended',
+      'refreshing',
+    );
+  } else {
+    $acceptable_states = array(
+      'building',
+      'pending',
+      'new',
+      'ready',
+      'suspended',
+      'refreshing',
+    );
+  }
   $repo = variable_get('simplytest_tugboat_github_repo');
   $ns = variable_get('simplytest_tugboat_github_ns');
   $repo_filter = 'https://github.com/' . $ns . '/' . $repo;
-  watchdog('simplytest_tugboat', 'Previews: ' . var_export($previews, TRUE));
+  //watchdog('simplytest_tugboat', 'Previews: ' . var_export($previews, TRUE));
   foreach ($previews as $num => $preview) {
     $ts = strtotime($preview['createdAt']);
-    if ($preview['provider_ref']['name'] == $branch_name
-      and $max_timestamp < $ts
-      and in_array($preview['state'], $acceptable_states)
+    if ($preview['provider_label'] == $branch_name
+      //and $max_timestamp < $ts
+      //and in_array($preview['state'], $acceptable_states)
       and strpos($preview['provider_link'], $repo_filter) !== FALSE
     ) {
       $max_id = $preview['id'];
@@ -329,9 +383,15 @@ function simplytest_tugboat_load_preview_id($context) {
 
   // Throw error if ID not found
   if (empty($max_id)) {
-    watchdog('simplytest_tugboat', 'No base preview for: %sid', array(
-      '%sid' => $context,
-    ), WATCHDOG_ERROR);
+    if ($base) {
+      watchdog('simplytest_tugboat', 'No base preview for: %sid', array(
+        '%sid' => $context,
+      ), WATCHDOG_ERROR);
+    } else {
+      watchdog('simplytest_tugboat', 'No preview for: %sid', array(
+        '%sid' => $context,
+      ), WATCHDOG_ERROR);
+    }
   }
   return $max_id;
 }
diff --git a/themes/simplytesty/simplytesty.info b/themes/simplytesty/simplytesty.info
index 1ff7898..9a943bf 100644
--- a/themes/simplytesty/simplytesty.info
+++ b/themes/simplytesty/simplytesty.info
@@ -4,6 +4,7 @@ core = 7.x
 engine = phptemplate
 
 stylesheets[all][] = style.css
+stylesheets[all][] = terminal.css
 stylesheets[screen and (max-width: 1030px)][] = style-small.css
 stylesheets[screen and (max-width: 575px)][] = style-narrow.css
 
diff --git a/themes/simplytesty/terminal.css b/themes/simplytesty/terminal.css
new file mode 100644
index 0000000..1c03656
--- /dev/null
+++ b/themes/simplytesty/terminal.css
@@ -0,0 +1,30 @@
+#simplytest-log {
+    width: 925px;
+    text-align: left;
+    font-size: 1em;
+    font-family: monospace;
+    white-space: normal;
+    color: white;
+    background-color: black;
+    height: 600px;
+    overflow: scroll;
+}
+
+#simplytest-log p {
+    display: block;
+    padding-bottom: 10px;
+}
+
+#simplytest-log p.log-error {
+    color: red;
+}
+
+#simplytest-log p.log-message {
+
+}
+
+#simplytest-log p.log-detail {
+    color: #9f9f9f;
+    font-weight: bold;
+    font-size: .80em;
+}
\ No newline at end of file