diff --git a/stormorganization/stormorganization.install b/stormorganization/stormorganization.install
index 568d7d7..44a338f 100644
--- a/stormorganization/stormorganization.install
+++ b/stormorganization/stormorganization.install
@@ -6,6 +6,12 @@
 function stormorganization_install() {
   variable_set('node_options_stormorganization', array('status'));
 
+  // Uncache node types
+  node_types_rebuild();
+  // Fetch list of current node types and add body field to Storm Organization
+  $types = node_type_get_types();
+  node_add_body_field($types['stormorganization'], 'Note');
+
   $attributes = array();
 
   $attributes['Price mode'] = array(
@@ -328,3 +334,13 @@ function stormorganization_schema() {
 function stormorganization_update_last_removed() {
   return 6202;
 }
+
+function stormorganization_update_7100() {
+  // Uncache node types
+  node_types_rebuild();
+  // Fetch list of current node types and add body field to Storm Organization
+  $types = node_type_get_types();
+  node_add_body_field($types['stormorganization'], 'Note');
+
+  return 'Added D7 style body field to Storm Organization nodes';
+}
diff --git a/stormorganization/stormorganization.module b/stormorganization/stormorganization.module
index 894c250..533cc3d 100644
--- a/stormorganization/stormorganization.module
+++ b/stormorganization/stormorganization.module
@@ -403,8 +403,10 @@ function stormorganization_form(&$node) {
     '#default_value' => isset($node->taxid) ? $node->taxid : NULL,
   );
 
-  if ($type->has_body) {
-    $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
+  //Check to see if the body field is still there, if so display it
+  $body = field_get_items('stormorganization',$node,'body');
+  if($body){
+    $form['body_field'] = $body;
   }
 
   $form['title_old'] = array(
diff --git a/stormorganization/stormorganization.theme.inc b/stormorganization/stormorganization.theme.inc
index 51bda75..c162c6c 100644
--- a/stormorganization/stormorganization.theme.inc
+++ b/stormorganization/stormorganization.theme.inc
@@ -161,15 +161,15 @@ function theme_stormorganization_view($variables) {
     '#markup' => theme('storm_view_item', array('label' => t('Tax ID'), 'value' => check_plain($node->taxid))),
     '#weight' => 3,
   );
-
-  $node->content['body_field'] = array(
-    '#prefix' => '<div class="stormbody">',
-    '#suffix' => '</div>',
-    '#markup' => theme('storm_view_item', array('label' => t('Note'), 'value' => $node->content['body']['#value'])),
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'body_field') : 0,
-  );
-
-  unset($node->content['body']);
+  $body = field_get_items('node',$node,'body');
+  if($body){
+    $node->content['body'] = array(
+      '#prefix' => '<div class="stormbody">',
+      '#suffix' => '</div>',
+      '#markup' => theme('storm_view_item', array('label' => t('Note'), 'value' => check_plain($node->body['und'][0]['value']))),
+      '#weight' => 4,
+    );
+  }
 
   return $node;
 }