diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue
index 925b2d4e..14366295 100644
--- a/client/src/components/Chapter.vue
+++ b/client/src/components/Chapter.vue
@@ -4,8 +4,11 @@
 
     <bookmark-actions
       class="chapter__bookmark-actions"
+      @add-note="addNote"
+      @edit-note="editNote"
       :bookmarked="chapter.bookmark"
       @bookmark="bookmark(!chapter.bookmark)"
+      :note="chapter.bookmark.note"
     ></bookmark-actions>
     <p class="chapter__description">
       {{chapter.description}}
@@ -109,7 +112,16 @@
             }
           }
         });
-      }
+      },
+      addNote(id) {
+        this.$store.dispatch('addNote', {
+          content: id,
+          parent: this.chapter.id
+        });
+      },
+      editNote() {
+        this.$store.dispatch('editNote', this.chapter.bookmark.note);
+      },
     },
 
     apollo: {
diff --git a/client/src/components/modules/Module.vue b/client/src/components/modules/Module.vue
index 69513816..6e9b5534 100644
--- a/client/src/components/modules/Module.vue
+++ b/client/src/components/modules/Module.vue
@@ -9,7 +9,10 @@
     <div class="module__intro-wrapper">
       <bookmark-actions
         class="module__bookmark-actions"
+        @add-note="addNote"
+        @edit-note="editNote"
         :bookmarked="module.bookmark"
+        :note="module.bookmark.note"
         @bookmark="bookmark(!module.bookmark)"></bookmark-actions>
       <div class="module__intro" v-html="module.intro"></div>
     </div>
@@ -168,7 +171,16 @@
             }
           }
         });
-      }
+      },
+      addNote(id) {
+        this.$store.dispatch('addNote', {
+          content: id,
+          parent: this.module.id
+        });
+      },
+      editNote() {
+        this.$store.dispatch('editNote', this.module.bookmark.note);
+      },
     },
 
     apollo: {
diff --git a/client/src/components/notes/NewNoteWizard.vue b/client/src/components/notes/NewNoteWizard.vue
index eca6123b..70f6be8c 100644
--- a/client/src/components/notes/NewNoteWizard.vue
+++ b/client/src/components/notes/NewNoteWizard.vue
@@ -5,10 +5,8 @@
 <script>
   import NoteForm from '@/components/notes/NoteForm';
 
-  import ADD_NOTE_MUTATION from '@/graphql/gql/mutations/addNote.gql';
-  import CONTENT_BLOCK_QUERY from '@/graphql/gql/contentBlockQuery.gql';
-
   import {mapGetters} from 'vuex';
+  import {constructNoteMutation} from '@/helpers/new-note-mutation.js';
 
   export default {
     components: {
@@ -22,68 +20,32 @@
     },
 
     computed: {
-      ...mapGetters(['currentContent', 'currentContentBlock'])
+      ...mapGetters(['currentContent', 'currentContentBlock', 'currentNoteParent'])
     },
 
     methods: {
-      addNote(note) {
+      addNote(n) {
         const content = this.currentContent;
         const contentBlock = this.currentContentBlock;
-        const text = note.text;
-
-        this.$apollo.mutate({
-          mutation: ADD_NOTE_MUTATION,
-          variables: {
-            input: {
-              note: {
-                content,
-                contentBlock,
-                text
-              }
-            }
-          },
-          update: (store, {data: {addNote: {note}}}) => {
-            const query = CONTENT_BLOCK_QUERY;
-            const variables = {id: contentBlock};
-            const data = store.readQuery({
-              query,
-              variables
-            });
-
-            const bookmarks = data.contentBlock.bookmarks;
-
-            let index = bookmarks.findIndex(element => {
-              return element.uuid === content;
-            });
-
-            if (index > -1) {
-              let el = bookmarks[index];
-              el.note = note;
-              bookmarks.splice(index, 1, el);
-            }
-
-            data.contentBlock.bookmarks = bookmarks;
-
-            store.writeQuery({
-              data,
-              query,
-              variables
-            });
-          },
-          optimisticResponse: {
-            __typename: 'Mutation',
-            addNote: {
-              __typename: 'AddNotePayload',
-              note: {
-                __typename: 'NoteNode',
-                id: -1,
-                text: text
-              }
-            }
+        const parent = this.currentNoteParent;
+        const text = n.text;
+        let note = {};
+        if (content > '') {
+          note = {
+            content,
+            contentBlock,
+            text
           }
-        }).then(() => {
-          this.$store.dispatch('hideModal');
-        });
+        } else {
+          note = {
+            parent,
+            text
+          }
+        }
+
+        this.$apollo
+          .mutate(constructNoteMutation(note))
+          .then(this.hide);
       },
       hide() {
         this.$store.dispatch('hideModal');
diff --git a/client/src/helpers/new-note-mutation.js b/client/src/helpers/new-note-mutation.js
new file mode 100644
index 00000000..3f36fb0d
--- /dev/null
+++ b/client/src/helpers/new-note-mutation.js
@@ -0,0 +1,85 @@
+import ADD_NOTE_MUTATION from '@/graphql/gql/mutations/addNote.gql';
+import CONTENT_BLOCK_QUERY from '@/graphql/gql/contentBlockQuery.gql';
+import CHAPTER_QUERY from '@/graphql/gql/chapterQuery.gql';
+import MODULE_QUERY from '@/graphql/gql/moduleByIdQuery.gql';
+
+const getBlockType = id => atob(id).split(':')[0]
+
+export const constructNoteMutation = (n) => {
+  let update = () => {
+  };
+
+  if (n.contentBlock) {
+    update = (store, {data: {addNote: {note}}}) => {
+      const query = CONTENT_BLOCK_QUERY;
+      const variables = {id: n.contentBlock};
+      const data = store.readQuery({
+        query,
+        variables
+      });
+
+      const bookmarks = data.contentBlock.bookmarks;
+
+      let index = bookmarks.findIndex(element => {
+        return element.uuid === n.content;
+      });
+
+      if (index > -1) {
+        let el = bookmarks[index];
+        el.note = note;
+        bookmarks.splice(index, 1, el);
+      }
+
+      data.contentBlock.bookmarks = bookmarks;
+
+      store.writeQuery({
+        data,
+        query,
+        variables
+      });
+    };
+  } else {
+    update = (store, {data: {addNote: {note}}}) => {
+      const type = getBlockType(n.parent) === 'ChapterNode' ? 'chapter' : 'module';
+      const query = type === 'chapter' ? CHAPTER_QUERY : MODULE_QUERY;
+      const variables = {id: n.parent};
+      const data = store.readQuery({
+        query,
+        variables
+      });
+
+      const bookmark = data[type].bookmark;
+
+      bookmark.note = note;
+
+      data[type].bookmark = bookmark;
+
+      store.writeQuery({
+        data,
+        query,
+        variables
+      });
+    };
+  }
+
+  return {
+    mutation: ADD_NOTE_MUTATION,
+    variables: {
+      input: {
+        note: n
+      }
+    },
+    update,
+    optimisticResponse: {
+      __typename: 'Mutation',
+      addNote: {
+        __typename: 'AddNotePayload',
+        note: {
+          __typename: 'NoteNode',
+          id: -1,
+          text: n.text
+        }
+      }
+    }
+  }
+};
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 6bc4b044..1fe03ee4 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -22,6 +22,7 @@ export default new Vuex.Store({
     parentProject: null,
     currentNote: null,
     currentProjectEntry: null,
+    currentNoteParent: '',
     imageUrl: '',
     infographic: {
       id: 0,
@@ -46,6 +47,7 @@ export default new Vuex.Store({
     currentContent: state => state.currentContent,
     currentContentBlock: state => state.currentContentBlock,
     currentNote: state => state.currentNote,
+    currentNoteParent: state => state.currentNoteParent,
   },
 
   actions: {
@@ -61,6 +63,7 @@ export default new Vuex.Store({
       commit('setCurrentRoomEntry', '');
       commit('setCurrentContent', '');
       commit('setCurrentContentBlock', '');
+      commit('setCurrentNoteParent', '');
       commit('setContentBlockPosition', {});
       commit('setParentRoom', null);
       commit('setParentModule', '');
@@ -126,8 +129,12 @@ export default new Vuex.Store({
       dispatch('showModal', 'edit-project-entry-wizard');
     },
     addNote({commit, dispatch}, payload) {
-      commit('setCurrentContentBlock', payload.contentBlock);
-      commit('setCurrentContent', payload.content);
+      if (payload.contentBlock) {
+        commit('setCurrentContentBlock', payload.contentBlock);
+        commit('setCurrentContent', payload.content);
+      } else {
+        commit('setCurrentNoteParent', payload.parent);
+      }
       dispatch('showModal', 'new-note-wizard');
     },
     editNote({commit, dispatch}, payload) {
@@ -240,6 +247,9 @@ export default new Vuex.Store({
     },
     setEditModule(state, payload) {
       state.editModule = payload;
+    },
+    setCurrentNoteParent(state, payload) {
+      state.currentNoteParent = payload;
     }
   }
 })
diff --git a/server/notes/inputs.py b/server/notes/inputs.py
index 0080269d..31e1ada3 100644
--- a/server/notes/inputs.py
+++ b/server/notes/inputs.py
@@ -3,8 +3,9 @@ from graphene import InputObjectType
 
 
 class AddNoteArgument(InputObjectType):
-    content = graphene.UUID(required=True)
-    content_block = graphene.ID(required=True)
+    content = graphene.UUID()
+    content_block = graphene.ID()
+    parent = graphene.ID()
     text = graphene.String(required=True)
 
 
diff --git a/server/notes/mutations.py b/server/notes/mutations.py
index 4cdbd58f..3c54014b 100644
--- a/server/notes/mutations.py
+++ b/server/notes/mutations.py
@@ -3,6 +3,7 @@ from builtins import PermissionError
 import graphene
 import json
 from graphene import relay
+from graphql_relay import from_global_id
 
 from api.utils import get_object
 from books.models import ContentBlock, Chapter, Module
@@ -56,16 +57,32 @@ class AddNote(relay.ClientIDMutation):
         user = info.context.user
 
         note = kwargs.get('note')
-        content_uuid = note.get('content')
-        content_block_id = note.get('content_block')
-        content_block = get_object(ContentBlock, content_block_id)
+        content_uuid = note.get('content', '')
+        content_block_id = note.get('content_block', '')
+        parent = note.get('parent')
         text = note.get('text')
 
-        bookmark = ContentBlockBookmark.objects.get(
-            content_block=content_block,
-            uuid=content_uuid,
-            user=user
-        )
+        if content_uuid != '':
+            content_block = get_object(ContentBlock, content_block_id)
+
+            bookmark = ContentBlockBookmark.objects.get(
+                content_block=content_block,
+                uuid=content_uuid,
+                user=user
+            )
+        else:
+            type, id = from_global_id(parent)
+            print(type)
+            if type == 'ModuleNode':
+                bookmark = ModuleBookmark.objects.get(
+                    module__id=id,
+                    user=user
+                )
+            else:
+                bookmark = ChapterBookmark.objects.get(
+                    chapter__id=id,
+                    user=user
+                )
 
         bookmark.note = Note.objects.create(text=text)
         bookmark.save()
@@ -88,13 +105,16 @@ class UpdateNote(relay.ClientIDMutation):
         text = note.get('text')
         note = get_object(Note, id)
 
-        if note.contentblockbookmark.user != user:
+        if hasattr(note, 'contentblockbookmark') and note.contentblockbookmark.user != user \
+            or hasattr(note, 'chapterbookmark') and note.chapterbookmark.user != user \
+            or hasattr(note, 'modulebookmark') and note.modulebookmark.user != user:
             raise PermissionError
 
         note.text = text
         note.save()
         return cls(note=note)
 
+
 class UpdateChapterBookmark(relay.ClientIDMutation):
     class Input:
         chapter = graphene.ID(required=True)
@@ -153,7 +173,6 @@ class UpdateModuleBookmark(relay.ClientIDMutation):
         return cls(success=True)
 
 
-
 class NoteMutations:
     add_note = AddNote.Field()
     update_note = UpdateNote.Field()