diff --git a/drupalorg_project/drupalorg_project.info b/drupalorg_project/drupalorg_project.info
index 58ef140..b160abb 100644
--- a/drupalorg_project/drupalorg_project.info
+++ b/drupalorg_project/drupalorg_project.info
@@ -2,7 +2,7 @@ name = Drupal.org project customizations
 description = Drupal.org project functionality related customizations
 package = Drupal.org
 dependencies[] = project
-dependencies[] = project_release
+;dependencies[] = project_release
 dependencies[] = project_issue
-dependencies[] = versioncontrol_git
-core = 6.x
+;dependencies[] = versioncontrol_git
+core = 7.x
diff --git a/drupalorg_project/drupalorg_project.module b/drupalorg_project/drupalorg_project.module
index c61d5ad..ee47cfd 100644
--- a/drupalorg_project/drupalorg_project.module
+++ b/drupalorg_project/drupalorg_project.module
@@ -1134,3 +1134,146 @@ function drupalorg_project_sandbox($node) {
     drupal_goto('node/' . $node->nid, NULL, NULL, 301);
   }
 }
+
+/**
+ * Hides project meta-information since it will be moved to the sidebar.
+ */
+function drupalorg_project_node_view($node, $view_mode = 'full') {
+  if ($view_mode == 'full' && $node->type == 'project_issue') {
+    // @todo D7: Need Version field. It doesn't seem to exist yet?
+    foreach (array('field_project', 'field_issue_component', 'field_issue_category', 'field_issue_assigned', 'taxonomy_vocabulary_9', 'field_issue_status', 'field_issue_priority') as $field) {
+      hide($node->content[$field]);
+    }
+  }
+}
+
+/**
+ * Implements hook_block_info().
+ */
+function drupalorg_project_block_info() {
+  return array(
+    'meta-sidebar' => array(
+      'info' => t('Issue meta-data'),
+      'cache' => DRUPAL_NO_CACHE,
+    ),
+  );
+}
+
+/**
+ * Implements hook_block_view().
+ */
+function drupalorg_project_block_view($delta) {
+  $node = menu_get_object();
+
+  switch ($delta) {
+    case 'meta-sidebar':
+      if (isset($node) && $node->type == 'project_issue') {
+        return array(
+          'subject' => t('Issue status'),
+          'content' => drupalorg_project_issue_meta_data($node),
+        );
+      }
+  }
+}
+
+/**
+ * Creates the issue meta-data sidebar block.
+ *
+ * @param $node
+ *   Node to get issue meta data for.
+ *
+ * @return
+ *   Renderable array for the sidebar block.
+ */
+function drupalorg_project_issue_meta_data($node) {
+  $view = node_view($node);
+  $build = array();
+  $weight = 0;
+
+  // Build the status line.
+  $headers = array();
+  $row = array();
+  // @todo D7 - The values in here are the defaults that ship with Project.
+  // If we customize these values on the field in drupalorg, we will need to
+  // update this code.
+  if (isset($view['field_issue_status'][0]['#markup']) && isset($view['field_issue_status']['#items'][0]['value'])) {
+    $text = $view['field_issue_status'][0]['#markup'];
+    $value = $view['field_issue_status']['#items'][0]['value'];
+    $class = 'issue-ok';
+    switch ($value) {
+      case 13: // Needs work.
+        $class = 'issue-needs-work';
+        break;
+
+      case 4: // Postponed.
+        $class = 'issue-postponed';
+        break;
+
+      case 8: // Needs review.
+        $class = 'issue-needs-review';
+        break;
+
+      case 3: // Closed as duplicate.
+      case 5: // Closed won't fix.
+      case 6: // Closed works as designed.
+      case 18: // Closed cannot reproduce.
+      case 7: // Closed fixed.
+        $class = 'issue-closed';
+        break;
+
+    }
+    $headers[] = t('Status');
+    $row[] = array('data' => $text, 'class' => $class);
+  }
+
+  // @todo D7 - The values in here are the defaults that ship with Project.
+  // If we customize these values on the field in drupalorg, we will need to
+  // update this code.
+  if (isset($view['field_issue_priority'][0]['#markup']) && isset($view['field_issue_priority']['#items'][0]['value'])) {
+    $text = $view['field_issue_priority'][0]['#markup'];
+    $value = $view['field_issue_priority']['#items'][0]['value'];
+    $class = 'issue-normal';
+    switch ($value) {
+      case 400:
+        $class = 'issue-critical';
+        break;
+
+      case 300:
+        $class = 'issue-major';
+        break;
+
+      case 100:
+        $class = 'issue-minor';
+        break;
+    }
+    $headers[] = t('Priority');
+    $row[] = array('data' => $text, 'class' => $class);
+  }
+
+  $build['status'] = array(
+    '#markup' => theme('table', array('header' => $headers, 'rows' => array($row), 'attributes' => array('class' => array('issue-status')))),
+  );
+
+  // Build the main area of the status block.
+  $build['fields'] = array();
+  // @todo D7: Need Version field. It doesn't seem to exist yet?
+  foreach (array('field_project', 'field_issue_component', 'field_issue_category', 'field_issue_assigned', 'taxonomy_vocabulary_9') as $field) {
+    if (isset($view[$field]) && count($view[$field])) {
+      $build['fields'][$field] = $view[$field];
+      $build['fields'][$field]['#weight'] = $weight;
+      show($build['fields'][$field]);
+      $weight++;
+    }
+  }
+
+  // Add the Update and Follow buttons.
+
+  $update_text = '<span class="update-text">' . t('Update this issue') . '</span><br /><span class="date-text">' . t('Last updated on @date', array('@date' => format_date($node->changed))) . '</span>';
+  $build['update_button'] = array(
+    '#markup' => l($update_text, 'node/' . $node->nid . '/edit', array('attributes' => array('class' => array('issue-update-button')), 'html' => TRUE)),
+  );
+
+  // @todo D7 - figure out how to do the Follow button (Flag).
+
+  return $build;
+}