diff --git a/client/src/components/modules/Module.vue b/client/src/components/modules/Module.vue
index 57d5107b..8e30f1cb 100644
--- a/client/src/components/modules/Module.vue
+++ b/client/src/components/modules/Module.vue
@@ -54,6 +54,8 @@
       />
       <div
         class="module__intro intro"
+        data-cy="module-intro"
+        ref="introDiv"
         v-html="module.intro"
       />
     </div>
@@ -100,44 +102,146 @@ import ObjectiveGroups from '@/components/objective-groups/ObjectiveGroups.vue';
 import Chapter from '@/components/Chapter.vue';
 import BookmarkActions from '@/components/notes/BookmarkActions.vue';
 import Pill from '@/components/ui/Pill.vue';
-</script>
+import {
+  SelectionHandlerType,
+  SelectionHandlerOptions,
+  getSelectionHandler,
+  createHighlightCurry,
+  markHighlight,
+} from '@/helpers/highlight';
+import { onMounted, onUnmounted, ref, watch, computed } from 'vue';
+import { AddHighlightArgument, HighlightNode, ModuleNode } from '@/__generated__/graphql';
+import { graphql } from '@/__generated__';
+import highlightSidebar from '@/helpers/highlight-sidebar';
+import { doUpdateHighlight } from '@/graphql/mutations';
+import Mark from 'mark.js';
+import { useRoute } from 'vue-router';
 
-<script lang="ts">
-export default {
-  props: {
-    module: {
-      type: Object,
-      default: () => ({}),
-    },
-  },
+export interface Props {
+  module: ModuleNode;
+}
+const route = useRoute();
+const props = defineProps<Props>();
+let selectionHandler: SelectionHandlerType;
 
-  computed: {
-    languageCommunicationObjectiveGroups() {
-      return this.module.objectiveGroups
-        ? this.module.objectiveGroups.filter((group) => group.title.toLowerCase() === 'language_communication')
-        : [];
-    },
-    societyObjectiveGroups() {
-      return this.module.objectiveGroups
-        ? this.module.objectiveGroups.filter((group) => group.title.toLowerCase() === 'society')
-        : [];
-    },
-    interdisciplinaryObjectiveGroups() {
-      return this.module.objectiveGroups
-        ? this.module.objectiveGroups.filter((group) => group.title.toLowerCase() === 'interdisciplinary')
-        : [];
-    },
-    note() {
-      if (!(this.module && this.module.bookmark)) {
-        return;
-      }
-      return this.module.bookmark.note;
-    },
-    showObjectives() {
-      return this.$route && this.$route.query['show-objectives'] !== undefined;
-    },
-  },
+const introDiv = ref<HTMLElement | null>(null);
+
+const moduleHighlightsFragment = graphql(`
+  fragment ModuleHighlightsFragment on ModuleNode {
+    id
+    __typename
+    slug
+    highlights {
+      ...HighlightParts
+    }
+  }
+`);
+
+const createHighlight = createHighlightCurry({
+  fragment: moduleHighlightsFragment,
+  fragmentName: 'ModuleHighlightsFragment',
+  cacheSignature: { slug: props.module.slug, __typename: 'ModuleNode' },
+  isContentHighlight: false,
+});
+
+onMounted(() => {
+  const element = introDiv.value;
+  if (element !== null) {
+    const options: SelectionHandlerOptions = {
+      el: element,
+      page: props.module,
+      parentSelector: 'module__intro',
+      onChangeColor: (newHighlight: AddHighlightArgument) => {
+        createHighlight(newHighlight);
+      },
+      onCreateNote: (newHighlight: AddHighlightArgument) => {
+        // we also open the sidebar when clicking on the note icon
+        createHighlight(newHighlight).then((highlight) => {
+          highlightSidebar.open({
+            highlight,
+            onUpdateText: (text: string) => {
+              doUpdateHighlight({
+                input: {
+                  note: text,
+                  id: highlight.id,
+                },
+              });
+            },
+          });
+        });
+      },
+    };
+
+    selectionHandler = getSelectionHandler(options);
+
+    element.addEventListener('mouseup', selectionHandler);
+  }
+
+  markHighlights();
+});
+
+const markHighlights = () => {
+  if (props.module.highlights && introDiv.value) {
+    for (const highlight of props.module.highlights) {
+      const highlightNode = highlight as HighlightNode;
+      const element = introDiv.value.children[highlightNode.paragraphIndex] as HTMLElement;
+      markHighlight(highlightNode, element, element);
+    }
+  }
 };
+
+onUnmounted(() => {
+  const element = introDiv.value;
+
+  if (element !== null) {
+    element.removeEventListener('mouseup', selectionHandler);
+  }
+});
+
+const unmark = () => {
+  for (const paragraph of introDiv.value.children) {
+    const instance = new Mark(paragraph);
+    instance.unmark();
+  }
+};
+
+const highlights = computed(() => {
+  return props.module ? props.module.highlights : [];
+});
+
+watch(
+  () => highlights.value?.filter((h) => h.color),
+  () => {
+    unmark();
+    markHighlights();
+  }
+);
+
+const note = computed(() => {
+  if (!(props.module && props.module.bookmark)) {
+    return;
+  }
+  return props.module.bookmark.note;
+});
+
+const filterObjectiveGroup = (title: string) => {
+  return props.module.objectiveGroups
+    ? props.module.objectiveGroups.filter((group) => group.title.toLowerCase() === title)
+    : [];
+};
+
+const languageCommunicationObjectiveGroups = computed(() => {
+  return filterObjectiveGroup('language_communication');
+});
+const societyObjectiveGroups = computed(() => {
+  return filterObjectiveGroup('society');
+});
+const interdisciplinaryObjectiveGroups = computed(() => {
+  return filterObjectiveGroup('interdisciplinary');
+});
+const showObjectives = computed(() => {
+  return route && route.query['show-objectives'] !== undefined;
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/client/src/graphql/gql/fragments/highlightParts.gql b/client/src/graphql/gql/fragments/highlightParts.gql
index 48c0d85a..e430491a 100644
--- a/client/src/graphql/gql/fragments/highlightParts.gql
+++ b/client/src/graphql/gql/fragments/highlightParts.gql
@@ -22,5 +22,13 @@ fragment HighlightLegacyParts on HighlightNode {
       slug
       id
     }
+    ... on ChapterNode {
+      slug
+      id
+    }
+    ... on ModuleNode {
+      slug
+      id
+    }
   }
 }
diff --git a/client/src/graphql/gql/fragments/moduleParts.gql b/client/src/graphql/gql/fragments/moduleParts.gql
index 36dd7b1b..9e3cf02c 100644
--- a/client/src/graphql/gql/fragments/moduleParts.gql
+++ b/client/src/graphql/gql/fragments/moduleParts.gql
@@ -1,3 +1,4 @@
+#import "./highlightParts.gql"
 fragment ModuleParts on ModuleNode {
   id
   title
@@ -8,6 +9,9 @@ fragment ModuleParts on ModuleNode {
   heroImage
   heroSource
   solutionsEnabled
+  highlights {
+    ...HighlightLegacyParts
+  }
   language
   inEditMode @client
   level {
diff --git a/client/src/pages/module/module.vue b/client/src/pages/module/module.vue
index 2c4c8ae4..06104fba 100644
--- a/client/src/pages/module/module.vue
+++ b/client/src/pages/module/module.vue
@@ -1,6 +1,7 @@
 <template>
   <module
     :module="module"
+    v-if="module.id"
     @editNote="editNote"
     @addNote="addNote"
     @bookmark="bookmark"