diff --git a/app/components/big-text.js b/app/components/big-text.js
index 710a787595..4a51c78971 100644
--- a/app/components/big-text.js
+++ b/app/components/big-text.js
@@ -1,5 +1,9 @@
 import Ember from 'ember';
 
+const {computed, Handlebars} = Ember;
+const {SafeString} = Handlebars;
+const {collect, sum} = computed;
+
 export default Ember.Component.extend({
   expanded: false,
   classNames: ['big-text'],
@@ -8,28 +12,36 @@ export default Ember.Component.extend({
   expandIcon: 'info-circle',
   text: '',
   ellipsis: 'ellipsis-h',
-  lengths: Ember.computed.collect('length', 'slippage'),
-  totalLength: Ember.computed.sum('lengths'),
-  promptText: '',
-  showIcons: function(){
-    return this.get('displayText') !== this.get('cleanText');
-  }.property('displayText', 'text'),
-  cleanText: function(){
-    var text = this.get('text');
-    if(text === undefined || text == null){
-      return this.get('promptText')?this.get('promptText').toString():'';
+  lengths: collect('length', 'slippage'),
+  totalLength: sum('lengths'),
+  renderHtml: true,
+  showIcons: computed('displayText', 'text', 'renderHtml', function(){
+    if(this.get('renderHtml')){
+      return this.get('displayText').toString() !== this.get('text');
+    } else {
+      return this.get('displayText').toString() !== this.get('cleanText');
     }
+  }),
+  cleanText: computed('text', function(){
     //strip any possible HTML out of the text
-    return text.replace(/(<([^>]+)>)/ig,"");
-  }.property('text'),
-  displayText: function(){
-    var text = this.get('cleanText');
-    if(this.get('expanded') || text.length < this.get('totalLength')){
-      return text;
+    return this.get('text').replace(/(<([^>]+)>)/ig,"");
+  }),
+  displayText: computed('cleanText', 'totalLength', 'length', 'expanded', function(){
+    let cleanText = this.get('cleanText');
+    let text;
+    if(this.get('expanded') || cleanText.length < this.get('totalLength')){
+      if(this.get('renderHtml')){
+        text = this.get('text');
+      } else {
+        text = cleanText;
+      }
+    } else {
+      text = cleanText.substring(0, this.get('length'));
     }
-
-    return text.substring(0, this.get('length'));
-  }.property('cleanText', 'totalLength', 'length', 'expanded'),
+    
+    return new SafeString(text);
+    
+  }),
   actions: {
     click: function(){
       this.sendAction();
diff --git a/app/components/detail-objectives.js b/app/components/detail-objectives.js
index 887e9cbdce..671235885b 100644
--- a/app/components/detail-objectives.js
+++ b/app/components/detail-objectives.js
@@ -1,24 +1,32 @@
 import Ember from 'ember';
 import scrollTo from '../utils/scroll-to';
+import config from 'ilios/config/environment';
+
+const {computed, inject} = Ember;
+const {service} = inject;
+const {or, notEmpty} = computed;
 
 export default Ember.Component.extend({
-  store: Ember.inject.service(),
+  store: service(),
+  flashMessages: service(),
   subject: null,
   classNames: ['detail-objectives'],
   isCourse: false,
   isSession: false,
   isProgramYear: false,
-  isManaging: Ember.computed.or('isManagingParents', 'isManagingDescriptors', 'isManagingCompetency'),
-  isManagingParents: Ember.computed.notEmpty('mangeParentsObjective'),
+  isManaging: or('isManagingParents', 'isManagingDescriptors', 'isManagingCompetency'),
+  isManagingParents: notEmpty('mangeParentsObjective'),
   mangeParentsObjective: null,
   initialStateForManageParentsObjective: [],
-  isManagingDescriptors: Ember.computed.notEmpty('manageDescriptorsObjective'),
+  isManagingDescriptors: notEmpty('manageDescriptorsObjective'),
   mangeMeshObjective: null,
   initialStateForManageMeshObjective: [],
-  isManagingCompetency: Ember.computed.notEmpty('manageCompetencyObjective'),
+  isManagingCompetency: notEmpty('manageCompetencyObjective'),
   manageCompetencyObjective: null,
   initialStateForManageCompetencyObjective: null,
-  newObjectives: [],
+  newObjectiveEditorOn: false,
+  newObjectiveTitle: null,
+  editorParams: config.froalaEditorDefaults,
   actions: {
     manageParents: function(objective){
       objective.get('parents').then((parents) => {
@@ -125,13 +133,9 @@ export default Ember.Component.extend({
         scrollTo("#objective-" + objective.get('id'));
       }
     },
-    addObjective: function(){
-      var objective = this.get('store').createRecord('objective');
-      this.get('newObjectives').addObject(objective);
-    },
-    saveNewObjective: function(newObjective){
-      var self = this;
-      self.get('newObjectives').removeObject(newObjective);
+    saveNewObjective: function(){
+      let newObjective = this.get('store').createRecord('objective');
+      newObjective.set('title', this.get('newObjectiveTitle'));
       if(this.get('isCourse')){
         newObjective.get('courses').addObject(this.get('subject'));
       }
@@ -141,15 +145,26 @@ export default Ember.Component.extend({
       if(this.get('isProgramYear')){
         newObjective.get('programYears').addObject(this.get('subject'));
       }
-      newObjective.save().then(function(savedObjective){
-        self.get('subject.objectives').then(function(objectives){
+      newObjective.save().then(savedObjective => {
+        this.get('subject.objectives').then(objectives => {
           objectives.addObject(savedObjective);
-          objectives.save();
         });
+        this.send('closeNewObjectiveEditor');
+        this.get('flashMessages').success('courses.newObjectiveSaved');
       });
     },
-    removeNewObjective: function(newObjective){
-      this.get('newObjectives').removeObject(newObjective);
+    toggleNewObjectiveEditor() {
+      this.set('newObjectiveTitle', null);
+      this.set('newObjectiveEditorOn', !this.get('newObjectiveEditorOn'));
+    },
+    closeNewObjectiveEditor() {
+      this.set('newObjectiveTitle', null);
+      this.set('newObjectiveEditorOn', false);
+    },
+    changeNewObjectiveTitle(event, editor){
+      if(editor){
+        this.set('newObjectiveTitle', editor.getHTML());
+      }
     },
   }
 });
diff --git a/app/components/inplace-html.js b/app/components/inplace-html.js
new file mode 100644
index 0000000000..40b280cb40
--- /dev/null
+++ b/app/components/inplace-html.js
@@ -0,0 +1,18 @@
+import Ember from 'ember';
+import config from 'ilios/config/environment';
+import InPlace from 'ilios/mixins/inplace';
+
+export default Ember.Component.extend(InPlace, {
+  classNames: ['editinplace', 'inplace-html'],
+  editorParams: config.froalaEditorDefaults,
+  willDestroyElement(){
+    this.$('.control .froala-box').editable('destroy');
+  },
+  actions: {
+    grabChangedValue: function(event, editor){
+      if(editor){
+        this.send('changeValue', editor.getHTML());
+      }
+    }
+  }
+});
diff --git a/app/components/new-learningmaterial.js b/app/components/new-learningmaterial.js
index dde2f270bc..ec9cb8e59c 100644
--- a/app/components/new-learningmaterial.js
+++ b/app/components/new-learningmaterial.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import config from 'ilios/config/environment';
 import layout from '../templates/components/new-learningmaterial';
 
 export default Ember.Component.extend({
@@ -17,6 +18,7 @@ export default Ember.Component.extend({
   isCitation: function(){
     return this.get('learningMaterial.type') === 'citation';
   }.property('learningMaterial.type'),
+  editorParams: config.froalaEditorDefaults,
   actions: {
     save: function(){
       this.sendAction('save', this.get('learningMaterial'));
@@ -41,6 +43,11 @@ export default Ember.Component.extend({
       let learningMaterialUserRoles = this.get('learningMaterialUserRoles');
       let role = learningMaterialUserRoles.toArray()[selectedIndex];
       this.set('learningMaterial.userRole', role);
-    }
+    },
+    changeDescription(event, editor){
+      if(editor){
+        this.get('learningMaterial').set('description', editor.getHTML());
+      }
+    },
   }
 });
diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js
index e143d920c2..1ecc59243e 100644
--- a/app/locales/en/translations.js
+++ b/app/locales/en/translations.js
@@ -203,6 +203,7 @@ export default {
     'title': 'Course Title',
     'objectiveParentTitle': 'Select Parent Objectives',
     'objectiveDescriptorTitle': 'Select MeSH Descriptors',
+    'newObjectiveSaved': 'New Objective Saved',
     'chooseCohortTitle': 'Select Parent For',
     'missingCohortMessage': 'Please add at least one cohort to this course.',
     'confirmRemove': 'Are you sure you want to delete this course, with {{publishedOfferingCount}} published offerings? This action will remove all sessions and offerings for this course, and cannot be undone.',
diff --git a/app/locales/es/translations.js b/app/locales/es/translations.js
index eb0ee83787..63cd714559 100644
--- a/app/locales/es/translations.js
+++ b/app/locales/es/translations.js
@@ -203,6 +203,7 @@ export default {
     'title': 'Titulo de Curso',
     'objectiveParentTitle': 'Seleccione Objetivos Principales',
     'objectiveDescriptorTitle': 'Seleccione Descriptores de MeSH',
+    'newObjectiveSaved': 'Nuevo Objetivo Guardado',
     'chooseCohortTitle': 'Seleccione Matriz Para',
     'missingCohortMessage': 'Favor de agregar por lo menos un Clase de La Graduación a este curso.',
     'confirmRemove': ' ¿Estás seguro que quieres borrar este curso, con {{publishedOfferingCount}} ofrecimientos publicados? Esta acción borrará todas las sessiones y ofrecimientos para este curso y no se puede deshacer.',
diff --git a/app/locales/fr/translations.js b/app/locales/fr/translations.js
index 497365a42a..d7c181d766 100755
--- a/app/locales/fr/translations.js
+++ b/app/locales/fr/translations.js
@@ -203,6 +203,7 @@ export default {
     'title': "Titre de Cours",
     'objectiveParentTitle': "Choisi Objectifs mères",
     'objectiveDescriptorTitle': "Choisi MeSH",
+    'newObjectiveSaved': 'Nouvel objective sauvé',
     'chooseCohortTitle': "Choisi objectif mère pour",
     'missingCohortMessage': "S'il vous plait ajouter au moins un cohort à ce cours.",
     'confirmRemove': "Êtes-vous sûr vous voulez supprimer ce cours, avec {{publishedOfferingCount}} offres publié? Cela supprimera toutes sessions et offres pour ce cours, et ne peut pas être défait.",
diff --git a/app/mirage/fixtures/objectives.js b/app/mirage/fixtures/objectives.js
index 66c1e77cd5..19dfc2db07 100644
--- a/app/mirage/fixtures/objectives.js
+++ b/app/mirage/fixtures/objectives.js
@@ -961,7 +961,7 @@ export default [
 
   {
     'id' : 76350,
-    'title' : "<span style='font-size:16.0pt !msorm;font-family:&quot;Times New Roman&quot; !msorm'><span style='font-size:10.0pt;font-family:&quot;Century Schoolbook&quot;;mso-bidi-font-family: &quot;Times New Roman&quot;'><span style='mso-prop-change:csc 20120724T1725'><span class='msoIns'><emns cite='mailto:csc' datetime='2012-07-24T17:24'></ins></span></span></span></span><span class='msoins'><span style='font-size:10.0pt;font-family: &quot;Century Schoolbook&quot;;mso-fareast-font-family:&quot;Times New Roman&quot;'>Describe and explain the general organization of the body and, in more detail, the anatomy of the musculoskeletal and nervous systems, including selected features of embryological development (early development, gastrulation, neurulation, segmentation, </span></span><span class='msoins'><span style='font-family:&quot;Century Schoolbook&quot;;mso-fareast-font-family:&quot;Times New Roman&quot;'>& </span></span><span class='msoins'><span style='font-size:10.0pt;font-family: &quot;Century Schoolbook&quot;;mso-fareast-font-family:&quot;Times New Roman&quot;'>development of the musculoskeletal system).</span></span>      <br><span style='font-size:10.0pt;font-family:&quot;Century Schoolbook&quot;;mso-bidi-font-family: &quot;Times New Roman&quot;'><span style='font-size:16.0pt !msorm; font-family:&quot;Times New Roman&quot; !msorm'><span style='mso-prop-change:csc 20120724T1725'><span class='msoIns'><emns cite='mailto:csc' datetime='2012-07-24T17:24'></ins></span></span></span></span><span style='font-family:Courier !msorm'><span style='font-size:10.0pt;font-family: &quot;Century Schoolbook&quot;;mso-bidi-font-family:Courier'><span style='mso-prop-change: csc 20120724T1725'></span></span></span>",
+    'title' : "<span style='font-size:16.0pt !msorm;font-family:&quot;Times New Roman&quot; !msorm'><span style='font-size:10.0pt;font-family:&quot;Century Schoolbook&quot;;mso-bidi-font-family: &quot;Times New Roman&quot;'><span style='mso-prop-change:csc 20120724T1725'><span class='msoIns'><emns cite='mailto:csc' datetime='2012-07-24T17:24'></ins></span></span></span></span><span class='msoins'><span style='font-size:10.0pt;font-family: &quot;Century Schoolbook&quot;;mso-fareast-font-family:&quot;Times New Roman&quot;'>Describe and explain the general organization of the body and, in more detail, the anatomy of the musculoskeletal and nervous systems, including selected features of embryological development (early development, gastrulation, neurulation, segmentation, </span></span><span class='msoins'><span style='font-family:&quot;Century Schoolbook&quot;;mso-fareast-font-family:&quot;Times New Roman&quot;'>& </span><ol><li>First</li></ol><ul><li>second</li></ul></span><span class='msoins'><span style='font-size:10.0pt;font-family: &quot;Century Schoolbook&quot;;mso-fareast-font-family:&quot;Times New Roman&quot;'>development of the musculoskeletal system).</span></span>      <br><span style='font-size:10.0pt;font-family:&quot;Century Schoolbook&quot;;mso-bidi-font-family: &quot;Times New Roman&quot;'><span style='font-size:16.0pt !msorm; font-family:&quot;Times New Roman&quot; !msorm'><span style='mso-prop-change:csc 20120724T1725'><span class='msoIns'><emns cite='mailto:csc' datetime='2012-07-24T17:24'></ins></span></span></span></span><span style='font-family:Courier !msorm'><span style='font-size:10.0pt;font-family: &quot;Century Schoolbook&quot;;mso-bidi-font-family:Courier'><span style='mso-prop-change: csc 20120724T1725'></span></span></span>",
     'courses' : [ '595' ],
     'programYears' : [],
     'sessions' : [],
@@ -2820,4 +2820,4 @@ export default [
     'children' : [],
     'meshDescriptors' : []
   },
-];
\ No newline at end of file
+];
diff --git a/app/styles/components/_global.scss b/app/styles/components/_global.scss
index f54d5d278a..bcb4fb49b3 100644
--- a/app/styles/components/_global.scss
+++ b/app/styles/components/_global.scss
@@ -316,3 +316,30 @@ select:hover {
 ::-webkit-scrollbar-thumb:window-inactive {
   background: rgba(0, 0, 0, .05);
 }
+
+.list-reset {
+  ul { 
+    list-style-position: inside; 
+    list-style-type: disc; 
+  }
+  
+  ol { 
+    list-style-position: inside; 
+    list-style-type: decimal; 
+  }
+  
+  ul ul,
+  ol ul { 
+    list-style-position: inside; 
+    list-style-type: circle; 
+    margin-left: 15px; 
+  }
+  
+  ol ol,
+  ul ol { 
+    list-style-position: inside; 
+    list-style-type: lower-latin; 
+    margin-left: 15px; 
+  }
+  
+}
diff --git a/app/templates/components/.gitkeep b/app/templates/components/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/templates/components/big-text.hbs b/app/templates/components/big-text.hbs
index 9d28b09134..7b4658b164 100644
--- a/app/templates/components/big-text.hbs
+++ b/app/templates/components/big-text.hbs
@@ -1,4 +1,4 @@
-<span {{action 'click'}}>{{displayText}}</span>
+<span class="{{if renderHtml 'list-reset'}}" {{action 'click'}}>{{displayText}}</span>
 {{#if showIcons}}
   <span class='clickable' {{action 'expand'}}>
     {{fa-icon ellipsis classNames='text-bottom'}} {{fa-icon expandIcon}}
diff --git a/app/templates/components/course-objective-list.hbs b/app/templates/components/course-objective-list.hbs
index 186d912654..7bb3d01ba6 100644
--- a/app/templates/components/course-objective-list.hbs
+++ b/app/templates/components/course-objective-list.hbs
@@ -10,7 +10,7 @@
     {{#each sortedObjectives as |objective|}}
     <tr id="objective-{{objective.id}}">
       <td class='text-left text-top' colspan=2>
-        {{inplace-textarea value=objective.title save='changeObjectiveTitle' condition=objective.id}}
+        {{inplace-html value=objective.title save='changeObjectiveTitle' condition=objective.id}}
       </td>
       <td class='text-left text-top'>
         {{#if objective.hasParents}}
diff --git a/app/templates/components/course-objective-manager.hbs b/app/templates/components/course-objective-manager.hbs
index c3a0d75f2a..744d23718f 100644
--- a/app/templates/components/course-objective-manager.hbs
+++ b/app/templates/components/course-objective-manager.hbs
@@ -1,4 +1,4 @@
-<h2>{{{courseObjective.title}}}</h2>
+<div class='list-reset objectivetitle'>{{{courseObjective.title}}}</div>
 {{#liquid-if showCohortList class="horizontal"}}
   <label class='group-picker'>
     {{t 'courses.chooseCohortTitle'}}:
diff --git a/app/templates/components/detail-objectives.hbs b/app/templates/components/detail-objectives.hbs
index a74e2b41e0..0b44a12fa2 100644
--- a/app/templates/components/detail-objectives.hbs
+++ b/app/templates/components/detail-objectives.hbs
@@ -25,23 +25,25 @@
       <button class='bigadd' {{action 'save'}}>{{fa-icon 'check'}}</button>
       <button class='bigcancel' {{action 'cancel'}}>{{fa-icon 'undo'}}</button>
     {{else}}
-      <button {{action 'addObjective'}}>{{t 'general.addNew'}}</button>
+      {{expand-collapse-button value=newObjectiveEditorOn action="toggleNewObjectiveEditor"}}
     {{/liquid-if}}
   </div>
   <div class='detail-content'>
-    {{#liquid-if newObjectives.length class='vertical'}}
+    {{#liquid-if newObjectiveEditorOn class='vertical'}}
       <section class='resultslist-new'>
-        {{#each newObjectives as |objective|}}
-          <section class='newobjective'>
-            <label>
-              {{t 'general.title'}}:
-              {{textarea value=objective.title}}
-            </label>
-            <br />
-            <button class='done text' {{action 'saveNewObjective' objective}}>{{t 'general.done'}}</button>
-            <button class='cancel text' {{action 'removeNewObjective' objective}}>{{t 'general.cancel'}}</button>
-          </section>
-        {{/each}}
+        <section class='newobjective'>
+          <label>
+            {{t 'general.title'}}:
+            {{froala-editor
+              params=editorParams
+              value=newObjectiveTitle
+              contentChanged=(action "changeNewObjectiveTitle")
+            }}
+          </label>
+          <br />
+          <button class='done text' {{action 'saveNewObjective'}}>{{t 'general.done'}}</button>
+          <button class='cancel text' {{action 'closeNewObjectiveEditor'}}>{{t 'general.cancel'}}</button>
+        </section>
       </section>
     {{/liquid-if}}
     {{#liquid-unless isManaging class="horizontal"}}
diff --git a/app/templates/components/inplace-html.hbs b/app/templates/components/inplace-html.hbs
new file mode 100644
index 0000000000..534b89129e
--- /dev/null
+++ b/app/templates/components/inplace-html.hbs
@@ -0,0 +1,25 @@
+<span class='content'>
+  {{#unless isEditing}}
+    <span class='editable'>
+      {{#if value.length}}
+        {{big-text text=value action='edit' renderHtml=true}}
+      {{else}}
+        <span {{action 'edit'}}>{{clickPrompt}}</span>
+      {{/if}}
+    </span>
+  {{else}}
+    <span class='editor'>
+      <span class='control list-reset'>
+        {{froala-editor
+          params=editorParams
+          value=buffer 
+          contentChanged=(action "grabChangedValue")
+        }}
+      </span>
+      <span class='actions'>
+        <button class='done icon' title='{{t "general.save"}}' {{action 'save'}}>{{fa-icon 'check'}}</button>
+        <button class='cancel icon' title='{{t "general.cancel"}}' {{action 'cancel'}}>{{fa-icon 'times'}}</button>
+      </span>
+    </span>
+  {{/unless}}
+</span>
diff --git a/app/templates/components/inplace-textarea.hbs b/app/templates/components/inplace-textarea.hbs
index 17865c3317..e33d76497d 100644
--- a/app/templates/components/inplace-textarea.hbs
+++ b/app/templates/components/inplace-textarea.hbs
@@ -1,14 +1,18 @@
 <span class='content'>
   {{#unless isEditing}}
     <span class='editable'>
-      {{big-text text=value action='edit' promptText=clickPrompt}}
+      {{#if value.length}}
+        {{big-text text=value action='edit'}}
+      {{else}}
+        <span {{action 'edit'}}>{{clickPrompt}}</span>      
+      {{/if}}
     </span>
   {{else}}
     <span class='editor'>
       <span class='control'>
         <textarea
           type='text'
-          value="target.value"
+          value={{buffer}}
           onKeyUp={{action "changeValue" value="target.value"}}
           onChange={{action "changeValue" value="target.value"}}>
           {{value}}
diff --git a/app/templates/components/learningmaterial-manager.hbs b/app/templates/components/learningmaterial-manager.hbs
index 0f4e7f5546..119ea2bab5 100644
--- a/app/templates/components/learningmaterial-manager.hbs
+++ b/app/templates/components/learningmaterial-manager.hbs
@@ -22,7 +22,7 @@
   <div class="form-col-12">
     <label class="form-label">{{t 'learningMaterials.instructionalNotes'}}:</label>
     <div class="form-data notes">
-      {{inplace-textarea value=valueBuffer.notes save='changeNotes'}}
+      {{inplace-html value=valueBuffer.notes save='changeNotes'}}
     </div>
   </div>
   <div class="form-col-12">
@@ -52,7 +52,7 @@
   <div class="form-col-12">
     <label class="form-label">{{t 'general.description'}}:</label>
     <div class="form-data">
-      <span class='description'>{{ learningMaterial.learningMaterial.description }}</span>
+      <span class='description list-reset'>{{{ learningMaterial.learningMaterial.description }}}</span>
     </div>
   </div>
   {{!-- {{#if learningMaterial.learningMaterial.filename}} --}}
diff --git a/app/templates/components/new-learningmaterial.hbs b/app/templates/components/new-learningmaterial.hbs
index fbf136f7de..b1c8396c43 100644
--- a/app/templates/components/new-learningmaterial.hbs
+++ b/app/templates/components/new-learningmaterial.hbs
@@ -37,7 +37,13 @@
   </div>
   <div class="form-col-12">
     <label class="form-label">{{t 'general.description'}}:</label>
-    <div class="form-data">{{textarea value=learningMaterial.description}}</div>
+    <div class="form-data">
+      {{froala-editor
+        params=editorParams
+        value=learningMaterial.description 
+        contentChanged=(action "changeDescription")
+      }}
+    </div>
   </div>
   {{#if isFile}}
   <div class="form-col-12">
diff --git a/app/templates/components/objective-manage-competency.hbs b/app/templates/components/objective-manage-competency.hbs
index 44c8e9716c..4e37e6b7d9 100644
--- a/app/templates/components/objective-manage-competency.hbs
+++ b/app/templates/components/objective-manage-competency.hbs
@@ -1,4 +1,4 @@
-<h2>{{{objective.title}}}</h2>
+<div class='list-reset objectivetitle'>{{{objective.title}}}</div>
 
 {{#if showCompetencyList}}
   <div class='parent-picker'>
diff --git a/app/templates/components/session-objective-list.hbs b/app/templates/components/session-objective-list.hbs
index d71653486c..7a3708b70a 100644
--- a/app/templates/components/session-objective-list.hbs
+++ b/app/templates/components/session-objective-list.hbs
@@ -10,7 +10,7 @@
     {{#each sortedObjectives as |objective|}}
     <tr id="objective-{{objective.id}}">
       <td class='text-left text-top' colspan=2>
-        {{inplace-textarea value=objective.title save='changeObjectiveTitle' condition=objective.id}}
+        {{inplace-html value=objective.title save='changeObjectiveTitle' condition=objective.id}}
       </td>
       <td class='text-left text-top'>
         {{#if objective.hasParents}}
diff --git a/app/templates/components/session-objective-manager.hbs b/app/templates/components/session-objective-manager.hbs
index 9a0cf50900..1b0d7db1df 100644
--- a/app/templates/components/session-objective-manager.hbs
+++ b/app/templates/components/session-objective-manager.hbs
@@ -1,4 +1,4 @@
-<h2>{{{sessionObjective.title}}}</h2>
+<div class='objectivetitle list-reset'>{{{sessionObjective.title}}}</div>
 
 {{#liquid-if showObjectiveList class='vertical'}}
   <div class='parent-picker'>
diff --git a/app/templates/components/session-overview.hbs b/app/templates/components/session-overview.hbs
index 9c22f19b6e..75eb542eb7 100644
--- a/app/templates/components/session-overview.hbs
+++ b/app/templates/components/session-overview.hbs
@@ -71,7 +71,7 @@
     {{/if}}
     <div class="form-col-12 sessiondescription">
       <label class="form-label">{{t "general.description"}}:</label>
-      <div class="form-data">{{inplace-textarea value=session.sessionDescription.description save='changeDescription'}}</div>
+      <div class="form-data">{{inplace-html value=session.sessionDescription.description save='changeDescription'}}</div>
     </div>
     {{#unless session.isIndependentLearning}}
       <div class="form-col-12 sessionassociatedgroups">
diff --git a/bower.json b/bower.json
index fba591ac3f..e4cff9dfab 100644
--- a/bower.json
+++ b/bower.json
@@ -25,6 +25,7 @@
     "font-awesome": "~4.4.0",
     "pikaday": "~1.3.3",
     "moment": ">= 2.8.0",
-    "moment-timezone": ">= 0.1.0"
+    "moment-timezone": ">= 0.1.0",
+    "FroalaWysiwygEditor": "~1.2.8"
   }
 }
diff --git a/config/environment.js b/config/environment.js
index 1439972492..961b48b425 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -38,6 +38,25 @@ module.exports = function(environment) {
     i18n: {
       defaultLocale: 'en'
     },
+    froalaEditorDefaults: {
+      inlineMode: false,
+      placeholder: '',
+      allowHTML: true,
+      autosave: false,
+      plainPaste: true,
+      spellcheck: true,
+      buttons: [
+        'bold',
+        'italic',
+        'underline',
+        'subscript',
+        'superscript',
+        'insertOrderedList',
+        'insertUnorderedList',
+        'createLink',
+        // 'html' //temporarily disabled due to bug
+      ]
+    },
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/ember-cli-build.js b/ember-cli-build.js
index a5a593e269..528014e1d4 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -33,6 +33,7 @@ module.exports = function(defaults) {
       useScss: true
     },
   });
-
+  app.import('bower_components/FroalaWysiwygEditor/js/plugins/lists.min.js');
+  
   return app.toTree();
 };
diff --git a/package.json b/package.json
index a3490ac533..e4c4914083 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "ember-deploy-s3": "0.0.5",
     "ember-deploy-s3-index": "^0.4.0",
     "ember-disable-proxy-controllers": "^1.0.0",
+    "ember-froala": "1.2.0",
     "ember-i18n": "4.1.3",
     "ember-legacy-views": "0.2.0",
     "ember-load": "0.0.2",
diff --git a/tests/acceptance/course/learningmaterials-test.js b/tests/acceptance/course/learningmaterials-test.js
index 7058cd9536..e329428147 100644
--- a/tests/acceptance/course/learningmaterials-test.js
+++ b/tests/acceptance/course/learningmaterials-test.js
@@ -148,26 +148,26 @@ test('create new file learning material', function(assert) {
     assert.equal(getElementText(find('.detail-learning-materials .newlearningmaterial .owninguser')), getText(userName));
     let newLmContainer = find('.detail-learning-materials .newlearningmaterial');
     let inputs = find('input', newLmContainer);
-    let textAreas = find('textarea', newLmContainer);
     let selectBoxes = find('select', newLmContainer);
     fillIn(inputs.eq(0), testTitle);
     fillIn(inputs.eq(1), testAuthor);
-    fillIn(textAreas.eq(0), testDescription);
     pickOption(selectBoxes[0], fixtures.statuses[2].title, assert);
     pickOption(selectBoxes[1], fixtures.roles[2].title, assert);
-    click('.detail-learning-materials .newlearningmaterial .done');
-  });
-  andThen(function(){
-    let container = find('.detail-learning-materials');
-    let rows = find('.detail-content tbody tr', container);
-    assert.equal(rows.length, fixtures.course.learningMaterials.length + 1);
-    let row = rows.eq(fixtures.course.learningMaterials.length);
-    assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
-    assert.equal(getElementText(find('td:eq(1)', row)), getText('file'));
-    assert.equal(getElementText(find('td:eq(2)', row)), getText(testAuthor));
-
+    
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.froala-box', newLmContainer).editable('setHTML', testDescription);
+      click('.detail-learning-materials .newlearningmaterial .done');
+      andThen(function(){
+        let container = find('.detail-learning-materials');
+        let rows = find('.detail-content tbody tr', container);
+        assert.equal(rows.length, fixtures.course.learningMaterials.length + 1);
+        let row = rows.eq(fixtures.course.learningMaterials.length);
+        assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
+        assert.equal(getElementText(find('td:eq(1)', row)), getText('file'));
+      });
+    }, 100);
   });
-
 });
 
 test('create new link learning material', function(assert) {
@@ -180,7 +180,7 @@ test('create new link learning material', function(assert) {
     let rows = find('.detail-content tbody tr', container);
     assert.equal(rows.length, fixtures.course.learningMaterials.length);
     click('.detail-actions .button', container).then(function(){
-      //pick the file type
+      //pick the link type
       click('.detail-actions ul li:eq(1)');
     });
   });
@@ -192,24 +192,25 @@ test('create new link learning material', function(assert) {
     assert.equal(getElementText(find('.detail-learning-materials .newlearningmaterial .owninguser')), getText(userName));
     let newLmContainer = find('.detail-learning-materials .newlearningmaterial');
     let inputs = find('input', newLmContainer);
-    let textAreas = find('textarea', newLmContainer);
     let selectBoxes = find('select', newLmContainer);
     fillIn(inputs.eq(0), testTitle);
     fillIn(inputs.eq(1), testAuthor);
-    fillIn(textAreas.eq(0), testDescription);
     pickOption(selectBoxes[0], fixtures.statuses[2].title, assert);
     pickOption(selectBoxes[1], fixtures.roles[2].title, assert);
-    click('.detail-learning-materials .newlearningmaterial .done');
-  });
-  andThen(function(){
-    let container = find('.detail-learning-materials');
-    let rows = find('.detail-content tbody tr', container);
-    assert.equal(rows.length, fixtures.course.learningMaterials.length + 1);
-    let row = rows.eq(fixtures.course.learningMaterials.length);
-    assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
-    assert.equal(getElementText(find('td:eq(1)', row)), getText('link'));
-    assert.equal(getElementText(find('td:eq(2)', row)), getText(testAuthor));
-
+    
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.froala-box', newLmContainer).editable('setHTML', testDescription);
+      click('.detail-learning-materials .newlearningmaterial .done');
+      andThen(function(){
+        let container = find('.detail-learning-materials');
+        let rows = find('.detail-content tbody tr', container);
+        assert.equal(rows.length, fixtures.course.learningMaterials.length + 1);
+        let row = rows.eq(fixtures.course.learningMaterials.length);
+        assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
+        assert.equal(getElementText(find('td:eq(1)', row)), getText('link'));
+      });
+    }, 100);
   });
 
 });
@@ -224,7 +225,7 @@ test('create new citation learning material', function(assert) {
     let rows = find('.detail-content tbody tr', container);
     assert.equal(rows.length, fixtures.course.learningMaterials.length);
     click('.detail-actions .button', container).then(function(){
-      //pick the file type
+      //pick the citation type
       click('.detail-actions ul li:eq(2)');
     });
   });
@@ -236,26 +237,26 @@ test('create new citation learning material', function(assert) {
     assert.equal(getElementText(find('.detail-learning-materials .newlearningmaterial .owninguser')), getText(userName));
     let newLmContainer = find('.detail-learning-materials .newlearningmaterial');
     let inputs = find('input', newLmContainer);
-    let textAreas = find('textarea', newLmContainer);
     let selectBoxes = find('select', newLmContainer);
     fillIn(inputs.eq(0), testTitle);
     fillIn(inputs.eq(1), testAuthor);
-    fillIn(textAreas.eq(0), testDescription);
     pickOption(selectBoxes[0], fixtures.statuses[2].title, assert);
     pickOption(selectBoxes[1], fixtures.roles[2].title, assert);
-    click('.detail-learning-materials .newlearningmaterial .done');
-  });
-  andThen(function(){
-    let container = find('.detail-learning-materials');
-    let rows = find('.detail-content tbody tr', container);
-    assert.equal(rows.length, fixtures.course.learningMaterials.length + 1);
-    let row = rows.eq(fixtures.course.learningMaterials.length);
-    assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
-    assert.equal(getElementText(find('td:eq(1)', row)), getText('citation'));
-    assert.equal(getElementText(find('td:eq(2)', row)), getText(testAuthor));
-
+    
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.froala-box', newLmContainer).editable('setHTML', testDescription);
+      click('.detail-learning-materials .newlearningmaterial .done');
+      andThen(function(){
+        let container = find('.detail-learning-materials');
+        let rows = find('.detail-content tbody tr', container);
+        assert.equal(rows.length, fixtures.course.learningMaterials.length + 1);
+        let row = rows.eq(fixtures.course.learningMaterials.length);
+        assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
+        assert.equal(getElementText(find('td:eq(1)', row)), getText('citation'));
+      });
+    }, 100);
   });
-
 });
 
 test('issue #345 second new learning material defaults', function(assert) {
@@ -387,23 +388,27 @@ test('edit learning material', function(assert) {
       });
       let newNote = 'text text.  Woo hoo!';
       click(find('.notes .editable span', container)).then(function(){
-        fillIn('.notes textarea', newNote);
-        return click(find('.notes .done', container)).then(function(){
-          assert.equal(getElementText(find('.notes', container)), getText(newNote));
-        });
-      });
-      click('.detail-learning-materials button.bigadd');
-      andThen(function(){
-        assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(3)')), getText('Yes'));
-        assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(4)')), getText('No'));
-        assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(6)')), getText(fixtures.statuses[2].title));
-
-        click('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(0)');
-        andThen(function(){
-          let container = $('.learningmaterial-manager');
-          assert.equal(getElementText(find('.notes', container)), getText(newNote));
-          assert.equal(getElementText(find('.status', container)), getText('status 2'));
-        });
+        //wait for the editor to load
+        Ember.run.later(()=>{
+          find('.notes .froala-box', container).editable('setHTML', newNote);
+          click(find('.notes .done', container));
+          andThen(function(){
+            assert.equal(getElementText(find('.notes', container)), getText(newNote));
+          });
+          click('.detail-learning-materials button.bigadd');
+          andThen(function(){
+            assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(3)')), getText('Yes'));
+            assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(4)')), getText('No'));
+            assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(6)')), getText(fixtures.statuses[2].title));
+
+            click('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(0)');
+            andThen(function(){
+              let container = $('.learningmaterial-manager');
+              assert.equal(getElementText(find('.notes', container)), getText(newNote));
+              assert.equal(getElementText(find('.status', container)), getText('status 2'));
+            });
+          });
+        }, 100);
       });
     });
   });
diff --git a/tests/acceptance/course/objectivecreate-test.js b/tests/acceptance/course/objectivecreate-test.js
index bc70b05752..0cfa3a054a 100644
--- a/tests/acceptance/course/objectivecreate-test.js
+++ b/tests/acceptance/course/objectivecreate-test.js
@@ -41,21 +41,25 @@ test('save new objective', function(assert) {
     let objectiveRows = find('.detail-objectives .course-objective-list tbody tr');
     assert.equal(objectiveRows.length, fixtures.course.objectives.length);
     click('.detail-objectives .detail-actions button');
-    fillIn('.detail-objectives .newobjective textarea', newObjectiveTitle);
-    click('.detail-objectives .newobjective button.done');
-  });
-  andThen(function(){
-    let objectiveRows = find('.detail-objectives .course-objective-list tbody tr');
-    assert.equal(objectiveRows.length, fixtures.course.objectives.length + 1);
-    let tds = find('td', objectiveRows.eq(0));
-    assert.equal(getElementText(tds.eq(0)), getText(fixtures.objective.title));
-    assert.equal(getElementText(tds.eq(1)), getText('Add New'));
-    assert.equal(getElementText(tds.eq(2)), getText('Add New'));
-    tds = find('td', objectiveRows.eq(1));
-    assert.equal(getElementText(tds.eq(0)), getText(newObjectiveTitle));
-    assert.equal(getElementText(tds.eq(1)), getText('Add New'));
-    assert.equal(getElementText(tds.eq(2)), getText('Add New'));
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.detail-objectives .newobjective .froala-box').editable('setHTML', newObjectiveTitle);
+      click('.detail-objectives .newobjective button.done');
+      andThen(function(){
+        let objectiveRows = find('.detail-objectives .course-objective-list tbody tr');
+        assert.equal(objectiveRows.length, fixtures.course.objectives.length + 1);
+        let tds = find('td', objectiveRows.eq(0));
+        assert.equal(getElementText(tds.eq(0)), getText(fixtures.objective.title));
+        assert.equal(getElementText(tds.eq(1)), getText('Add New'));
+        assert.equal(getElementText(tds.eq(2)), getText('Add New'));
+        tds = find('td', objectiveRows.eq(1));
+        assert.equal(getElementText(tds.eq(0)), getText(newObjectiveTitle));
+        assert.equal(getElementText(tds.eq(1)), getText('Add New'));
+        assert.equal(getElementText(tds.eq(2)), getText('Add New'));
+      });
+    }, 100);
   });
+  
 });
 
 test('cancel new objective', function(assert) {
@@ -65,7 +69,6 @@ test('cancel new objective', function(assert) {
     let objectiveRows = find('.detail-objectives .course-objective-list tbody tr');
     assert.equal(objectiveRows.length, fixtures.course.objectives.length);
     click('.detail-objectives .detail-actions button');
-    fillIn('.detail-objectives .newobjective textarea', 'random junk, GO TEAM ILIOS!');
     click('.detail-objectives .newobjective button.cancel');
   });
   andThen(function(){
diff --git a/tests/acceptance/course/objectivelist-test.js b/tests/acceptance/course/objectivelist-test.js
index 2ecf737996..bcd0f21984 100644
--- a/tests/acceptance/course/objectivelist-test.js
+++ b/tests/acceptance/course/objectivelist-test.js
@@ -150,13 +150,18 @@ test('edit objective title', function(assert) {
     assert.equal(getElementText(td), getText(objective.title));
     click('.editable span', td);
     andThen(function(){
-      var textArea = find('textarea', td);
-      assert.equal(getText(textArea.val()), getText(objective.title));
-      fillIn(textArea, 'new title');
-      click(find('.actions .done', td));
-    });
-    andThen(function(){
-      assert.equal(getElementText(find('tbody tr:eq(0) td:eq(0)', container)), getText('new title'));
+      //wait for the editor to load
+      Ember.run.later(()=>{
+        let editor = find('.froala-box', td);
+        let editorContents = editor.editable('getText');
+        assert.equal(getText(editorContents), getText(objective.title));
+        
+        editor.editable('setHTML', 'new title');
+        click(find('.actions .done', td));
+        andThen(function(){
+          assert.equal(getElementText(find('tbody tr:eq(0) td:eq(0)', container)), getText('new title'));
+        });
+      }, 100);
     });
   });
 });
diff --git a/tests/acceptance/course/objectiveparents-multiplecohorts-test.js b/tests/acceptance/course/objectiveparents-multiplecohorts-test.js
index cd50854742..c506b41dc6 100644
--- a/tests/acceptance/course/objectiveparents-multiplecohorts-test.js
+++ b/tests/acceptance/course/objectiveparents-multiplecohorts-test.js
@@ -107,7 +107,7 @@ test('list parent objectives by competency', function(assert) {
       let objectiveManager = find('.objective-manager').eq(0);
       let objective = fixtures.courseObjectives[0];
       assert.equal(getElementText(find('.detail-specific-title')), 'SelectParentObjectives');
-      assert.equal(getElementText(find('h2', objectiveManager)), getText(objective.title));
+      assert.equal(getElementText(find('.objectivetitle', objectiveManager)), getText(objective.title));
       let expectedCohortTitles = 'Select Parent For: ' + 
         fixtures.program.title + fixtures.cohorts[0].title +
         fixtures.program.title + fixtures.cohorts[1].title;
diff --git a/tests/acceptance/course/objectiveparents-test.js b/tests/acceptance/course/objectiveparents-test.js
index 9440e28002..129838461e 100644
--- a/tests/acceptance/course/objectiveparents-test.js
+++ b/tests/acceptance/course/objectiveparents-test.js
@@ -84,7 +84,7 @@ test('list parent objectives by competency', function(assert) {
       let objectiveManager = find('.objective-manager').eq(0);
       let objective = fixtures.courseObjectives[0];
       assert.equal(getElementText(find('.detail-specific-title')), 'SelectParentObjectives');
-      assert.equal(getElementText(find('h2', objectiveManager)), getText(objective.title));
+      assert.equal(getElementText(find('.objectivetitle', objectiveManager)), getText(objective.title));
       let expectedCohortTitle = 'Select Parent For: ' + fixtures.program.title + fixtures.cohort.title;
       assert.equal(getElementText(find('.group-picker', objectiveManager)), getText(expectedCohortTitle));
       let parentPicker = find('.parent-picker', objectiveManager).eq(0);
diff --git a/tests/acceptance/course/session/learningmaterials-test.js b/tests/acceptance/course/session/learningmaterials-test.js
index c052024260..c839e9736f 100644
--- a/tests/acceptance/course/session/learningmaterials-test.js
+++ b/tests/acceptance/course/session/learningmaterials-test.js
@@ -154,26 +154,26 @@ test('create new file learning material', function(assert) {
     assert.equal(getElementText(find('.detail-learning-materials .newlearningmaterial .owninguser')), getText(userName));
     let newLmContainer = find('.detail-learning-materials .newlearningmaterial');
     let inputs = find('input', newLmContainer);
-    let textAreas = find('textarea', newLmContainer);
     let selectBoxes = find('select', newLmContainer);
     fillIn(inputs.eq(0), testTitle);
     fillIn(inputs.eq(1), testAuthor);
-    fillIn(textAreas.eq(0), testDescription);
     pickOption(selectBoxes[0], fixtures.statuses[2].title, assert);
     pickOption(selectBoxes[1], fixtures.roles[2].title, assert);
-    click('.detail-learning-materials .newlearningmaterial .done');
-  });
-  andThen(function(){
-    let container = find('.detail-learning-materials');
-    let rows = find('.detail-content tbody tr', container);
-    assert.equal(rows.length, fixtures.session.learningMaterials.length + 1);
-    let row = rows.eq(fixtures.session.learningMaterials.length);
-    assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
-    assert.equal(getElementText(find('td:eq(1)', row)), getText('file'));
-    assert.equal(getElementText(find('td:eq(2)', row)), getText(testAuthor));
-
+    
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.froala-box', newLmContainer).editable('setHTML', testDescription);
+      click('.detail-learning-materials .newlearningmaterial .done');
+      andThen(function(){
+        let container = find('.detail-learning-materials');
+        let rows = find('.detail-content tbody tr', container);
+        assert.equal(rows.length, fixtures.session.learningMaterials.length + 1);
+        let row = rows.eq(fixtures.session.learningMaterials.length);
+        assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
+        assert.equal(getElementText(find('td:eq(1)', row)), getText('file'));
+      });
+    }, 100);
   });
-
 });
 
 test('create new link learning material', function(assert) {
@@ -186,7 +186,7 @@ test('create new link learning material', function(assert) {
     let rows = find('.detail-content tbody tr', container);
     assert.equal(rows.length, fixtures.session.learningMaterials.length);
     click('.detail-actions .button', container).then(function(){
-      //pick the file type
+      //pick the link type
       click('.detail-actions ul li:eq(1)');
     });
   });
@@ -198,24 +198,25 @@ test('create new link learning material', function(assert) {
     assert.equal(getElementText(find('.detail-learning-materials .newlearningmaterial .owninguser')), getText(userName));
     let newLmContainer = find('.detail-learning-materials .newlearningmaterial');
     let inputs = find('input', newLmContainer);
-    let textAreas = find('textarea', newLmContainer);
     let selectBoxes = find('select', newLmContainer);
     fillIn(inputs.eq(0), testTitle);
     fillIn(inputs.eq(1), testAuthor);
-    fillIn(textAreas.eq(0), testDescription);
     pickOption(selectBoxes[0], fixtures.statuses[2].title, assert);
     pickOption(selectBoxes[1], fixtures.roles[2].title, assert);
-    click('.detail-learning-materials .newlearningmaterial .done');
-  });
-  andThen(function(){
-    let container = find('.detail-learning-materials');
-    let rows = find('.detail-content tbody tr', container);
-    assert.equal(rows.length, fixtures.session.learningMaterials.length + 1);
-    let row = rows.eq(fixtures.session.learningMaterials.length);
-    assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
-    assert.equal(getElementText(find('td:eq(1)', row)), getText('link'));
-    assert.equal(getElementText(find('td:eq(2)', row)), getText(testAuthor));
-
+    
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.froala-box', newLmContainer).editable('setHTML', testDescription);
+      click('.detail-learning-materials .newlearningmaterial .done');
+      andThen(function(){
+        let container = find('.detail-learning-materials');
+        let rows = find('.detail-content tbody tr', container);
+        assert.equal(rows.length, fixtures.session.learningMaterials.length + 1);
+        let row = rows.eq(fixtures.session.learningMaterials.length);
+        assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
+        assert.equal(getElementText(find('td:eq(1)', row)), getText('link'));
+      });
+    }, 100);
   });
 
 });
@@ -230,7 +231,7 @@ test('create new citation learning material', function(assert) {
     let rows = find('.detail-content tbody tr', container);
     assert.equal(rows.length, fixtures.session.learningMaterials.length);
     click('.detail-actions .button', container).then(function(){
-      //pick the file type
+      //pick the citation type
       click('.detail-actions ul li:eq(2)');
     });
   });
@@ -242,26 +243,26 @@ test('create new citation learning material', function(assert) {
     assert.equal(getElementText(find('.detail-learning-materials .newlearningmaterial .owninguser')), getText(userName));
     let newLmContainer = find('.detail-learning-materials .newlearningmaterial');
     let inputs = find('input', newLmContainer);
-    let textAreas = find('textarea', newLmContainer);
     let selectBoxes = find('select', newLmContainer);
     fillIn(inputs.eq(0), testTitle);
     fillIn(inputs.eq(1), testAuthor);
-    fillIn(textAreas.eq(0), testDescription);
     pickOption(selectBoxes[0], fixtures.statuses[2].title, assert);
     pickOption(selectBoxes[1], fixtures.roles[2].title, assert);
-    click('.detail-learning-materials .newlearningmaterial .done');
-  });
-  andThen(function(){
-    let container = find('.detail-learning-materials');
-    let rows = find('.detail-content tbody tr', container);
-    assert.equal(rows.length, fixtures.session.learningMaterials.length + 1);
-    let row = rows.eq(fixtures.session.learningMaterials.length);
-    assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
-    assert.equal(getElementText(find('td:eq(1)', row)), getText('citation'));
-    assert.equal(getElementText(find('td:eq(2)', row)), getText(testAuthor));
-
+    
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.froala-box', newLmContainer).editable('setHTML', testDescription);
+      click('.detail-learning-materials .newlearningmaterial .done');
+      andThen(function(){
+        let container = find('.detail-learning-materials');
+        let rows = find('.detail-content tbody tr', container);
+        assert.equal(rows.length, fixtures.session.learningMaterials.length + 1);
+        let row = rows.eq(fixtures.session.learningMaterials.length);
+        assert.equal(getElementText(find('td:eq(0)', row)), getText(testTitle));
+        assert.equal(getElementText(find('td:eq(1)', row)), getText('citation'));
+      });
+    }, 100);
   });
-
 });
 
 test('issue #345 second new learning material defaults', function(assert) {
@@ -393,23 +394,27 @@ test('edit learning material', function(assert) {
       });
       let newNote = 'text text.  Woo hoo!';
       click(find('.notes .editable span', container)).then(function(){
-        fillIn('.notes textarea', newNote);
-        return click(find('.notes .done', container)).then(function(){
-          assert.equal(getElementText(find('.notes', container)), getText(newNote));
-        });
-      });
-      click('.detail-learning-materials button.bigadd');
-      andThen(function(){
-        assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(3)')), getText('Yes'));
-        assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(4)')), getText('No'));
-        assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(6)')), getText(fixtures.statuses[2].title));
-
-        click('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(0)');
-        andThen(function(){
-          let container = $('.learningmaterial-manager');
-          assert.equal(getElementText(find('.notes', container)), getText(newNote));
-          assert.equal(getElementText(find('.status', container)), getText('status 2'));
-        });
+        //wait for the editor to load
+        Ember.run.later(()=>{
+          find('.notes .froala-box', container).editable('setHTML', newNote);
+          click(find('.notes .done', container));
+          andThen(function(){
+            assert.equal(getElementText(find('.notes', container)), getText(newNote));
+          });
+          click('.detail-learning-materials button.bigadd');
+          andThen(function(){
+            assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(3)')), getText('Yes'));
+            assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(4)')), getText('No'));
+            assert.equal(getElementText(find('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(6)')), getText(fixtures.statuses[2].title));
+
+            click('.detail-learning-materials .detail-content tbody tr:eq(0) td:eq(0)');
+            andThen(function(){
+              let container = $('.learningmaterial-manager');
+              assert.equal(getElementText(find('.notes', container)), getText(newNote));
+              assert.equal(getElementText(find('.status', container)), getText('status 2'));
+            });
+          });
+        }, 100);
       });
     });
   });
diff --git a/tests/acceptance/course/session/objectivecreate-test.js b/tests/acceptance/course/session/objectivecreate-test.js
index 6875445baf..f2fe2bd437 100644
--- a/tests/acceptance/course/session/objectivecreate-test.js
+++ b/tests/acceptance/course/session/objectivecreate-test.js
@@ -38,21 +38,25 @@ test('save new objective', function(assert) {
     let objectiveRows = find('.detail-objectives .session-objective-list tbody tr');
     assert.equal(objectiveRows.length, fixtures.session.objectives.length);
     click('.detail-objectives .detail-actions button');
-    fillIn('.detail-objectives .newobjective textarea', newObjectiveTitle);
-    click('.detail-objectives .newobjective button.done');
-  });
-  andThen(function(){
-    let objectiveRows = find('.detail-objectives .session-objective-list tbody tr');
-    assert.equal(objectiveRows.length, fixtures.session.objectives.length + 1);
-    let tds = find('td', objectiveRows.eq(0));
-    assert.equal(getElementText(tds.eq(0)), getText(fixtures.objective.title));
-    assert.equal(getElementText(tds.eq(1)), getText('Add New'));
-    assert.equal(getElementText(tds.eq(2)), getText('Add New'));
-    tds = find('td', objectiveRows.eq(1));
-    assert.equal(getElementText(tds.eq(0)), getText(newObjectiveTitle));
-    assert.equal(getElementText(tds.eq(1)), getText('Add New'));
-    assert.equal(getElementText(tds.eq(2)), getText('Add New'));
+    //wait for the editor to load
+    Ember.run.later(()=>{
+      find('.detail-objectives .newobjective .froala-box').editable('setHTML', newObjectiveTitle);
+      click('.detail-objectives .newobjective button.done');
+      andThen(function(){
+        let objectiveRows = find('.detail-objectives .session-objective-list tbody tr');
+        assert.equal(objectiveRows.length, fixtures.session.objectives.length + 1);
+        let tds = find('td', objectiveRows.eq(0));
+        assert.equal(getElementText(tds.eq(0)), getText(fixtures.objective.title));
+        assert.equal(getElementText(tds.eq(1)), getText('Add New'));
+        assert.equal(getElementText(tds.eq(2)), getText('Add New'));
+        tds = find('td', objectiveRows.eq(1));
+        assert.equal(getElementText(tds.eq(0)), getText(newObjectiveTitle));
+        assert.equal(getElementText(tds.eq(1)), getText('Add New'));
+        assert.equal(getElementText(tds.eq(2)), getText('Add New'));
+      });
+    }, 100);
   });
+  
 });
 
 test('cancel new objective', function(assert) {
@@ -62,7 +66,6 @@ test('cancel new objective', function(assert) {
     let objectiveRows = find('.detail-objectives .session-objective-list tbody tr');
     assert.equal(objectiveRows.length, fixtures.session.objectives.length);
     click('.detail-objectives .detail-actions button');
-    fillIn('.detail-objectives .newobjective textarea', 'random junk, GO TEAM ILIOS!');
     click('.detail-objectives .newobjective button.cancel');
   });
   andThen(function(){
diff --git a/tests/acceptance/course/session/objectivelist-test.js b/tests/acceptance/course/session/objectivelist-test.js
index 5c1aa18f6b..91e6f854a3 100644
--- a/tests/acceptance/course/session/objectivelist-test.js
+++ b/tests/acceptance/course/session/objectivelist-test.js
@@ -138,14 +138,20 @@ test('edit objective title', function(assert) {
     let td = find('tbody tr:eq(0) td:eq(0)', container);
     assert.equal(getElementText(td), getText(objective.title));
     click('.editable span', td);
+    
     andThen(function(){
-      var textArea = find('textarea', td);
-      assert.equal(getText(textArea.val()), getText(objective.title));
-      fillIn(textArea, 'new title');
-      click(find('.actions .done', td));
-    });
-    andThen(function(){
-      assert.equal(getElementText(find('tbody tr:eq(0) td:eq(0)', container)), getText('new title'));
+      //wait for the editor to load
+      Ember.run.later(()=>{
+        let editor = find('.froala-box', td);
+        let editorContents = editor.editable('getText');
+        assert.equal(getText(editorContents), getText(objective.title));
+        
+        editor.editable('setHTML', 'new title');
+        click(find('.actions .done', td));
+        andThen(function(){
+          assert.equal(getElementText(find('tbody tr:eq(0) td:eq(0)', container)), getText('new title'));
+        });
+      }, 100);
     });
   });
 });
diff --git a/tests/acceptance/course/session/objectiveparents-test.js b/tests/acceptance/course/session/objectiveparents-test.js
index 77a97b9a16..936cba5da8 100644
--- a/tests/acceptance/course/session/objectiveparents-test.js
+++ b/tests/acceptance/course/session/objectiveparents-test.js
@@ -66,7 +66,7 @@ test('list session objectives', function(assert) {
       assert.equal(getElementText(find('.detail-specific-title')), 'SelectParentObjectives');
       let objectiveManager = find('.objective-manager').eq(0);
       let objective = fixtures.sessionObjectives[0];
-      assert.equal(getElementText(find('h2', objectiveManager)), getText(objective.title));
+      assert.equal(getElementText(find('.objectivetitle', objectiveManager)), getText(objective.title));
       let expectedCourseTitle = fixtures.course.title;
       let parentPicker = find('.parent-picker', objectiveManager).eq(0);
       assert.equal(getElementText(find('h5', parentPicker)), getText(expectedCourseTitle));
diff --git a/tests/acceptance/course/session/overview-test.js b/tests/acceptance/course/session/overview-test.js
index 2db9560019..3dac963931 100644
--- a/tests/acceptance/course/session/overview-test.js
+++ b/tests/acceptance/course/session/overview-test.js
@@ -265,13 +265,17 @@ test('change description', function(assert) {
     assert.equal(getElementText(find('.content', container)), description);
     click(find('.editable span', container));
     andThen(function(){
-      var input = find('.editinplace textarea', container);
-      assert.equal(getText(input.val()), description);
-      fillIn(input, 'test new description');
-      click(find('.editinplace .actions .done', container));
-      andThen(function(){
-        assert.equal(getElementText(find('.content', container)), getText('test new description'));
-      });
+      //wait for the editor to load
+      Ember.run.later(()=>{
+        let editor = find('.sessiondescription .froala-box');
+        let editorContents = editor.editable('getText');
+        assert.equal(getText(editorContents), description);
+        editor.editable('setHTML', 'test new description');
+        click(find('.editinplace .actions .done', container));
+        andThen(function(){
+          assert.equal(getElementText(find('.content', container)), getText('test new description'));
+        });
+      }, 100);
     });
   });
 });
@@ -287,13 +291,17 @@ test('add description', function(assert) {
     assert.equal(getElementText(find('.content', container)), getText('Click to edit'));
     click(find('.editable span', container));
     andThen(function(){
-      var input = find('.editinplace textarea', container);
-      assert.equal(getText(input.val()), '');
-      fillIn(input, 'test new description');
-      click(find('.editinplace .actions .done', container));
-      andThen(function(){
-        assert.equal(getElementText(find('.content', container)), getText('test new description'));
-      });
+      //wait for the editor to load
+      Ember.run.later(()=>{
+        let editor = find('.sessiondescription .froala-box');
+        let editorContents = editor.editable('getText');
+        assert.equal(getText(editorContents), '');
+        editor.editable('setHTML', 'test new description');
+        click(find('.editinplace .actions .done', container));
+        andThen(function(){
+          assert.equal(getElementText(find('.content', container)), getText('test new description'));
+        });
+      }, 100);
     });
   });
 });
diff --git a/tests/acceptance/course/session/publicationcheck-test.js b/tests/acceptance/course/session/publicationcheck-test.js
index 300990e04e..195e425170 100644
--- a/tests/acceptance/course/session/publicationcheck-test.js
+++ b/tests/acceptance/course/session/publicationcheck-test.js
@@ -312,18 +312,22 @@ test('change description', function(assert) {
   });
   visit('/courses/1/sessions/1/publicationcheck');
   andThen(function() {
-    var description = getText('session description 0');
-    var container = find('.session-overview .sessiondescription');
+    let description = getText('session description 0');
+    let container = find('.session-overview .sessiondescription');
     assert.equal(getElementText(find('.content', container)), description);
     click(find('.editable span', container));
     andThen(function(){
-      var input = find('.editinplace textarea', container);
-      assert.equal(getText(input.val()), description);
-      fillIn(input, 'test new description');
-      click(find('.editinplace .actions .done', container));
-      andThen(function(){
-        assert.equal(getElementText(find('.content', container)), getText('test new description'));
-      });
+      //wait for the editor to load
+      Ember.run.later(()=>{
+        let editor = find('.sessiondescription .froala-box');
+        let editorContents = editor.editable('getText');
+        assert.equal(getText(editorContents), description);
+        editor.editable('setHTML', 'test new description');
+        click(find('.editinplace .actions .done', container));
+        andThen(function(){
+          assert.equal(getElementText(find('.content', container)), getText('test new description'));
+        });
+      }, 100);
     });
   });
 });
@@ -335,17 +339,21 @@ test('add description', function(assert) {
   });
   visit('/courses/1/sessions/1/publicationcheck');
   andThen(function() {
-    var container = find('.session-overview .sessiondescription');
+    let container = find('.session-overview .sessiondescription');
     assert.equal(getElementText(find('.content', container)), getText('Click to edit'));
     click(find('.editable span', container));
     andThen(function(){
-      var input = find('.editinplace textarea', container);
-      assert.equal(getText(input.val()), '');
-      fillIn(input, 'test new description');
-      click(find('.editinplace .actions .done', container));
-      andThen(function(){
-        assert.equal(getElementText(find('.content', container)), getText('test new description'));
-      });
+      //wait for the editor to load
+      Ember.run.later(()=>{
+        let editor = find('.sessiondescription .froala-box');
+        let editorContents = editor.editable('getText');
+        assert.equal(getText(editorContents), '');
+        editor.editable('setHTML', 'test new description');
+        click(find('.editinplace .actions .done', container));
+        andThen(function(){
+          assert.equal(getElementText(find('.content', container)), getText('test new description'));
+        });
+      }, 100);
     });
   });
 });
diff --git a/tests/acceptance/program/programyear/objectives-test.js b/tests/acceptance/program/programyear/objectives-test.js
index 21164cb5e9..e66c17601b 100644
--- a/tests/acceptance/program/programyear/objectives-test.js
+++ b/tests/acceptance/program/programyear/objectives-test.js
@@ -190,7 +190,7 @@ test('manage competencies', function(assert) {
     andThen(function() {
       assert.equal(getElementText(find('.detail-specific-title')), 'SelectObjectiveCompetency');
       let objectiveManager = find('.objective-manage-competency').eq(0);
-      assert.equal(getElementText(find('h2', objectiveManager)), getText('objective 0'));
+      assert.equal(getElementText(find('.objectivetitle', objectiveManager)), getText('objective 0'));
       assert.equal(getElementText(find('.parent-picker', objectiveManager)), getText('competency0 competency1 competency2'));
       let items = find('.parent-picker li.clickable');
       assert.equal(items.length, 2);
diff --git a/tests/integration/components/inplace-html-test.js b/tests/integration/components/inplace-html-test.js
new file mode 100644
index 0000000000..2f840f4593
--- /dev/null
+++ b/tests/integration/components/inplace-html-test.js
@@ -0,0 +1,20 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import tHelper from "ember-i18n/helper";
+
+moduleForComponent('inplace-html', 'Integration | Component | inplace html', {
+  integration: true,
+
+  beforeEach() {
+    this.container.lookup('service:i18n').set('locale', 'en');
+    this.registry.register('helper:t', tHelper);
+  }
+});
+
+test('it renders', function(assert) {
+  assert.expect(1);
+
+  this.render(hbs`{{inplace-html}}`);
+
+  assert.equal(this.$().text().trim(), 'Click to edit');
+});