diff --git a/client/codegen.ts b/client/codegen.ts
index acc81198..6497aec4 100644
--- a/client/codegen.ts
+++ b/client/codegen.ts
@@ -2,16 +2,16 @@ import { CodegenConfig } from '@graphql-codegen/cli';
 
 const config: CodegenConfig = {
   schema: ['../server/schema.graphql', './local.graphql'],
-  documents: ['src/**/*.vue'],
+  documents: ['src/**/*.vue', 'src/**/*.ts'],
   generates: {
     'src/__generated__/': {
       preset: 'client',
       plugins: [],
       presetConfig: {
-        useTypeImports: true
+        useTypeImports: true,
       },
     },
   },
-  ignoreNoDocuments: true
+  ignoreNoDocuments: true,
 };
 export default config;
diff --git a/client/src/__generated__/gql.ts b/client/src/__generated__/gql.ts
index fbf5b8e1..7fc5bc70 100644
--- a/client/src/__generated__/gql.ts
+++ b/client/src/__generated__/gql.ts
@@ -24,6 +24,8 @@ const documents = {
     "\n  fragment SnapshotTitleFragment on SnapshotNode {\n    title\n  }\n": types.SnapshotTitleFragmentFragmentDoc,
     "\n  fragment SnapshotDetailsFragment on SnapshotNode {\n    id\n    title\n    shared\n    created\n    creator\n    mine\n  }\n": types.SnapshotDetailsFragmentFragmentDoc,
     "\n  query ModuleEditModeQuery($slug: String) {\n    module(slug: $slug) {\n      inEditMode @client\n      slug\n    }\n  }\n": types.ModuleEditModeQueryDocument,
+    "\n        mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {\n          updateInstrumentBookmark(input: $input) {\n            success\n          }\n        }\n      ": types.UpdateInstrumentBookmarkDocument,
+    "\n        mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {\n          updateContentBookmark(input: $input) {\n            success\n          }\n        }\n      ": types.UpdateContentBookmarkDocument,
     "\n    query ChapterQuery($id: ID!) {\n      chapter(id: $id) {\n        path\n      }\n    }\n  ": types.ChapterQueryDocument,
     "\n    query ContentBlockQuery($id: ID!) {\n      contentBlock(id: $id) {\n        path\n      }\n    }\n  ": types.ContentBlockQueryDocument,
     "\n        query MeLanguage {\n          me {\n            language @client\n          }\n        }\n      ": types.MeLanguageDocument,
@@ -89,6 +91,14 @@ export function graphql(source: "\n  fragment SnapshotDetailsFragment on Snapsho
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  query ModuleEditModeQuery($slug: String) {\n    module(slug: $slug) {\n      inEditMode @client\n      slug\n    }\n  }\n"): (typeof documents)["\n  query ModuleEditModeQuery($slug: String) {\n    module(slug: $slug) {\n      inEditMode @client\n      slug\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n        mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {\n          updateInstrumentBookmark(input: $input) {\n            success\n          }\n        }\n      "): (typeof documents)["\n        mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {\n          updateInstrumentBookmark(input: $input) {\n            success\n          }\n        }\n      "];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n        mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {\n          updateContentBookmark(input: $input) {\n            success\n          }\n        }\n      "): (typeof documents)["\n        mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {\n          updateContentBookmark(input: $input) {\n            success\n          }\n        }\n      "];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/__generated__/graphql.ts b/client/src/__generated__/graphql.ts
index 3e13c9b4..db2c9688 100644
--- a/client/src/__generated__/graphql.ts
+++ b/client/src/__generated__/graphql.ts
@@ -9,36 +9,36 @@ export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> =
 export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-  ID: { input: string; output: string };
-  String: { input: string; output: string };
-  Boolean: { input: boolean; output: boolean };
-  Int: { input: number; output: number };
-  Float: { input: number; output: number };
+  ID: { input: string; output: string; }
+  String: { input: string; output: string; }
+  Boolean: { input: boolean; output: boolean; }
+  Int: { input: number; output: number; }
+  Float: { input: number; output: number; }
   /**
    * The `Date` scalar type represents a Date
    * value as specified by
    * [iso8601](https://en.wikipedia.org/wiki/ISO_8601).
    */
-  Date: { input: any; output: any };
+  Date: { input: any; output: any; }
   /**
    * The `DateTime` scalar type represents a DateTime
    * value as specified by
    * [iso8601](https://en.wikipedia.org/wiki/ISO_8601).
    */
-  DateTime: { input: any; output: any };
-  GenericStreamFieldType: { input: any; output: any };
+  DateTime: { input: any; output: any; }
+  GenericStreamFieldType: { input: any; output: any; }
   /**
    * Allows use of a JSON String for input / output from the GraphQL schema.
    *
    * Use of this type is *not recommended* as you lose the benefits of having a defined, static
    * schema (one of the key benefits of GraphQL).
    */
-  JSONString: { input: any; output: any };
+  JSONString: { input: any; output: any; }
   /**
    * Leverages the internal Python implementation of UUID (uuid.UUID) to provide native UUID objects
    * in fields, resolvers and input.
    */
-  UUID: { input: any; output: any };
+  UUID: { input: any; output: any; }
 };
 
 export type AddCommentInput = {
@@ -279,7 +279,7 @@ export enum BooksModuleCategoryFilterAttributeTypeChoices {
   /** All */
   All = 'ALL',
   /** Exact */
-  Exact = 'EXACT',
+  Exact = 'EXACT'
 }
 
 /** An enumeration. */
@@ -287,7 +287,7 @@ export enum BooksModuleLevelFilterAttributeTypeChoices {
   /** All */
   All = 'ALL',
   /** Exact */
-  Exact = 'EXACT',
+  Exact = 'EXACT'
 }
 
 export type ChapterBookmarkNode = Node & {
@@ -321,21 +321,20 @@ export type ChapterInterface = {
   title?: Maybe<Scalars['String']['output']>;
 };
 
-export type ChapterNode = ChapterInterface &
-  Node & {
-    __typename?: 'ChapterNode';
-    bookmark?: Maybe<ChapterBookmarkNode>;
-    contentBlocks?: Maybe<Array<Maybe<ContentBlockNode>>>;
-    description?: Maybe<Scalars['String']['output']>;
-    descriptionHiddenFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
-    /** The ID of the object */
-    id: Scalars['ID']['output'];
-    path?: Maybe<Scalars['String']['output']>;
-    /** Der Name der Seite, wie er in URLs angezeigt werden soll, z.B. http://domain.com/blog/[my-slug]/ */
-    slug: Scalars['String']['output'];
-    title?: Maybe<Scalars['String']['output']>;
-    titleHiddenFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
-  };
+export type ChapterNode = ChapterInterface & Node & {
+  __typename?: 'ChapterNode';
+  bookmark?: Maybe<ChapterBookmarkNode>;
+  contentBlocks?: Maybe<Array<Maybe<ContentBlockNode>>>;
+  description?: Maybe<Scalars['String']['output']>;
+  descriptionHiddenFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
+  /** The ID of the object */
+  id: Scalars['ID']['output'];
+  path?: Maybe<Scalars['String']['output']>;
+  /** Der Name der Seite, wie er in URLs angezeigt werden soll, z.B. http://domain.com/blog/[my-slug]/ */
+  slug: Scalars['String']['output'];
+  title?: Maybe<Scalars['String']['output']>;
+  titleHiddenFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
+};
 
 export type ChapterNodeConnection = {
   __typename?: 'ChapterNodeConnection';
@@ -418,25 +417,25 @@ export type ContentBlockInterface = {
   type: Scalars['String']['output'];
 };
 
-export type ContentBlockNode = ContentBlockInterface &
-  Node & {
-    __typename?: 'ContentBlockNode';
-    bookmarks?: Maybe<Array<Maybe<ContentBlockBookmarkNode>>>;
-    contents?: Maybe<Scalars['GenericStreamFieldType']['output']>;
-    hiddenFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
-    /** The ID of the object */
-    id: Scalars['ID']['output'];
-    instrumentCategory?: Maybe<InstrumentCategoryNode>;
-    mine?: Maybe<Scalars['Boolean']['output']>;
-    originalCreator?: Maybe<PublicUserNode>;
-    path?: Maybe<Scalars['String']['output']>;
-    /** Der Name der Seite, wie er in URLs angezeigt werden soll, z.B. http://domain.com/blog/[my-slug]/ */
-    slug: Scalars['String']['output'];
-    title?: Maybe<Scalars['String']['output']>;
-    type: Scalars['String']['output'];
-    userCreated: Scalars['Boolean']['output'];
-    visibleFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
-  };
+export type ContentBlockNode = ContentBlockInterface & Node & {
+  __typename?: 'ContentBlockNode';
+  bookmarks?: Maybe<Array<Maybe<ContentBlockBookmarkNode>>>;
+  contents?: Maybe<Scalars['GenericStreamFieldType']['output']>;
+  hiddenFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
+  highlights?: Maybe<Array<Maybe<HighlightNode>>>;
+  /** The ID of the object */
+  id: Scalars['ID']['output'];
+  instrumentCategory?: Maybe<InstrumentCategoryNode>;
+  mine?: Maybe<Scalars['Boolean']['output']>;
+  originalCreator?: Maybe<PublicUserNode>;
+  path?: Maybe<Scalars['String']['output']>;
+  /** Der Name der Seite, wie er in URLs angezeigt werden soll, z.B. http://domain.com/blog/[my-slug]/ */
+  slug: Scalars['String']['output'];
+  title?: Maybe<Scalars['String']['output']>;
+  type: Scalars['String']['output'];
+  userCreated: Scalars['Boolean']['output'];
+  visibleFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
+};
 
 export type ContentBlockNodeConnection = {
   __typename?: 'ContentBlockNodeConnection';
@@ -691,6 +690,21 @@ export type FieldError = {
   code?: Maybe<Scalars['String']['output']>;
 };
 
+export type HighlightNode = Node & {
+  __typename?: 'HighlightNode';
+  color: Scalars['String']['output'];
+  contentBlock: ContentBlockNode;
+  contentIndex: Scalars['Int']['output'];
+  contentUuid: Scalars['UUID']['output'];
+  /** The ID of the object */
+  id: Scalars['ID']['output'];
+  paragraphIndex: Scalars['Int']['output'];
+  selectionLength: Scalars['Int']['output'];
+  startPosition: Scalars['Int']['output'];
+  text: Scalars['String']['output'];
+  user: PrivateUserNode;
+};
+
 export enum InputTypes {
   Assignment = 'assignment',
   ContentListItem = 'content_list_item',
@@ -701,7 +715,7 @@ export enum InputTypes {
   Readonly = 'readonly',
   Subtitle = 'subtitle',
   TextBlock = 'text_block',
-  VideoBlock = 'video_block',
+  VideoBlock = 'video_block'
 }
 
 export type InstrumentBookmarkNode = Node & {
@@ -823,6 +837,7 @@ export type ModuleCategoryNode = Node & {
   order: Scalars['Int']['output'];
 };
 
+
 export type ModuleCategoryNodeModuleSetArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -874,6 +889,7 @@ export type ModuleLevelNode = Node & {
   order: Scalars['Int']['output'];
 };
 
+
 export type ModuleLevelNodeModuleSetArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -921,6 +937,7 @@ export type ModuleNode = ModuleInterface & {
   topic?: Maybe<TopicNode>;
 };
 
+
 export type ModuleNodeMyAnswersArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -929,6 +946,7 @@ export type ModuleNodeMyAnswersArgs = {
   offset?: InputMaybe<Scalars['Int']['input']>;
 };
 
+
 export type ModuleNodeMyChapterBookmarksArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -937,6 +955,7 @@ export type ModuleNodeMyChapterBookmarksArgs = {
   offset?: InputMaybe<Scalars['Int']['input']>;
 };
 
+
 export type ModuleNodeMyContentBookmarksArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -945,6 +964,7 @@ export type ModuleNodeMyContentBookmarksArgs = {
   offset?: InputMaybe<Scalars['Int']['input']>;
 };
 
+
 export type ModuleNodeMySubmissionsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1047,230 +1067,287 @@ export type Mutation = {
   updateTeam?: Maybe<UpdateTeamPayload>;
 };
 
+
 export type MutationAddCommentArgs = {
   input: AddCommentInput;
 };
 
+
 export type MutationAddContentBlockArgs = {
   input: AddContentBlockInput;
 };
 
+
 export type MutationAddModuleRoomEntryArgs = {
   input: AddModuleRoomEntryInput;
 };
 
+
 export type MutationAddNoteArgs = {
   input: AddNoteInput;
 };
 
+
 export type MutationAddObjectiveArgs = {
   input: AddObjectiveInput;
 };
 
+
 export type MutationAddProjectArgs = {
   input: AddProjectInput;
 };
 
+
 export type MutationAddProjectEntryArgs = {
   input: AddProjectEntryInput;
 };
 
+
 export type MutationAddRemoveMemberArgs = {
   input: AddRemoveMemberInput;
 };
 
+
 export type MutationAddRoomArgs = {
   input: AddRoomInput;
 };
 
+
 export type MutationAddRoomEntryArgs = {
   input: AddRoomEntryInput;
 };
 
+
 export type MutationApplySnapshotArgs = {
   input: ApplySnapshotInput;
 };
 
+
 export type MutationCouponArgs = {
   input: CouponInput;
 };
 
+
 export type MutationCreateSchoolClassArgs = {
   input: CreateSchoolClassInput;
 };
 
+
 export type MutationCreateSnapshotArgs = {
   input: CreateSnapshotInput;
 };
 
+
 export type MutationCreateTeamArgs = {
   input: CreateTeamInput;
 };
 
+
 export type MutationDeleteContentBlockArgs = {
   input: DeleteContentBlockInput;
 };
 
+
 export type MutationDeleteObjectiveArgs = {
   input: DeleteObjectiveInput;
 };
 
+
 export type MutationDeleteProjectArgs = {
   input: DeleteProjectInput;
 };
 
+
 export type MutationDeleteProjectEntryArgs = {
   input: DeleteProjectEntryInput;
 };
 
+
 export type MutationDeleteRoomArgs = {
   input: DeleteRoomInput;
 };
 
+
 export type MutationDeleteRoomEntryArgs = {
   input: DeleteRoomEntryInput;
 };
 
+
 export type MutationDeleteSnapshotArgs = {
   input: DeleteSnapshotInput;
 };
 
+
 export type MutationDuplicateContentBlockArgs = {
   input: DuplicateContentBlockInput;
 };
 
+
 export type MutationJoinClassArgs = {
   input: JoinClassInput;
 };
 
+
 export type MutationJoinTeamArgs = {
   input: JoinTeamInput;
 };
 
+
 export type MutationMutateContentBlockArgs = {
   input: MutateContentBlockInput;
 };
 
+
 export type MutationSetLanguageArgs = {
   language: Scalars['String']['input'];
 };
 
+
 export type MutationShareSnapshotArgs = {
   input: ShareSnapshotInput;
 };
 
+
 export type MutationSpellCheckArgs = {
   input: SpellCheckInput;
 };
 
+
 export type MutationSyncModuleVisibilityArgs = {
   input: SyncModuleVisibilityInput;
 };
 
+
 export type MutationUpdateAnswerArgs = {
   input: UpdateAnswerInput;
 };
 
+
 export type MutationUpdateAssignmentArgs = {
   input: UpdateAssignmentInput;
 };
 
+
 export type MutationUpdateAvatarArgs = {
   input: UpdateAvatarInput;
 };
 
+
 export type MutationUpdateChapterBookmarkArgs = {
   input: UpdateChapterBookmarkInput;
 };
 
+
 export type MutationUpdateChapterVisibilityArgs = {
   input: UpdateChapterVisibilityInput;
 };
 
+
 export type MutationUpdateContentBookmarkArgs = {
   input: UpdateContentBookmarkInput;
 };
 
+
 export type MutationUpdateInstrumentBookmarkArgs = {
   input: UpdateInstrumentBookmarkInput;
 };
 
+
 export type MutationUpdateLastModuleArgs = {
   input: UpdateLastModuleInput;
 };
 
+
 export type MutationUpdateLastModuleLevelArgs = {
   input: UpdateLastModuleLevelInput;
 };
 
+
 export type MutationUpdateLastTopicArgs = {
   input: UpdateLastTopicInput;
 };
 
+
 export type MutationUpdateModuleBookmarkArgs = {
   input: UpdateModuleBookmarkInput;
 };
 
+
 export type MutationUpdateNoteArgs = {
   input: UpdateNoteInput;
 };
 
+
 export type MutationUpdateObjectiveGroupVisibilityArgs = {
   input: UpdateObjectiveGroupVisibilityInput;
 };
 
+
 export type MutationUpdateObjectiveVisibilityArgs = {
   input: UpdateObjectiveVisibilityInput;
 };
 
+
 export type MutationUpdatePasswordArgs = {
   input: UpdatePasswordInput;
 };
 
+
 export type MutationUpdateProjectArgs = {
   input: UpdateProjectInput;
 };
 
+
 export type MutationUpdateProjectEntryArgs = {
   input: UpdateProjectEntryInput;
 };
 
+
 export type MutationUpdateProjectSharedStateArgs = {
   input: UpdateProjectSharedStateInput;
 };
 
+
 export type MutationUpdateRoomArgs = {
   input: UpdateRoomInput;
 };
 
+
 export type MutationUpdateRoomEntryArgs = {
   input: UpdateRoomEntryInput;
 };
 
+
 export type MutationUpdateRoomVisibilityArgs = {
   input: UpdateRoomVisibilityInput;
 };
 
+
 export type MutationUpdateSchoolClassArgs = {
   input: UpdateSchoolClassInput;
 };
 
+
 export type MutationUpdateSettingArgs = {
   input: UpdateSettingInput;
 };
 
+
 export type MutationUpdateSnapshotArgs = {
   input: UpdateSnapshotInput;
 };
 
+
 export type MutationUpdateSolutionVisibilityArgs = {
   input: UpdateSolutionVisibilityInput;
 };
 
+
 export type MutationUpdateSubmissionFeedbackArgs = {
   input: UpdateSubmissionFeedbackInput;
 };
 
+
 export type MutationUpdateTeamArgs = {
   input: UpdateTeamInput;
 };
@@ -1362,6 +1439,7 @@ export type ObjectiveNode = Node & {
   visibleFor?: Maybe<Array<Maybe<SchoolClassNode>>>;
 };
 
+
 export type ObjectiveNodeHiddenForSnapshotsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1394,7 +1472,7 @@ export enum ObjectivesObjectiveGroupTitleChoices {
   /** Sprache & Kommunikation */
   LanguageCommunication = 'LANGUAGE_COMMUNICATION',
   /** Gesellschaft */
-  Society = 'SOCIETY',
+  Society = 'SOCIETY'
 }
 
 /** The Relay compliant `PageInfo` type, containing data necessary to paginate this connection. */
@@ -1442,6 +1520,7 @@ export type PrivateUserNode = Node & {
   username: Scalars['String']['output'];
 };
 
+
 export type PrivateUserNodeRecentModulesArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1549,6 +1628,7 @@ export type Query = {
   topics?: Maybe<TopicConnection>;
 };
 
+
 export type QueryAllRoomEntriesArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1558,6 +1638,7 @@ export type QueryAllRoomEntriesArgs = {
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryAllUsersArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1568,14 +1649,17 @@ export type QueryAllUsersArgs = {
   username?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryAssignmentArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryChapterArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryChaptersArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1586,33 +1670,40 @@ export type QueryChaptersArgs = {
   title?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryContentBlockArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryInstrumentArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryModuleArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryModuleCategoryArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryModuleLevelArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryModuleRoomArgs = {
   classId?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryModulesArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1620,6 +1711,7 @@ export type QueryModulesArgs = {
   last?: InputMaybe<Scalars['Int']['input']>;
 };
 
+
 export type QueryMyActivityArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1634,6 +1726,7 @@ export type QueryMyActivityArgs = {
   title_In?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
 };
 
+
 export type QueryMyInstrumentActivityArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1643,14 +1736,17 @@ export type QueryMyInstrumentActivityArgs = {
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryNodeArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryObjectiveGroupArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryObjectiveGroupsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1661,34 +1757,41 @@ export type QueryObjectiveGroupsArgs = {
   title?: InputMaybe<ObjectivesObjectiveGroupTitleChoices>;
 };
 
+
 export type QueryProjectArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryRoomArgs = {
   appearance?: InputMaybe<Scalars['String']['input']>;
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryRoomEntryArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QuerySnapshotArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QueryStudentSubmissionArgs = {
   id: Scalars['ID']['input'];
 };
 
+
 export type QuerySurveyArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QuerySurveysArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1697,10 +1800,12 @@ export type QuerySurveysArgs = {
   offset?: InputMaybe<Scalars['Int']['input']>;
 };
 
+
 export type QueryTopicArgs = {
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type QueryTopicsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1757,6 +1862,7 @@ export type RoomNode = Node & {
   userCreated: Scalars['Boolean']['output'];
 };
 
+
 export type RoomNodeRoomEntriesArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1803,28 +1909,26 @@ export type SnapshotChangesNode = {
   newObjectives: Scalars['Int']['output'];
 };
 
-export type SnapshotChapterNode = ChapterInterface &
-  Node & {
-    __typename?: 'SnapshotChapterNode';
-    contentBlocks?: Maybe<Array<Maybe<SnapshotContentBlockNode>>>;
-    description?: Maybe<Scalars['String']['output']>;
-    descriptionHidden?: Maybe<Scalars['Boolean']['output']>;
-    /** The ID of the object */
-    id: Scalars['ID']['output'];
-    title?: Maybe<Scalars['String']['output']>;
-    titleHidden?: Maybe<Scalars['Boolean']['output']>;
-  };
+export type SnapshotChapterNode = ChapterInterface & Node & {
+  __typename?: 'SnapshotChapterNode';
+  contentBlocks?: Maybe<Array<Maybe<SnapshotContentBlockNode>>>;
+  description?: Maybe<Scalars['String']['output']>;
+  descriptionHidden?: Maybe<Scalars['Boolean']['output']>;
+  /** The ID of the object */
+  id: Scalars['ID']['output'];
+  title?: Maybe<Scalars['String']['output']>;
+  titleHidden?: Maybe<Scalars['Boolean']['output']>;
+};
 
-export type SnapshotContentBlockNode = ContentBlockInterface &
-  Node & {
-    __typename?: 'SnapshotContentBlockNode';
-    contents?: Maybe<Scalars['GenericStreamFieldType']['output']>;
-    hidden?: Maybe<Scalars['Boolean']['output']>;
-    /** The ID of the object */
-    id: Scalars['ID']['output'];
-    title?: Maybe<Scalars['String']['output']>;
-    type: Scalars['String']['output'];
-  };
+export type SnapshotContentBlockNode = ContentBlockInterface & Node & {
+  __typename?: 'SnapshotContentBlockNode';
+  contents?: Maybe<Scalars['GenericStreamFieldType']['output']>;
+  hidden?: Maybe<Scalars['Boolean']['output']>;
+  /** The ID of the object */
+  id: Scalars['ID']['output'];
+  title?: Maybe<Scalars['String']['output']>;
+  type: Scalars['String']['output'];
+};
 
 export type SnapshotNode = Node & {
   __typename?: 'SnapshotNode';
@@ -1845,6 +1949,7 @@ export type SnapshotNode = Node & {
   title?: Maybe<Scalars['String']['output']>;
 };
 
+
 export type SnapshotNodeHiddenContentBlocksArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1855,6 +1960,7 @@ export type SnapshotNodeHiddenContentBlocksArgs = {
   title?: InputMaybe<Scalars['String']['input']>;
 };
 
+
 export type SnapshotNodeHiddenObjectivesArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -1993,6 +2099,7 @@ export type SurveyNode = Node & {
   title: Scalars['String']['output'];
 };
 
+
 export type SurveyNodeAnswersArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -2079,6 +2186,7 @@ export type TopicNode = Node & {
   vimeoId?: Maybe<Scalars['String']['output']>;
 };
 
+
 export type TopicNodeModulesArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -2487,767 +2595,128 @@ export type UserGroupBlockVisibility = {
   schoolClassId: Scalars['ID']['input'];
 };
 
-export type LanguageQueryQueryVariables = Exact<{ [key: string]: never }>;
+export type LanguageQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
-export type LanguageQueryQuery = {
-  __typename?: 'Query';
-  me?: { __typename?: 'PrivateUserNode'; language?: string | null } | null;
-};
+
+export type LanguageQueryQuery = { __typename?: 'Query', me?: { __typename?: 'PrivateUserNode', language?: string | null } | null };
 
 export type SetLanguageMutationVariables = Exact<{
   language: Scalars['String']['input'];
 }>;
 
-export type SetLanguageMutation = {
-  __typename?: 'Mutation';
-  setLanguage?: { __typename?: 'PrivateUserNode'; language?: string | null } | null;
-};
 
-export type ReadOnlyQueryQueryVariables = Exact<{ [key: string]: never }>;
+export type SetLanguageMutation = { __typename?: 'Mutation', setLanguage?: { __typename?: 'PrivateUserNode', language?: string | null } | null };
 
-export type ReadOnlyQueryQuery = {
-  __typename?: 'Query';
-  me?: {
-    __typename?: 'PrivateUserNode';
-    readOnly?: boolean | null;
-    selectedClass?: { __typename?: 'SchoolClassNode'; readOnly?: boolean | null } | null;
-  } | null;
-};
+export type ReadOnlyQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
-export type ModuleLevelFragmentFragment = {
-  __typename?: 'ModuleLevelNode';
-  name: string;
-  id: string;
-  filterAttributeType: BooksModuleLevelFilterAttributeTypeChoices;
-} & { ' $fragmentName'?: 'ModuleLevelFragmentFragment' };
 
-export type ModuleFilterQueryQueryVariables = Exact<{ [key: string]: never }>;
+export type ReadOnlyQueryQuery = { __typename?: 'Query', me?: { __typename?: 'PrivateUserNode', readOnly?: boolean | null, selectedClass?: { __typename?: 'SchoolClassNode', readOnly?: boolean | null } | null } | null };
 
-export type ModuleFilterQueryQuery = {
-  __typename?: 'Query';
-  moduleLevels?: Array<
-    | ({ __typename?: 'ModuleLevelNode' } & {
-        ' $fragmentRefs'?: { ModuleLevelFragmentFragment: ModuleLevelFragmentFragment };
-      })
-    | null
-  > | null;
-  moduleCategories?: Array<{
-    __typename?: 'ModuleCategoryNode';
-    name: string;
-    id: string;
-    filterAttributeType: BooksModuleCategoryFilterAttributeTypeChoices;
-  } | null> | null;
-  me?: { __typename?: 'PrivateUserNode'; language?: string | null } | null;
-};
+export type ModuleLevelFragmentFragment = { __typename?: 'ModuleLevelNode', name: string, id: string, filterAttributeType: BooksModuleLevelFilterAttributeTypeChoices } & { ' $fragmentName'?: 'ModuleLevelFragmentFragment' };
+
+export type ModuleFilterQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type ModuleFilterQueryQuery = { __typename?: 'Query', moduleLevels?: Array<(
+    { __typename?: 'ModuleLevelNode' }
+    & { ' $fragmentRefs'?: { 'ModuleLevelFragmentFragment': ModuleLevelFragmentFragment } }
+  ) | null> | null, moduleCategories?: Array<{ __typename?: 'ModuleCategoryNode', name: string, id: string, filterAttributeType: BooksModuleCategoryFilterAttributeTypeChoices } | null> | null, me?: { __typename?: 'PrivateUserNode', language?: string | null } | null };
 
 export type UpdateLastModuleLevelMutationMutationVariables = Exact<{
   input: UpdateLastModuleLevelInput;
 }>;
 
-export type UpdateLastModuleLevelMutationMutation = {
-  __typename?: 'Mutation';
-  updateLastModuleLevel?: {
-    __typename?: 'UpdateLastModuleLevelPayload';
-    clientMutationId?: string | null;
-    user?: {
-      __typename?: 'PrivateUserNode';
-      username: string;
-      id: string;
-      lastModuleLevel?:
-        | ({ __typename?: 'ModuleLevelNode' } & {
-            ' $fragmentRefs'?: { ModuleLevelFragmentFragment: ModuleLevelFragmentFragment };
-          })
-        | null;
-    } | null;
-  } | null;
-};
+
+export type UpdateLastModuleLevelMutationMutation = { __typename?: 'Mutation', updateLastModuleLevel?: { __typename?: 'UpdateLastModuleLevelPayload', clientMutationId?: string | null, user?: { __typename?: 'PrivateUserNode', username: string, id: string, lastModuleLevel?: (
+        { __typename?: 'ModuleLevelNode' }
+        & { ' $fragmentRefs'?: { 'ModuleLevelFragmentFragment': ModuleLevelFragmentFragment } }
+      ) | null } | null } | null };
 
 export type ModuleTitleQueryQueryVariables = Exact<{
   slug?: InputMaybe<Scalars['String']['input']>;
 }>;
 
-export type ModuleTitleQueryQuery = {
-  __typename?: 'Query';
-  module?: { __typename?: 'ModuleNode'; title: string } | null;
-};
 
-export type SnapshotListItemFragment = { __typename?: 'SnapshotNode'; shared: boolean } & {
-  ' $fragmentName'?: 'SnapshotListItemFragment';
-};
+export type ModuleTitleQueryQuery = { __typename?: 'Query', module?: { __typename?: 'ModuleNode', title: string } | null };
 
-export type SnapshotTitleFragmentFragment = { __typename?: 'SnapshotNode'; title?: string | null } & {
-  ' $fragmentName'?: 'SnapshotTitleFragmentFragment';
-};
+export type SnapshotListItemFragment = { __typename?: 'SnapshotNode', shared: boolean } & { ' $fragmentName'?: 'SnapshotListItemFragment' };
 
-export type SnapshotDetailsFragmentFragment = {
-  __typename?: 'SnapshotNode';
-  id: string;
-  title?: string | null;
-  shared: boolean;
-  created: any;
-  creator: string;
-  mine?: boolean | null;
-} & { ' $fragmentName'?: 'SnapshotDetailsFragmentFragment' };
+export type SnapshotTitleFragmentFragment = { __typename?: 'SnapshotNode', title?: string | null } & { ' $fragmentName'?: 'SnapshotTitleFragmentFragment' };
+
+export type SnapshotDetailsFragmentFragment = { __typename?: 'SnapshotNode', id: string, title?: string | null, shared: boolean, created: any, creator: string, mine?: boolean | null } & { ' $fragmentName'?: 'SnapshotDetailsFragmentFragment' };
 
 export type ModuleEditModeQueryQueryVariables = Exact<{
   slug?: InputMaybe<Scalars['String']['input']>;
 }>;
 
-export type ModuleEditModeQueryQuery = {
-  __typename?: 'Query';
-  module?: { __typename?: 'ModuleNode'; inEditMode: boolean; slug: string } | null;
-};
+
+export type ModuleEditModeQueryQuery = { __typename?: 'Query', module?: { __typename?: 'ModuleNode', inEditMode: boolean, slug: string } | null };
+
+export type UpdateInstrumentBookmarkMutationVariables = Exact<{
+  input: UpdateInstrumentBookmarkInput;
+}>;
+
+
+export type UpdateInstrumentBookmarkMutation = { __typename?: 'Mutation', updateInstrumentBookmark?: { __typename?: 'UpdateInstrumentBookmarkPayload', success?: boolean | null } | null };
+
+export type UpdateContentBookmarkMutationVariables = Exact<{
+  input: UpdateContentBookmarkInput;
+}>;
+
+
+export type UpdateContentBookmarkMutation = { __typename?: 'Mutation', updateContentBookmark?: { __typename?: 'UpdateContentBookmarkPayload', success?: boolean | null } | null };
 
 export type ChapterQueryQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
-export type ChapterQueryQuery = {
-  __typename?: 'Query';
-  chapter?: { __typename?: 'ChapterNode'; path?: string | null } | null;
-};
+
+export type ChapterQueryQuery = { __typename?: 'Query', chapter?: { __typename?: 'ChapterNode', path?: string | null } | null };
 
 export type ContentBlockQueryQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
-export type ContentBlockQueryQuery = {
-  __typename?: 'Query';
-  contentBlock?: { __typename?: 'ContentBlockNode'; path?: string | null } | null;
-};
 
-export type MeLanguageQueryVariables = Exact<{ [key: string]: never }>;
+export type ContentBlockQueryQuery = { __typename?: 'Query', contentBlock?: { __typename?: 'ContentBlockNode', path?: string | null } | null };
 
-export type MeLanguageQuery = {
-  __typename?: 'Query';
-  me?: { __typename?: 'PrivateUserNode'; language?: string | null } | null;
-};
+export type MeLanguageQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type MeLanguageQuery = { __typename?: 'Query', me?: { __typename?: 'PrivateUserNode', language?: string | null } | null };
 
 export type ModuleSnapshotsQueryQueryVariables = Exact<{
   slug: Scalars['String']['input'];
 }>;
 
-export type ModuleSnapshotsQueryQuery = {
-  __typename?: 'Query';
-  module?: {
-    __typename?: 'ModuleNode';
-    id: string;
-    title: string;
-    metaTitle: string;
-    slug: string;
-    topic?: { __typename?: 'TopicNode'; title: string } | null;
-    snapshots?: Array<
-      | ({ __typename?: 'SnapshotNode' } & {
-          ' $fragmentRefs'?: { SnapshotDetailsFragmentFragment: SnapshotDetailsFragmentFragment };
-        })
-      | null
-    > | null;
-  } | null;
-};
+
+export type ModuleSnapshotsQueryQuery = { __typename?: 'Query', module?: { __typename?: 'ModuleNode', id: string, title: string, metaTitle: string, slug: string, topic?: { __typename?: 'TopicNode', title: string } | null, snapshots?: Array<(
+      { __typename?: 'SnapshotNode' }
+      & { ' $fragmentRefs'?: { 'SnapshotDetailsFragmentFragment': SnapshotDetailsFragmentFragment } }
+    ) | null> | null } | null };
 
 export type ModuleSolutionsQueryVariables = Exact<{
   slug?: InputMaybe<Scalars['String']['input']>;
 }>;
 
-export type ModuleSolutionsQuery = {
-  __typename?: 'Query';
-  module?: { __typename?: 'ModuleNode'; solutionsEnabled?: boolean | null; slug: string } | null;
-};
 
-export const ModuleLevelFragmentFragmentDoc = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'FragmentDefinition',
-      name: { kind: 'Name', value: 'ModuleLevelFragment' },
-      typeCondition: { kind: 'NamedType', name: { kind: 'Name', value: 'ModuleLevelNode' } },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          { kind: 'Field', name: { kind: 'Name', value: 'name' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'filterAttributeType' } },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ModuleLevelFragmentFragment, unknown>;
-export const SnapshotListItemFragmentDoc = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'FragmentDefinition',
-      name: { kind: 'Name', value: 'SnapshotListItem' },
-      typeCondition: { kind: 'NamedType', name: { kind: 'Name', value: 'SnapshotNode' } },
-      selectionSet: { kind: 'SelectionSet', selections: [{ kind: 'Field', name: { kind: 'Name', value: 'shared' } }] },
-    },
-  ],
-} as unknown as DocumentNode<SnapshotListItemFragment, unknown>;
-export const SnapshotTitleFragmentFragmentDoc = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'FragmentDefinition',
-      name: { kind: 'Name', value: 'SnapshotTitleFragment' },
-      typeCondition: { kind: 'NamedType', name: { kind: 'Name', value: 'SnapshotNode' } },
-      selectionSet: { kind: 'SelectionSet', selections: [{ kind: 'Field', name: { kind: 'Name', value: 'title' } }] },
-    },
-  ],
-} as unknown as DocumentNode<SnapshotTitleFragmentFragment, unknown>;
-export const SnapshotDetailsFragmentFragmentDoc = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'FragmentDefinition',
-      name: { kind: 'Name', value: 'SnapshotDetailsFragment' },
-      typeCondition: { kind: 'NamedType', name: { kind: 'Name', value: 'SnapshotNode' } },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'title' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'shared' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'created' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'creator' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'mine' } },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<SnapshotDetailsFragmentFragment, unknown>;
-export const LanguageQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'LanguageQuery' },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'me' },
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'language' },
-                  directives: [{ kind: 'Directive', name: { kind: 'Name', value: 'client' } }],
-                },
-              ],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<LanguageQueryQuery, LanguageQueryQueryVariables>;
-export const SetLanguageDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'mutation',
-      name: { kind: 'Name', value: 'SetLanguage' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'language' } },
-          type: { kind: 'NonNullType', type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } } },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'setLanguage' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'language' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'language' } },
-              },
-            ],
-            directives: [{ kind: 'Directive', name: { kind: 'Name', value: 'client' } }],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [{ kind: 'Field', name: { kind: 'Name', value: 'language' } }],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<SetLanguageMutation, SetLanguageMutationVariables>;
-export const ReadOnlyQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ReadOnlyQuery' },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'me' },
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                { kind: 'Field', name: { kind: 'Name', value: 'readOnly' } },
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'selectedClass' },
-                  selectionSet: {
-                    kind: 'SelectionSet',
-                    selections: [{ kind: 'Field', name: { kind: 'Name', value: 'readOnly' } }],
-                  },
-                },
-              ],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ReadOnlyQueryQuery, ReadOnlyQueryQueryVariables>;
-export const ModuleFilterQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ModuleFilterQuery' },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'moduleLevels' },
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [{ kind: 'FragmentSpread', name: { kind: 'Name', value: 'ModuleLevelFragment' } }],
-            },
-          },
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'moduleCategories' },
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                { kind: 'Field', name: { kind: 'Name', value: 'name' } },
-                { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-                { kind: 'Field', name: { kind: 'Name', value: 'filterAttributeType' } },
-              ],
-            },
-          },
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'me' },
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'language' },
-                  directives: [{ kind: 'Directive', name: { kind: 'Name', value: 'client' } }],
-                },
-              ],
-            },
-          },
-        ],
-      },
-    },
-    {
-      kind: 'FragmentDefinition',
-      name: { kind: 'Name', value: 'ModuleLevelFragment' },
-      typeCondition: { kind: 'NamedType', name: { kind: 'Name', value: 'ModuleLevelNode' } },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          { kind: 'Field', name: { kind: 'Name', value: 'name' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'filterAttributeType' } },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ModuleFilterQueryQuery, ModuleFilterQueryQueryVariables>;
-export const UpdateLastModuleLevelMutationDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'mutation',
-      name: { kind: 'Name', value: 'UpdateLastModuleLevelMutation' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'input' } },
-          type: {
-            kind: 'NonNullType',
-            type: { kind: 'NamedType', name: { kind: 'Name', value: 'UpdateLastModuleLevelInput' } },
-          },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'updateLastModuleLevel' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'input' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'input' } },
-              },
-            ],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                { kind: 'Field', name: { kind: 'Name', value: 'clientMutationId' } },
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'user' },
-                  selectionSet: {
-                    kind: 'SelectionSet',
-                    selections: [
-                      { kind: 'Field', name: { kind: 'Name', value: 'username' } },
-                      { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-                      {
-                        kind: 'Field',
-                        name: { kind: 'Name', value: 'lastModuleLevel' },
-                        selectionSet: {
-                          kind: 'SelectionSet',
-                          selections: [
-                            { kind: 'FragmentSpread', name: { kind: 'Name', value: 'ModuleLevelFragment' } },
-                          ],
-                        },
-                      },
-                    ],
-                  },
-                },
-              ],
-            },
-          },
-        ],
-      },
-    },
-    {
-      kind: 'FragmentDefinition',
-      name: { kind: 'Name', value: 'ModuleLevelFragment' },
-      typeCondition: { kind: 'NamedType', name: { kind: 'Name', value: 'ModuleLevelNode' } },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          { kind: 'Field', name: { kind: 'Name', value: 'name' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'filterAttributeType' } },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<UpdateLastModuleLevelMutationMutation, UpdateLastModuleLevelMutationMutationVariables>;
-export const ModuleTitleQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ModuleTitleQuery' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-          type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'module' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'slug' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-              },
-            ],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [{ kind: 'Field', name: { kind: 'Name', value: 'title' } }],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ModuleTitleQueryQuery, ModuleTitleQueryQueryVariables>;
-export const ModuleEditModeQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ModuleEditModeQuery' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-          type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'module' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'slug' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-              },
-            ],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'inEditMode' },
-                  directives: [{ kind: 'Directive', name: { kind: 'Name', value: 'client' } }],
-                },
-                { kind: 'Field', name: { kind: 'Name', value: 'slug' } },
-              ],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ModuleEditModeQueryQuery, ModuleEditModeQueryQueryVariables>;
-export const ChapterQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ChapterQuery' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'id' } },
-          type: { kind: 'NonNullType', type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } } },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'chapter' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'id' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'id' } },
-              },
-            ],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [{ kind: 'Field', name: { kind: 'Name', value: 'path' } }],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ChapterQueryQuery, ChapterQueryQueryVariables>;
-export const ContentBlockQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ContentBlockQuery' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'id' } },
-          type: { kind: 'NonNullType', type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } } },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'contentBlock' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'id' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'id' } },
-              },
-            ],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [{ kind: 'Field', name: { kind: 'Name', value: 'path' } }],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ContentBlockQueryQuery, ContentBlockQueryQueryVariables>;
-export const MeLanguageDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'MeLanguage' },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'me' },
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'language' },
-                  directives: [{ kind: 'Directive', name: { kind: 'Name', value: 'client' } }],
-                },
-              ],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<MeLanguageQuery, MeLanguageQueryVariables>;
-export const ModuleSnapshotsQueryDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ModuleSnapshotsQuery' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-          type: { kind: 'NonNullType', type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } } },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'module' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'slug' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-              },
-            ],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-                { kind: 'Field', name: { kind: 'Name', value: 'title' } },
-                { kind: 'Field', name: { kind: 'Name', value: 'metaTitle' } },
-                { kind: 'Field', name: { kind: 'Name', value: 'slug' } },
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'topic' },
-                  selectionSet: {
-                    kind: 'SelectionSet',
-                    selections: [{ kind: 'Field', name: { kind: 'Name', value: 'title' } }],
-                  },
-                },
-                {
-                  kind: 'Field',
-                  name: { kind: 'Name', value: 'snapshots' },
-                  selectionSet: {
-                    kind: 'SelectionSet',
-                    selections: [{ kind: 'FragmentSpread', name: { kind: 'Name', value: 'SnapshotDetailsFragment' } }],
-                  },
-                },
-              ],
-            },
-          },
-        ],
-      },
-    },
-    {
-      kind: 'FragmentDefinition',
-      name: { kind: 'Name', value: 'SnapshotDetailsFragment' },
-      typeCondition: { kind: 'NamedType', name: { kind: 'Name', value: 'SnapshotNode' } },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'title' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'shared' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'created' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'creator' } },
-          { kind: 'Field', name: { kind: 'Name', value: 'mine' } },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ModuleSnapshotsQueryQuery, ModuleSnapshotsQueryQueryVariables>;
-export const ModuleSolutionsDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'ModuleSolutions' },
-      variableDefinitions: [
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-          type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } },
-        },
-      ],
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'module' },
-            arguments: [
-              {
-                kind: 'Argument',
-                name: { kind: 'Name', value: 'slug' },
-                value: { kind: 'Variable', name: { kind: 'Name', value: 'slug' } },
-              },
-            ],
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [
-                { kind: 'Field', name: { kind: 'Name', value: 'solutionsEnabled' } },
-                { kind: 'Field', name: { kind: 'Name', value: 'slug' } },
-              ],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<ModuleSolutionsQuery, ModuleSolutionsQueryVariables>;
+export type ModuleSolutionsQuery = { __typename?: 'Query', module?: { __typename?: 'ModuleNode', solutionsEnabled?: boolean | null, slug: string } | null };
+
+export const ModuleLevelFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModuleLevelFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleLevelNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}}]} as unknown as DocumentNode<ModuleLevelFragmentFragment, unknown>;
+export const SnapshotListItemFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SnapshotListItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SnapshotNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"shared"}}]}}]} as unknown as DocumentNode<SnapshotListItemFragment, unknown>;
+export const SnapshotTitleFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SnapshotTitleFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SnapshotNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]} as unknown as DocumentNode<SnapshotTitleFragmentFragment, unknown>;
+export const SnapshotDetailsFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SnapshotDetailsFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SnapshotNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"shared"}},{"kind":"Field","name":{"kind":"Name","value":"created"}},{"kind":"Field","name":{"kind":"Name","value":"creator"}},{"kind":"Field","name":{"kind":"Name","value":"mine"}}]}}]} as unknown as DocumentNode<SnapshotDetailsFragmentFragment, unknown>;
+export const LanguageQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LanguageQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"me"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"language"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}]}]}}]}}]} as unknown as DocumentNode<LanguageQueryQuery, LanguageQueryQueryVariables>;
+export const SetLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"language"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"language"},"value":{"kind":"Variable","name":{"kind":"Name","value":"language"}}}],"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"language"}}]}}]}}]} as unknown as DocumentNode<SetLanguageMutation, SetLanguageMutationVariables>;
+export const ReadOnlyQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ReadOnlyQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"me"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readOnly"}},{"kind":"Field","name":{"kind":"Name","value":"selectedClass"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readOnly"}}]}}]}}]}}]} as unknown as DocumentNode<ReadOnlyQueryQuery, ReadOnlyQueryQueryVariables>;
+export const ModuleFilterQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModuleFilterQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"moduleLevels"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModuleLevelFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"moduleCategories"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"me"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"language"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}]}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModuleLevelFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleLevelNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}}]} as unknown as DocumentNode<ModuleFilterQueryQuery, ModuleFilterQueryQueryVariables>;
+export const UpdateLastModuleLevelMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateLastModuleLevelMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateLastModuleLevelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateLastModuleLevel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"clientMutationId"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"lastModuleLevel"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModuleLevelFragment"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModuleLevelFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleLevelNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}}]} as unknown as DocumentNode<UpdateLastModuleLevelMutationMutation, UpdateLastModuleLevelMutationMutationVariables>;
+export const ModuleTitleQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModuleTitleQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"module"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}}]} as unknown as DocumentNode<ModuleTitleQueryQuery, ModuleTitleQueryQueryVariables>;
+export const ModuleEditModeQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModuleEditModeQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"module"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"inEditMode"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}]},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]} as unknown as DocumentNode<ModuleEditModeQueryQuery, ModuleEditModeQueryQueryVariables>;
+export const UpdateInstrumentBookmarkDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateInstrumentBookmark"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateInstrumentBookmarkInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateInstrumentBookmark"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}}]}}]} as unknown as DocumentNode<UpdateInstrumentBookmarkMutation, UpdateInstrumentBookmarkMutationVariables>;
+export const UpdateContentBookmarkDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateContentBookmark"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateContentBookmarkInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateContentBookmark"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}}]}}]} as unknown as DocumentNode<UpdateContentBookmarkMutation, UpdateContentBookmarkMutationVariables>;
+export const ChapterQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ChapterQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chapter"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}}]}}]}}]} as unknown as DocumentNode<ChapterQueryQuery, ChapterQueryQueryVariables>;
+export const ContentBlockQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ContentBlockQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}}]}}]}}]} as unknown as DocumentNode<ContentBlockQueryQuery, ContentBlockQueryQueryVariables>;
+export const MeLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MeLanguage"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"me"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"language"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}]}]}}]}}]} as unknown as DocumentNode<MeLanguageQuery, MeLanguageQueryVariables>;
+export const ModuleSnapshotsQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModuleSnapshotsQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"module"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"metaTitle"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"topic"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}}]}},{"kind":"Field","name":{"kind":"Name","value":"snapshots"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SnapshotDetailsFragment"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SnapshotDetailsFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SnapshotNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"shared"}},{"kind":"Field","name":{"kind":"Name","value":"created"}},{"kind":"Field","name":{"kind":"Name","value":"creator"}},{"kind":"Field","name":{"kind":"Name","value":"mine"}}]}}]} as unknown as DocumentNode<ModuleSnapshotsQueryQuery, ModuleSnapshotsQueryQueryVariables>;
+export const ModuleSolutionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModuleSolutions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"module"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"solutionsEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]} as unknown as DocumentNode<ModuleSolutionsQuery, ModuleSolutionsQueryVariables>;
\ No newline at end of file
diff --git a/client/src/components/content-blocks/ContentComponent.vue b/client/src/components/content-blocks/ContentComponent.vue
index 6f3d9bcf..f36ea3db 100644
--- a/client/src/components/content-blocks/ContentComponent.vue
+++ b/client/src/components/content-blocks/ContentComponent.vue
@@ -12,143 +12,223 @@
       v-if="showBookmarkActions"
       @add-note="addNote(component.id)"
       @edit-note="editNote"
-      @bookmark="bookmarkContent(component.id, !bookmarked)"
-    />
-    <component
-      v-bind="component"
-      :parent="parent"
-      :is="component.type"
+      @bookmark="bookmarkContent(!bookmarked)"
     />
+    <component v-bind="component" :parent="parent" :is="componentType" />
   </div>
 </template>
 
-<script>
-import { constructContentComponentBookmarkMutation } from '@/helpers/update-content-bookmark-mutation';
-import { defineAsyncComponent } from 'vue';
+<script setup lang="ts">
+import { defineAsyncComponent, ref, computed, onMounted } from "vue";
+import { useStore } from "vuex";
+import { constructContentComponentBookmarkMutation } from "@/helpers/update-content-bookmark-mutation";
+import { useMutation } from "@vue/apollo-composable";
 
-const TextBlock = defineAsyncComponent(() => import('@/components/content-blocks/TextBlock.vue'));
-const InstrumentWidget = defineAsyncComponent(() => import('@/components/content-blocks/InstrumentWidget.vue'));
-const ImageBlock = defineAsyncComponent(() => import('@/components/content-blocks/ImageBlock.vue'));
-const ImageUrlBlock = defineAsyncComponent(() => import('@/components/content-blocks/ImageUrlBlock.vue'));
-const VideoBlock = defineAsyncComponent(() => import('@/components/content-blocks/VideoBlock.vue'));
-const LinkBlock = defineAsyncComponent(() => import('@/components/content-blocks/LinkBlock.vue'));
-const DocumentBlock = defineAsyncComponent(() => import('@/components/content-blocks/DocumentBlock.vue'));
-const CmsDocumentBlock = defineAsyncComponent(() => import('@/components/content-blocks/CmsDocumentBlock.vue'));
-const InfogramBlock = defineAsyncComponent(() => import('@/components/content-blocks/InfogramBlock.vue'));
-const ThinglinkBlock = defineAsyncComponent(() => import('@/components/content-blocks/ThinglinkBlock.vue'));
-const GeniallyBlock = defineAsyncComponent(() => import('@/components/content-blocks/GeniallyBlock.vue'));
-const SubtitleBlock = defineAsyncComponent(() => import('@/components/content-blocks/SubtitleBlock.vue'));
-const SectionTitleBlock = defineAsyncComponent(() => import('@/components/content-blocks/SectionTitleBlock.vue'));
-const ContentListBlock = defineAsyncComponent(() => import('@/components/content-blocks/ContentListBlock.vue'));
-const ModuleRoomSlug = defineAsyncComponent(() => import('@/components/content-blocks/ModuleRoomSlug.vue'));
-const Assignment = defineAsyncComponent(() => import('@/components/content-blocks/assignment/Assignment.vue'));
-const Survey = defineAsyncComponent(() => import('@/components/content-blocks/SurveyBlock.vue'));
-const Solution = defineAsyncComponent(() => import('@/components/content-blocks/Solution.vue'));
-const Instruction = defineAsyncComponent(() => import('@/components/content-blocks/Instruction.vue'));
-const BookmarkActions = defineAsyncComponent(() => import('@/components/notes/BookmarkActions.vue'));
+export interface Props {
+  component: any;
+  parent: any;
+  bookmarks: any[];
+  notes: any[];
+  root: string;
+  editMode: boolean;
+}
+const TextBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/TextBlock.vue")
+);
+const InstrumentWidget = defineAsyncComponent(
+  () => import("@/components/content-blocks/InstrumentWidget.vue")
+);
+const ImageBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/ImageBlock.vue")
+);
+const ImageUrlBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/ImageUrlBlock.vue")
+);
+const VideoBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/VideoBlock.vue")
+);
+const LinkBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/LinkBlock.vue")
+);
+const DocumentBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/DocumentBlock.vue")
+);
+const CmsDocumentBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/CmsDocumentBlock.vue")
+);
+const InfogramBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/InfogramBlock.vue")
+);
+const ThinglinkBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/ThinglinkBlock.vue")
+);
+const GeniallyBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/GeniallyBlock.vue")
+);
+const SubtitleBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/SubtitleBlock.vue")
+);
+const SectionTitleBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/SectionTitleBlock.vue")
+);
+const ContentListBlock = defineAsyncComponent(
+  () => import("@/components/content-blocks/ContentListBlock.vue")
+);
+const ModuleRoomSlug = defineAsyncComponent(
+  () => import("@/components/content-blocks/ModuleRoomSlug.vue")
+);
+const Assignment = defineAsyncComponent(
+  () => import("@/components/content-blocks/assignment/Assignment.vue")
+);
+const Survey = defineAsyncComponent(
+  () => import("@/components/content-blocks/SurveyBlock.vue")
+);
+const Solution = defineAsyncComponent(
+  () => import("@/components/content-blocks/Solution.vue")
+);
+const Instruction = defineAsyncComponent(
+  () => import("@/components/content-blocks/Instruction.vue")
+);
+const BookmarkActions = defineAsyncComponent(
+  () => import("@/components/notes/BookmarkActions.vue")
+);
 
-export default {
-  props: {
-    component: {
-      type: Object,
-      default: () => ({}),
-    },
-    parent: {
-      type: Object,
-      default: () => ({}),
-    },
-    bookmarks: {
-      type: Array,
-      default: () => [],
-    },
-    notes: {
-      type: Array,
-      default: () => [],
-    },
-    root: {
-      type: String,
-      default: '',
-    },
-    editMode: {
-      type: Boolean,
-      default: false,
-    },
-  },
+type ContentComponentType =
+  | typeof TextBlock
+  | typeof InstrumentWidget
+  | typeof InstrumentWidget
+  | typeof ImageBlock
+  | typeof ImageUrlBlock
+  | typeof VideoBlock
+  | typeof LinkBlock
+  | typeof DocumentBlock
+  | typeof InfogramBlock
+  | typeof GeniallyBlock
+  | typeof SubtitleBlock
+  | typeof SectionTitleBlock
+  | typeof ContentListBlock
+  | typeof ModuleRoomSlug
+  | typeof ThinglinkBlock
+  | typeof CmsDocumentBlock
+  | typeof Survey
+  | typeof Solution
+  | typeof Instruction
+  | typeof Assignment;
 
-  components: {
-    text_block: TextBlock,
-    basic_knowledge: InstrumentWidget, // for legacy
-    instrument: InstrumentWidget,
-    image_block: ImageBlock,
-    image_url_block: ImageUrlBlock,
-    video_block: VideoBlock,
-    link_block: LinkBlock,
-    document_block: DocumentBlock,
-    infogram_block: InfogramBlock,
-    genially_block: GeniallyBlock,
-    subtitle: SubtitleBlock,
-    section_title: SectionTitleBlock,
-    content_list: ContentListBlock,
-    module_room_slug: ModuleRoomSlug,
-    thinglink_block: ThinglinkBlock,
-    cms_document_block: CmsDocumentBlock,
-    Survey,
-    Solution,
-    Instruction,
-    Assignment,
-    BookmarkActions,
-  },
+const props = withDefaults(defineProps<Props>(), {
+  component: () => ({}),
+  parent: () => ({}),
+  bookmarks: () => [],
+  notes: () => [],
+  root: "",
+  editMode: false,
+});
 
-  computed: {
-    bookmarked() {
-      return this.bookmarks && !!this.bookmarks.find((bookmark) => bookmark.uuid === this.component.id);
-    },
-    note() {
-      const bookmark = this.bookmarks && this.bookmarks.find((bookmark) => bookmark.uuid === this.component.id);
-      return bookmark && bookmark.note;
-    },
-    showBookmarkActions() {
-      return this.component.type !== 'content_list' && this.component.type !== 'basic_knowledge' && !this.editMode;
-    },
-    componentClass() {
-      let classes = ['content-component', `content-component--${this.component.type}`];
-      if (this.bookmarked) {
-        classes.push('content-component--bookmarked');
-      }
-      return classes;
-    },
-  },
+const store = useStore();
 
-  methods: {
-    addNote(id) {
-      const type = Object.prototype.hasOwnProperty.call(this.parent, '__typename')
-        ? this.parent.__typename
-        : 'ContentBlockNode';
+const components: Record<string, ContentComponentType> = {
+  text_block: TextBlock,
+  basic_knowledge: InstrumentWidget, // for legacy
+  instrument: InstrumentWidget,
+  image_block: ImageBlock,
+  image_url_block: ImageUrlBlock,
+  video_block: VideoBlock,
+  link_block: LinkBlock,
+  document_block: DocumentBlock,
+  infogram_block: InfogramBlock,
+  genially_block: GeniallyBlock,
+  subtitle: SubtitleBlock,
+  section_title: SectionTitleBlock,
+  content_list: ContentListBlock,
+  module_room_slug: ModuleRoomSlug,
+  thinglink_block: ThinglinkBlock,
+  cms_document_block: CmsDocumentBlock,
+  survey: Survey,
+  solution: Solution,
+  instruction: Instruction,
+  assignment: Assignment,
+};
 
-      this.$store.dispatch('addNote', {
-        content: id,
-        type,
-        block: this.root,
-      });
+const componentType = computed(() => {
+  return components[props.component.type] || "";
+});
+
+const bookmarked = computed(
+  () =>
+    props.bookmarks &&
+    !!props.bookmarks.find((bookmark) => bookmark.uuid === props.component.id)
+);
+const note = computed(() => {
+  const bookmark =
+    props.bookmarks &&
+    props.bookmarks.find((bookmark) => bookmark.uuid === props.component.id);
+  return bookmark && bookmark.note;
+});
+const showBookmarkActions = computed(
+  () =>
+    props.component.type !== "content_list" &&
+    props.component.type !== "basic_knowledge" &&
+    !props.editMode
+);
+const componentClass = computed(() => {
+  let classes = [
+    "content-component",
+    `content-component--${props.component.type}`,
+  ];
+  if (bookmarked.value) {
+    classes.push("content-component--bookmarked");
+  }
+  return classes;
+});
+
+const addNote = (id: string) => {
+  const type = Object.prototype.hasOwnProperty.call(props.parent, "__typename")
+    ? props.parent.__typename
+    : "ContentBlockNode";
+
+  store.dispatch("addNote", {
+    content: id,
+    type,
+    block: props.root,
+  });
+};
+
+const editNote = () => {
+  store.dispatch("editNote", note);
+};
+
+const { mutation, variables, update, optimisticResponse } =
+  constructContentComponentBookmarkMutation(
+    props.component.id,
+    bookmarked.value,
+    props.parent,
+    props.root
+  );
+const { mutate: mutateBookmarkContent } = useMutation(mutation, {
+  update,
+  optimisticResponse,
+});
+
+const bookmarkContent = (bookmarked: boolean) => {
+  const newVars = {
+    input: {
+      ...variables.input,
+      bookmarked,
     },
-    editNote() {
-      this.$store.dispatch('editNote', this.note);
-    },
-    bookmarkContent(uuid, bookmarked) {
-      this.$apollo.mutate(constructContentComponentBookmarkMutation(uuid, bookmarked, this.parent, this.root));
-    },
-  },
+  };
+  console.log(newVars);
+  mutateBookmarkContent(newVars);
 };
 </script>
 
 <style lang="scss" scoped>
-@import 'styles/helpers';
+@import "styles/helpers";
 
 .content-component {
   position: relative;
 
-  &--bookmarked {
-  }
+  // &--bookmarked {
+  // }
 
   &--subtitle {
     margin-top: 2 * $medium-spacing;
diff --git a/client/src/graphql/gql/mutations/updateContentBookmark.gql b/client/src/graphql/gql/mutations/updateContentBookmark.gql
deleted file mode 100644
index 4dd42b9c..00000000
--- a/client/src/graphql/gql/mutations/updateContentBookmark.gql
+++ /dev/null
@@ -1,5 +0,0 @@
-mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {
-  updateContentBookmark(input: $input) {
-    success
-  }
-}
diff --git a/client/src/graphql/gql/mutations/updateInstrumentBookmark.gql b/client/src/graphql/gql/mutations/updateInstrumentBookmark.gql
deleted file mode 100644
index 17679013..00000000
--- a/client/src/graphql/gql/mutations/updateInstrumentBookmark.gql
+++ /dev/null
@@ -1,5 +0,0 @@
-mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {
-  updateInstrumentBookmark(input: $input) {
-    success
-  }
-}
diff --git a/client/src/helpers/update-content-bookmark-mutation.js b/client/src/helpers/update-content-bookmark-mutation.ts
similarity index 72%
rename from client/src/helpers/update-content-bookmark-mutation.js
rename to client/src/helpers/update-content-bookmark-mutation.ts
index a7576fbf..3bbb2b62 100644
--- a/client/src/helpers/update-content-bookmark-mutation.js
+++ b/client/src/helpers/update-content-bookmark-mutation.ts
@@ -1,17 +1,34 @@
-import UPDATE_CONTENT_BOOKMARK from '@/graphql/gql/mutations/updateContentBookmark.gql';
-import UPDATE_INSTRUMENT_BOOKMARK from '@/graphql/gql/mutations/updateInstrumentBookmark.gql';
 import CONTENT_BLOCK_QUERY from '@/graphql/gql/queries/contentBlockQuery.gql';
 import INSTRUMENT_FRAGMENT from '@/graphql/gql/fragments/instrumentParts.gql';
 import { pushToArray, removeAtIndex } from '@/graphql/immutable-operations';
+import { graphql } from '@/__generated__';
 
-const compareUuid = (uuid) => (element) => element.uuid === uuid;
+const compareUuid = (uuid: string) => (element) => element.uuid === uuid;
 
-export const constructContentComponentBookmarkMutation = (uuid, bookmarked, parent, root) => {
-  let mutation = {};
+interface Mutation {
+  mutation: any;
+  variables: any;
+  update: (store: any) => void;
+  optimisticResponse: any;
+}
+
+export const constructContentComponentBookmarkMutation: (
+  uuid: string,
+  bookmarked: boolean,
+  parent: any,
+  root: any
+) => Mutation = (uuid, bookmarked, parent, root) => {
+  let mutation: Mutation;
 
   if (parent.__typename === 'InstrumentNode') {
     mutation = {
-      mutation: UPDATE_INSTRUMENT_BOOKMARK,
+      mutation: graphql(`
+        mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {
+          updateInstrumentBookmark(input: $input) {
+            success
+          }
+        }
+      `),
       variables: {
         input: {
           uuid,
@@ -30,7 +47,7 @@ export const constructContentComponentBookmarkMutation = (uuid, bookmarked, pare
           id,
         });
 
-        let bookmarks;
+        let bookmarks: any[];
 
         if (bookmarked) {
           const element = {
@@ -40,7 +57,7 @@ export const constructContentComponentBookmarkMutation = (uuid, bookmarked, pare
           };
           bookmarks = pushToArray(instrument.bookmarks, element);
         } else {
-          let index = instrument.bookmarks.findIndex(compareUuid(uuid));
+          const index = instrument.bookmarks.findIndex(compareUuid(uuid));
           if (index > -1) {
             bookmarks = removeAtIndex(instrument.bookmarks, index);
           } else {
@@ -69,7 +86,13 @@ export const constructContentComponentBookmarkMutation = (uuid, bookmarked, pare
     };
   } else {
     mutation = {
-      mutation: UPDATE_CONTENT_BOOKMARK,
+      mutation: graphql(`
+        mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {
+          updateContentBookmark(input: $input) {
+            success
+          }
+        }
+      `),
       variables: {
         input: {
           uuid,
@@ -86,17 +109,17 @@ export const constructContentComponentBookmarkMutation = (uuid, bookmarked, pare
         });
 
         // const bookmarks = data.contentBlock.bookmarks;
-        let bookmarks;
+        let bookmarks: any[];
 
         if (bookmarked) {
-          let element = {
+          const element = {
             note: null,
             uuid,
             __typename: 'ContentBlockBookmarkNode',
           };
           bookmarks = pushToArray(contentBlock.bookmarks, element);
         } else {
-          let index = contentBlock.bookmarks.findIndex(compareUuid(uuid));
+          const index = contentBlock.bookmarks.findIndex(compareUuid(uuid));
           if (index > -1) {
             bookmarks = removeAtIndex(contentBlock.bookmarks, index);
           } else {