diff --git a/drupal_jeditable.js b/drupal_jeditable.js
index 5fae824..0f4c8d3 100644
--- a/drupal_jeditable.js
+++ b/drupal_jeditable.js
@@ -6,6 +6,7 @@
         tooltip   : 'Click to edit...',
         cancel    : 'Cancel',
         submit    : 'Save',
+        onblur    : 'submit',
         style     : 'display: inline; min-width: 100px;'
       });
       $('.jeditable-textarea', context).editable('/jeditable/ajax/save', { 
@@ -13,14 +14,28 @@
         cancel    : 'Cancel',
         submit    : 'OK',
         indicator : 'Saving...',
+        onblur    : 'submit',
         tooltip   : 'Click to edit...'
+
       });
       $('.jeditable-select', context).editable('/jeditable/ajax/save', { 
         loadurl  : '/jeditable/ajax/load',
         type     : 'select',
         submit   : 'OK',
+        indicator : 'Saving...',
+        onblur    : 'submit',
+        cancel    : 'Cancel',
+        tooltip   : 'Click to edit...',
         style    : 'display: inline'
       });
+      // $('.jeditable-upload', context).editable('/jeditable/ajax/save', { 
+      //   indicator : 'Saving...',
+      //   type      : 'ajaxupload',
+      //   submit    : 'upload',
+      //   cancel    : 'Cancel',
+      //   tooltip   : 'Click to edit...',
+      //   submitdata : {row: "photo"}
+      // });
     }
   };
 })(jQuery);
diff --git a/jeditable.module b/jeditable.module
index 4d53f04..2b792a8 100644
--- a/jeditable.module
+++ b/jeditable.module
@@ -70,16 +70,16 @@ function jeditable_field_formatter_info() {
   return array(
     'jeditable_textfield' => array(
       'label' => t('jEditable textfield'),
-      'field types' => array('text', 'text_long', 'text_with_summary', 'number_integer', 'number_decimal', 'number_float', 'list_boolean', 'list_integer', 'list_float', 'list_text'),
+      'field types' => array('text', 'number_integer', 'number_decimal', 'number_float', 'list_boolean', 'list_integer', 'list_float', 'list_text'),
       'settings' => array(
         'fallback_format' => NULL,
         'fallback_settings' => array(),
         'empty_text' => '--',
       ),
     ),
-    'jeditable_checkbox' => array(
-      'label' => t('jEditable checkboxes/radios [not working]'),
-      'field types' => array('list_boolean', 'list_integer', 'list_float', 'list_text'),
+    'jeditable_textarea' => array(
+      'label' => t('jEditable textarea'),
+      'field types' => array('text_long', 'text_with_summary'),
       'settings' => array(
         'fallback_format' => NULL,
         'fallback_settings' => array(),
@@ -87,7 +87,25 @@ function jeditable_field_formatter_info() {
       ),
     ),
     'jeditable_select' => array(
-      'label' => t('jEditable selectlist [not working]'),
+      'label' => t('jEditable selectlist'),
+      'field types' => array('list_boolean', 'list_integer', 'list_float', 'list_text'),
+      'settings' => array(
+        'fallback_format' => NULL,
+        'fallback_settings' => array(),
+        'empty_text' => '--',
+      ),
+    ),
+    'jeditable_upload' => array(
+      'label' => t('jEditable upload [not working]'),
+      'field types' => array('image', 'file'),
+      'settings' => array(
+        'fallback_format' => NULL,
+        'fallback_settings' => array(),
+        'empty_text' => '--',
+      ),
+    ),
+    'jeditable_checkbox' => array(
+      'label' => t('jEditable checkboxes/radios [not working]'),
       'field types' => array('list_boolean', 'list_integer', 'list_float', 'list_text'),
       'settings' => array(
         'fallback_format' => NULL,
@@ -112,21 +130,58 @@ function jeditable_field_formatter_info() {
 function jeditable_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, &$items, $display) {
   $path = drupal_get_path('module', 'jeditable');
   $elements = array();
+
   if(empty($items)) {
     $items[0]['value']=variable_get('jeditable_empty_placeholder', '--');
   }
   list($tmp,$widget_type)=explode('_',$display['type']);
   
-  foreach ($items as $delta => $item) {
-    $field_delta=isset($display['views_field'])?$display['views_field']->options['delta_offset']+$delta:$delta;
-    $elements[$delta] = array(
-      '#markup' => theme('jeditable_formatter_jeditable', array('element' => $item, 'field' => $instance, 'entity' => $entity, 'entity_type' => $entity_type, 'widget_type' => $widget_type, 'delta' => $field_delta )),
-    );
+  switch($display['type']) {
+
+    case 'jeditable_textfield':
+      foreach ($items as $delta => $item) {
+        $field_delta=isset($display['views_field'])?$display['views_field']->options['delta_offset']+$delta:$delta;
+        $elements[$delta] = array(
+          '#markup' => theme('jeditable_formatter_jeditable', array('element' => $item, 'field' => $instance, 'entity' => $entity, 'entity_type' => $entity_type, 'widget_type' => $widget_type, 'delta' => $field_delta )),
+        );
+      }
+      break;
 
+    case 'jeditable_textarea':
+      foreach ($items as $delta => $item) {
+        $field_delta=isset($display['views_field'])?$display['views_field']->options['delta_offset']+$delta:$delta;
+        $elements[$delta] = array(
+          '#markup' => theme('jeditable_formatter_jeditable_textarea', array('element' => $item, 'field' => $instance, 'entity' => $entity, 'entity_type' => $entity_type, 'widget_type' => $widget_type, 'delta' => $field_delta )),
+        );
+      }
+      break;
+
+    case 'jeditable_select':
+      foreach ($items as $delta => $item) {
+        $field_delta=isset($display['views_field'])?$display['views_field']->options['delta_offset']+$delta:$delta;
+        $elements[$delta] = array(
+          '#markup' => theme('jeditable_formatter_jeditable_select', array('element' => $item, 'field' => $instance, 'entity' => $entity, 'entity_type' => $entity_type, 'delta' => $field_delta )),
+        );
+      }
+      break;
+
+    case 'jeditable_upload':
+      foreach ($items as $delta => $item) {
+        $field_delta=isset($display['views_field'])?$display['views_field']->options['delta_offset']+$delta:$delta;
+        $elements[$delta] = array(
+          '#markup' => theme('jeditable_formatter_jeditable_upload', array('element' => $item, 'field' => $instance, 'entity' => $entity, 'entity_type' => $entity_type, 'widget_type' => $widget_type, 'delta' => $field_delta )),
+        );
+      }
+      break;
+
+  }
+
+  foreach ($items as $delta => $item) {
     if (user_access('use jeditable')) {
       $elements[$delta]['#attached'] = array(
         'js' => array(
           $path . '/jquery.jeditable.mini.js',
+          $path . '/jquery.jeditable.ajaxupload.js',
           $path . '/drupal_jeditable.js',
         ),
         'css' => array(
@@ -135,6 +190,7 @@ function jeditable_field_formatter_view($entity_type, $entity, $field, $instance
       );
     }
   }
+
   return $elements;
 }
 
@@ -152,13 +208,19 @@ function jeditable_views_api() {
  * Implements hook_theme().
  */
 function jeditable_theme() {
-  return array(
+  $theme = array(
     'jeditable_formatter_jeditable' => array(
       'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
     ),
+    'jeditable_formatter_jeditable_textarea' => array(
+      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
+    ),
     'jeditable_formatter_jeditable_select' => array(
       'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'delta' => NULL),
     ),
+    'jeditable_formatter_jeditable_upload' => array(
+      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
+    ),
     'jeditable_formatter_jeditable_datetime' => array(
       'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'delta' => NULL),
     ),
@@ -169,20 +231,24 @@ function jeditable_theme() {
       'arguments' => array('node' => NULL),
     ),
   );
+
+  return $theme;
 }
 
 /**
  * Returns the id fo
-
+*/
 /**
  * Theme a text field as a jeditable textfield.
  *
  * @ingroup themeable
  */
 function theme_jeditable_formatter_jeditable($variables) {
+
   $element     = $variables['element'];
   $field       = $variables['field'];
   $entity      = $variables['entity'];
+
   $entity_type = $variables['entity_type'];
   $widget_type = $variables['widget_type'];
 
@@ -192,8 +258,14 @@ function theme_jeditable_formatter_jeditable($variables) {
       if (!node_access('update', $entity)) {
         return $element['value'];
       }
-
       $id = $entity->nid;
+
+      break;
+
+    case 'field_collection_item':
+      // node_access handled by its node.
+      $id = entity_load_single('field_collection_item',$entity->item_id)->hostEntity()->nid;
+
       break;
 
     case 'user':
@@ -204,6 +276,7 @@ function theme_jeditable_formatter_jeditable($variables) {
       $id = $entity->uid;
       break;
   }
+
   if(strpos($field['field_name'],'field_')===0) $entity_type='field';
 
   return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta'] . '" class="jeditable jeditable-textfield">' . $element['value'] . '</span>';
@@ -215,10 +288,12 @@ function theme_jeditable_formatter_jeditable($variables) {
  * @ingroup themeable
  */
 function theme_jeditable_formatter_jeditable_textarea($variables) {
+
   $element     = $variables['element'];
   $field       = $variables['field'];
   $entity      = $variables['entity'];
   $entity_type = $variables['entity_type'];
+  $widget_type = $variables['widget_type'];
 
   switch ($entity_type) {
     case 'node':
@@ -230,6 +305,12 @@ function theme_jeditable_formatter_jeditable_textarea($variables) {
       $id = $entity->nid;
       break;
 
+    case 'field_collection_item':
+      // node_access handled by its node.
+      $id = entity_load_single('field_collection_item',$entity->item_id)->hostEntity()->nid;
+
+      break;
+
     case 'user':
       // Check user's access to editing this user.
       if (!user_edit_access($entity)) {
@@ -239,9 +320,12 @@ function theme_jeditable_formatter_jeditable_textarea($variables) {
       break;
   }
   
-  if($entity_type == 'node') $entity_type='field';
+  // if($entity_type == 'node') $entity_type='field';
+
+  // return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $variables['delta'] . '" class="jeditable jeditable-textarea">' . $element['value'] . '</span>';
+  if(strpos($field['field_name'],'field_')===0) $entity_type='field';
 
-  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $variables['delta'] . '" class="jeditable jeditable-textarea">' . $element['value'] . '</span>';
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta'] . '" class="jeditable jeditable-textarea">' . $element['value'] . '</span>';
 }
 
 /**
@@ -277,9 +361,9 @@ function theme_jeditable_formatter_jeditable_checkbox($variables) {
   $field       = $variables['field'];
   $entity      = $variables['entity'];
   $entity_type = $variables['entity_type'];
-krumo($variables); 
-// echo drupal_render($field);
-die;
+  krumo($variables); 
+  // echo drupal_render($field);
+  //die;
   switch ($entity_type) {
     case 'node':
       // Check user's access to editing this node.
@@ -309,6 +393,7 @@ die;
  * @ingroup themeable
  */
 function theme_jeditable_formatter_jeditable_select($variables) {
+
   $element     = $variables['element'];
   $field       = $variables['field'];
   $entity      = $variables['entity'];
@@ -326,6 +411,13 @@ function theme_jeditable_formatter_jeditable_select($variables) {
       $id = $entity->nid;
       break;
 
+    case 'field_collection_item':
+      // node_access handled by its node.
+      $id = entity_load_single('field_collection_item',$entity->item_id)->hostEntity()->nid;
+
+      break;
+
+
     case 'user':
       // Check user's access to editing this user.
       if (!user_edit_access($entity)) {
@@ -334,18 +426,67 @@ function theme_jeditable_formatter_jeditable_select($variables) {
       $id = $entity->uid;
       break;
   }
-  if($entity_type == 'node') $entity_type='field_checkbox';
+  // if($entity_type == 'node') $entity_type='field';
+  if(strpos($field['field_name'],'field_')===0) $entity_type='field';
 
-  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '- ' . $variables['delta'] . '" class="jeditable jeditable-textfield">' . $element['value'] . '</span>';
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $variables['delta'] . '" class="jeditable jeditable-select">' . $element['value'] . '</span>';
 }
 
 /**
+ * Theme a list field as a jeditable select.
+ *
+ * @ingroup themeable
+ */
+function theme_jeditable_formatter_jeditable_upload($variables) {
+
+  $element     = $variables['element'];
+  $field       = $variables['field'];
+  $entity      = $variables['entity'];
+  $entity_type = $variables['entity_type'];
+  $widget_type = $variables['widget_type'];
+// krumo($variables); 
+// echo drupal_render($field);
+// die;
+  switch ($entity_type) {
+    case 'node':
+      // Check user's access to editing this node.
+      if (!node_access('update', $entity)) {
+        return $element['value'];
+      }
+
+      $id = $entity->nid;
+      break;
+
+    case 'field_collection_item':
+      // node_access handled by its node.
+      $id = entity_load_single('field_collection_item',$entity->item_id)->hostEntity()->nid;
+
+      break;
+
+
+    case 'user':
+      // Check user's access to editing this user.
+      if (!user_edit_access($entity)) {
+        return $element['value'];
+      }
+      $id = $entity->uid;
+      break;
+  }
+  // if($entity_type == 'node') $entity_type='field';
+  if(strpos($field['field_name'],'field_')===0) $entity_type='field';
+
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta'] . '" class="jeditable jeditable-upload">' . (isset($element['filename'])?$element['filename']:$element['value']) . '</span>';
+}
+
+
+/**
  * Theme a workflow state name as a jeditable select list.
  *
  * @param object $node
  *   The node object to be displayed
  * 
  * @ingroup themeable
+ * @return string
  */
 function theme_jeditable_workflow($node) {
   $id = $node->nid;
@@ -363,8 +504,11 @@ function theme_jeditable_workflow($node) {
 function _jeditable_ajax_save() {
   // Retrieve the values needed from the post to this page
   $array = explode('-', $_POST['id']);
+
+  // Assign variables as if they were an array
   list($type, $id, $field_name, $field_type, $delta) = $array;
   $value = check_plain($_POST['value']);
+
 //   drupal_set_message("type $type field $field_name value $value id $id delta $delta");
   switch($type) {
     case 'node':
@@ -392,12 +536,15 @@ function _jeditable_ajax_save() {
       break;
 
     case 'field':
+
       $node = node_load($id);
+
       $delta=intval($delta);
       if(!node_access('update', $node)) { // check to see that current user has update permissions on the node
         $value = 'access denied'; // this is the value that will be returned, but no updates made
       } else {
         $field=field_info_field($field_name);
+
         $lang=$field['translatable']?$node->language:LANGUAGE_NONE;
         // assign nid if nodereference, format date if date, otherwise just assign value
         if($field['type'] == 'nodereference') {
@@ -409,10 +556,26 @@ function _jeditable_ajax_save() {
           $value = date('o-m-d H:i:s', $unixtime);
           $node->{$field_name}[$lang][$delta]['value'] = $value;
         } else {
-          $node->{$field_name}[$lang][$delta]['value'] = $value;
+
+          //if type = node
+          if (isset($field['bundles']['node'])) {
+            $node->{$field_name}[$lang][$delta]['value'] = $value;
+          }
+
+          //if type = field_collection
+          if (isset($field['bundles']['field_collection_item'])) {
+            // get field_collection
+            $field_collection_name  = $field['bundles']['field_collection_item'][0];
+            $field_collection_id    = $node->{$field_collection_name}[$lang][$delta]['value'];
+            $field_collection       = entity_load_single('field_collection_item', array($field_collection_id));
+
+            $field_collection->{$field_name}[$lang][$delta]['value'] = $value;
+          }
+
         }
         $node->revision = variable_get('jeditable_create_new_revisions', false);
         node_save($node);
+        if(isset($field_collection)){$field_collection->save();}
       }
       break;
 
@@ -431,11 +594,16 @@ function _jeditable_ajax_save() {
 function _jeditable_ajax_load() {
   // Retrieve the values needed from the post to this page
   $array = explode('-', $_GET['id']);
+
+  // Assign variables as if they were an array
   list($type, $id, $field_name) = $array;
-  
+
   switch($type) {
+
     case 'node':
+
       /** Not Implemented yet. This is a test case scenario for editing things such as a Node title **/
+
       $node = node_load($id);
       $value = $node->{$field};
       
@@ -447,6 +615,7 @@ function _jeditable_ajax_load() {
       );
       $defaults['selected'] = $value;
       break;
+
     case 'cck':
       /** Right now this supports nodereference only. The same handler should support optionwidget cck types
        *   in a dropdown, but that needs to be sorted out still.
@@ -464,12 +633,30 @@ function _jeditable_ajax_load() {
       }
       $defaults['selected'] = $current_value;
       break;
+
+    case 'field':
+
+      $node = node_load($id);
+
+      if(!node_access('update', $node)) { // check to see that current user has update permissions on the node
+        $value = 'access denied'; // this is the value that will be returned, but no updates made
+      } else {
+
+        $field = field_info_field($field_name);
+
+        //select load values works for both nodes & field_collections
+        $defaults = $field['settings']['allowed_values'];
+
+      }
+      break;
+
     case 'workflow':
       /** Load the workflow states available to the current user **/
       $node = node_load($id);
       $defaults = _jeditable_workflow_load($node, $field_name);
   }
   print json_encode($defaults);
+
   exit();
 }
 
