diff --git a/src/__generated__/globalTypes.ts b/src/__generated__/globalTypes.ts
index 0a7913e..8c2d157 100644
--- a/src/__generated__/globalTypes.ts
+++ b/src/__generated__/globalTypes.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 //==============================================================
diff --git a/src/components/ContentEditor/__generated__/updateSelectedComponent.ts b/src/components/ContentEditor/__generated__/updateSelectedComponent.ts
index b580f80..7e4803c 100644
--- a/src/components/ContentEditor/__generated__/updateSelectedComponent.ts
+++ b/src/components/ContentEditor/__generated__/updateSelectedComponent.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { api_component_set_input } from "./../../../__generated__/globalTypes";
diff --git a/src/components/ContentEditor/components/Dialog/__generated__/getDataOfDialog.ts b/src/components/ContentEditor/components/Dialog/__generated__/getDataOfDialog.ts
index 61a64f7..10a1300 100644
--- a/src/components/ContentEditor/components/Dialog/__generated__/getDataOfDialog.ts
+++ b/src/components/ContentEditor/components/Dialog/__generated__/getDataOfDialog.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/components/VoggiChapterCard.tsx b/src/components/VoggiChapterCard.tsx
index e23280c..6d24fd3 100644
--- a/src/components/VoggiChapterCard.tsx
+++ b/src/components/VoggiChapterCard.tsx
@@ -9,10 +9,10 @@ import CardContent from "@material-ui/core/CardContent";
 import CardActionArea from "@material-ui/core/CardActionArea";
 
 import { styles } from "styles";
-import { chapters_wordGroups_chapters_edges_node } from "../queries/__generated__/chapters_wordGroups";
+import { chapters_wordGroups_chapters } from "../queries/__generated__/chapters_wordGroups";
 
 interface Props extends WithStyles<typeof styles> {
-  chapter: chapters_wordGroups_chapters_edges_node;
+  chapter: chapters_wordGroups_chapters;
 }
 
 const VoggiChapterCard = ({ classes, chapter }: Props) => {
@@ -35,7 +35,7 @@ const VoggiChapterCard = ({ classes, chapter }: Props) => {
           </Typography>
           <Typography variant="h5" component="h2">
             {t("chapter:nWordGroups")}{" "}
-            {chapter.wordGroups ? chapter.wordGroups.edges.length : 0}
+            {chapter.wordgroups ? chapter.wordgroups.length : 0}
           </Typography>
         </CardContent>
       </CardActionArea>
diff --git a/src/components/WordCard.tsx b/src/components/WordCard.tsx
index 33cf1eb..e509744 100644
--- a/src/components/WordCard.tsx
+++ b/src/components/WordCard.tsx
@@ -9,13 +9,15 @@ import CardActionArea from "@material-ui/core/CardActionArea";
 
 import { styles } from "styles";
 import { subscribeWordGroupById_wordGroup_words_word } from "queries/__generated__/subscribeWordGroupById";
+import {useTranslation} from "react-i18next";
 
 interface Props extends WithStyles<typeof styles> {
   word: subscribeWordGroupById_wordGroup_words_word;
-  id: string;
+  wordGroupId: string;
 }
 
-const WordCard = ({ classes, word, id }: Props) => {
+const WordCard = ({ classes, word, wordGroupId }: Props) => {
+  const { t } = useTranslation();
   // Note: MUI links together with react-router-dom and Typescript are a bit tricky due to their dynamic nature
   // See the discussion and provided solutions here... https://github.com/mui-org/material-ui/issues/7877
   // <Button component={Link} {...{ to: "/about" } as any} />
@@ -23,7 +25,7 @@ const WordCard = ({ classes, word, id }: Props) => {
     <Card>
       <CardActionArea
         component={RouterLink}
-        {...{ to: `/wordgroups/${id}/edit` } as any}
+        {...{ to: `${wordGroupId}/word/${word.id}` } as any}
       >
         <CardContent>
           <Typography
@@ -31,12 +33,12 @@ const WordCard = ({ classes, word, id }: Props) => {
             color="textSecondary"
             gutterBottom
           >
-            {word.translations.map(t => (
-              <>
+            {word.translations.length ? word.translations.map(t => (
+              <React.Fragment key={t.id}>
                 {t.text}
                 <br />
-              </>
-            ))}
+              </React.Fragment>
+            )): t("words:emptyWord") }
           </Typography>
         </CardContent>
       </CardActionArea>
diff --git a/src/pages/Dashboard/VoggiSection.tsx b/src/pages/Dashboard/VoggiSection.tsx
index 6609844..80e4ef7 100644
--- a/src/pages/Dashboard/VoggiSection.tsx
+++ b/src/pages/Dashboard/VoggiSection.tsx
@@ -18,20 +18,6 @@ const VoggiSection: React.FunctionComponent<Props> = ({ classes }) => {
     GET_WORDGROUPS
   );
 
-  if (loading || error || (data && data.wordGroups.length))
-    return (
-      <BusyOrErrorCard
-        loading={loading}
-        error={error}
-        noResults={
-          !loading &&
-          data &&
-          data.wordGroups &&
-          data.wordGroups &&
-          !data.wordGroups.length
-        }
-      />
-    );
   return (
     <SectionCardContainer>
       {data &&
diff --git a/src/pages/WordGroup/ChapterWordGroups.tsx b/src/pages/WordGroup/ChapterWordGroups.tsx
index b0dcc3f..ef3ecc9 100644
--- a/src/pages/WordGroup/ChapterWordGroups.tsx
+++ b/src/pages/WordGroup/ChapterWordGroups.tsx
@@ -2,8 +2,7 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 
 import { withStyles, WithStyles } from "@material-ui/core/styles";
-import { useQuery } from "@apollo/react-hooks";
-import { RouteComponentProps } from "react-router-dom";
+import { useSubscription } from "@apollo/react-hooks";import { RouteComponentProps } from "react-router-dom";
 import Grid from "@material-ui/core/Grid";
 import AddIcon from "@material-ui/icons/Add";
 
@@ -11,10 +10,14 @@ import { styles } from "styles";
 import BusyOrErrorCard from "components/BusyOrErrorCard";
 import SectionCardContainer from "../../components/SectionCardContainer";
 import Section from "../../components/Section";
-import { convertGlobalToDbId } from "../../helpers";
+import {GET_CHAPTER_WORDGROUPS_BY_CHAPTER_ID} from "../../queries/chapters";
+import {
+  subscribeChaptersWordGroupsByChapterId,
+  subscribeChaptersWordGroupsByChapterId_chapters_wordgroups
+} from "../../queries/__generated__/subscribeChaptersWordGroupsByChapterId";
+import WordGroupCard from "../../components/WordGroupCard";
 
 import LinkCard from "../../components/LinkCard";
-import { GET_CHAPTER_BY_ID } from "queries/chapters";
 
 interface WordGroupRouterProps {
   id: string;
@@ -27,44 +30,44 @@ interface Props
 const ChapterWordGroups = ({ classes, match }: Props) => {
   const { t } = useTranslation();
 
-  const { data, error, loading } = useQuery(GET_CHAPTER_BY_ID, {
+  const {data, error, loading} = useSubscription<subscribeChaptersWordGroupsByChapterId>(GET_CHAPTER_WORDGROUPS_BY_CHAPTER_ID, {
     variables: {
-      id: convertGlobalToDbId(match.params.id)
+      id: match.params.id
     },
-    skip: match.params.id === "new"
+    // skip: match.params.id === "new"
   });
 
   // Note: MUI links together with react-router-dom and Typescript are a bit tricky due to their dynamic nature
   // See the discussion and provided solutions here... https://github.com/mui-org/material-ui/issues/7877
   // <Button component={Link} {...{ to: "/about" } as any} />
   let chapter_name =
-    data && data.chapter
-      ? `${data.chapter.titleDE} / ${data.chapter.titleCH}`
-      : "";
-  return (
-    <Section title={t("wordGroups:wordGroupsChapter") + ` ${chapter_name}`}>
-      <SectionCardContainer>
-        <BusyOrErrorCard
-          loading={loading}
-          error={error}
-          noResults={
-            !loading &&
-            data &&
-            !!data.chapter &&
-            !!data.chapter.wordGroups &&
-            !data.chapter.wordGroups.edges.length
-          }
+    data && data.chapters && data.chapters.languages && data.chapters.languages.length ?
+      data.chapters.languages.map((language) => language.title) : "";
+  return <Section title={t("wordGroups:wordGroupsChapter") + ` ${chapter_name}`}>
+    <SectionCardContainer>
+      <BusyOrErrorCard
+        loading={loading}
+        error={error}
+        noResults={!loading && data && !!data.chapters && !!data.chapters.wordgroups && !data.chapters.wordgroups.length}
+      />
+      {data &&
+      data.chapters &&
+      data.chapters.wordgroups &&
+      data.chapters.wordgroups.map((w: subscribeChaptersWordGroupsByChapterId_chapters_wordgroups | null) => (
+        w ?
+          <Grid item key={w.id}>
+            <WordGroupCard wordGroup={w}/>
+          </Grid> : null
+      ))}
+      <Grid item>
+        <LinkCard
+          path={`/wordgroups/new`}
+          icon={<AddIcon/>}
+          helperText="wordGroups:createNewWordGroup"
         />
-        <Grid item>
-          <LinkCard
-            path={`/wordgroups/new`}
-            icon={<AddIcon />}
-            helperText="wordGroups:createNewWordGroup"
-          />
-        </Grid>
-      </SectionCardContainer>
-    </Section>
-  );
+      </Grid>
+    </SectionCardContainer>
+  </Section>;
 };
 
 export default withStyles(styles, { withTheme: true })(ChapterWordGroups);
diff --git a/src/pages/WordGroup/WordGroup.tsx b/src/pages/WordGroup/WordGroup.tsx
index e3de303..ac0bc16 100644
--- a/src/pages/WordGroup/WordGroup.tsx
+++ b/src/pages/WordGroup/WordGroup.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 
 import { withStyles, WithStyles } from "@material-ui/core/styles";
-import { useQuery } from "@apollo/react-hooks";
+import { useSubscription } from "@apollo/react-hooks";
 import { RouteComponentProps } from "react-router-dom";
 import AddIcon from "@material-ui/icons/Add";
 
@@ -9,7 +9,6 @@ import { styles } from "styles";
 import NewWordGroup from "./WordGroupEditor";
 import { GET_WORDGROUP_BY_ID } from "queries/wordgroups";
 import BusyOrErrorCard from "components/BusyOrErrorCard";
-import { convertGlobalToDbId } from "../../helpers";
 import { useTranslation } from "react-i18next";
 import Section from "../../components/Section";
 import SectionCardContainer from "../../components/SectionCardContainer";
@@ -17,6 +16,22 @@ import { Grid } from "@material-ui/core";
 import WordCard from "../../components/WordCard";
 import LinkCard from "../../components/LinkCard";
 import { subscribeWordGroupById } from "queries/__generated__/subscribeWordGroupById";
+import * as Yup from "yup";
+import i18next from "../../i18n";
+
+export const WordGroupSchema = Yup.object().shape({
+  titleDe: Yup.string()
+    .min(2, i18next.t("tooShort"))
+    .max(100, i18next.t("tooLong"))
+    .required(i18next.t("required")),
+  titleCh: Yup.string()
+    .min(2, i18next.t("tooShort"))
+    .max(100, i18next.t("tooLong"))
+    .required(i18next.t("required")),
+  chapter: Yup.number()
+    .min(1, i18next.t("chapterNumberTooLow"))
+    .max(100, i18next.t("chapterNumberTooHigh"))
+});
 
 // These can come from the router... See the route definitions
 interface WordGroupRouterProps {
@@ -30,13 +45,13 @@ interface Props
 const WordGroup = ({ classes, match }: Props) => {
   const { t } = useTranslation();
 
-  const { loading, data, error } = useQuery<subscribeWordGroupById>(
+  const { loading, data, error } = useSubscription<subscribeWordGroupById>(
     GET_WORDGROUP_BY_ID,
     {
       variables: {
-        id: convertGlobalToDbId(match.params.id)
+        id: match.params.id
       },
-      skip: match.params.id === "new"
+      // skip: match.params.id === "new"
     }
   );
 
@@ -47,7 +62,7 @@ const WordGroup = ({ classes, match }: Props) => {
   let title_name = ``;
 
   return (
-    <Section title={t("wordGroups:wordGroup") + ` ${title_name}`}>
+    <Section title={t("words:wordGroup") + ` ${title_name}`}>
       <SectionCardContainer>
         <BusyOrErrorCard
           loading={loading}
@@ -66,13 +81,13 @@ const WordGroup = ({ classes, match }: Props) => {
           data.wordGroup.words.map(w =>
             w ? (
               <Grid item key={w.id}>
-                <WordCard word={w.word} id={match.params.id} />
+                <WordCard word={w.word} wordGroupId={match.params.id} />
               </Grid>
             ) : null
           )}
         <Grid item>
           <LinkCard
-            path={`/wordgroups/${match.params.id}/edit`}
+            path={`/wordgroups/${match.params.id}/word/new`}
             icon={<AddIcon />}
             helperText="wordGroups:addWordToWordGroup"
           />
diff --git a/src/pages/WordGroup/WordGroups.tsx b/src/pages/WordGroup/WordGroups.tsx
index 4f6973c..3216572 100644
--- a/src/pages/WordGroup/WordGroups.tsx
+++ b/src/pages/WordGroup/WordGroups.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { useQuery } from "@apollo/react-hooks";
+import { useSubscription } from "@apollo/react-hooks";
 
 import { withStyles, WithStyles } from "@material-ui/core/styles";
 import Grid from "@material-ui/core/Grid";
@@ -11,7 +11,7 @@ import Section from "../../components/Section";
 import { GET_CHAPTER_WORDGROUPS } from "../../queries/chapters";
 import {
   chapters_wordGroups,
-  chapters_wordGroups_chapters_edges
+  chapters_wordGroups_chapters
 } from "../../queries/__generated__/chapters_wordGroups";
 import VoggiChapterCard from "../../components/VoggiChapterCard";
 
@@ -20,7 +20,7 @@ interface Props extends WithStyles<typeof styles> {
 }
 
 const WordGroups = ({ classes }: Props) => {
-  const { data, error, loading } = useQuery<chapters_wordGroups>(
+  const { data, error, loading } = useSubscription<chapters_wordGroups>(
     GET_CHAPTER_WORDGROUPS
   );
 
@@ -37,18 +37,16 @@ const WordGroups = ({ classes }: Props) => {
             !loading &&
             data &&
             !!data.chapters &&
-            data.chapters.edges &&
-            !data.chapters.edges.length
+            !data.chapters.length
           }
         />
         {data &&
           data.chapters &&
-          data.chapters.edges &&
-          data.chapters.edges.map(
-            (c: chapters_wordGroups_chapters_edges | null) =>
-              c && c.node && c.node.parentChapter ? (
-                <Grid item key={c.node.id}>
-                  <VoggiChapterCard chapter={c.node} />
+          data.chapters.map(
+            (c: chapters_wordGroups_chapters | null) =>
+              c && c.parentChapter ? (
+                <Grid item key={c.id}>
+                  <VoggiChapterCard chapter={c} />
                 </Grid>
               ) : null
           )}
diff --git a/src/queries/__generated__/ChapterHeaderParts.ts b/src/queries/__generated__/ChapterHeaderParts.ts
index 38b0e85..680b9eb 100644
--- a/src/queries/__generated__/ChapterHeaderParts.ts
+++ b/src/queries/__generated__/ChapterHeaderParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/CharacterParts.ts b/src/queries/__generated__/CharacterParts.ts
index 39209a8..4187d6d 100644
--- a/src/queries/__generated__/CharacterParts.ts
+++ b/src/queries/__generated__/CharacterParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/CommentParts.ts b/src/queries/__generated__/CommentParts.ts
index 4c2c499..db05722 100644
--- a/src/queries/__generated__/CommentParts.ts
+++ b/src/queries/__generated__/CommentParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/ComponentParts.ts b/src/queries/__generated__/ComponentParts.ts
index 9bc056c..df869f0 100644
--- a/src/queries/__generated__/ComponentParts.ts
+++ b/src/queries/__generated__/ComponentParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/ComponentTypeParts.ts b/src/queries/__generated__/ComponentTypeParts.ts
index 93896d8..6dd4512 100644
--- a/src/queries/__generated__/ComponentTypeParts.ts
+++ b/src/queries/__generated__/ComponentTypeParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/ProfileParts.ts b/src/queries/__generated__/ProfileParts.ts
index bb5b8f8..b1911d8 100644
--- a/src/queries/__generated__/ProfileParts.ts
+++ b/src/queries/__generated__/ProfileParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/UserParts.ts b/src/queries/__generated__/UserParts.ts
index 1eb3259..d68c36f 100644
--- a/src/queries/__generated__/UserParts.ts
+++ b/src/queries/__generated__/UserParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/WordParts.ts b/src/queries/__generated__/WordParts.ts
index faa40ea..d09f962 100644
--- a/src/queries/__generated__/WordParts.ts
+++ b/src/queries/__generated__/WordParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/WordgroupParts.ts b/src/queries/__generated__/WordgroupParts.ts
index 1db3883..cffb060 100644
--- a/src/queries/__generated__/WordgroupParts.ts
+++ b/src/queries/__generated__/WordgroupParts.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/chapters_wordGroups.ts b/src/queries/__generated__/chapters_wordGroups.ts
index 2a689d8..8538a77 100644
--- a/src/queries/__generated__/chapters_wordGroups.ts
+++ b/src/queries/__generated__/chapters_wordGroups.ts
@@ -1,70 +1,114 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
-// GraphQL query operation: chapters_wordGroups
+// GraphQL subscription operation: chapters_wordGroups
 // ====================================================
 
-export interface chapters_wordGroups_chapters_edges_node_parentChapter {
-  __typename: "ChapterType";
-  /**
-   * The ID of the object.
-   */
+export interface chapters_wordGroups_chapters_languages_language {
+  __typename: "api_language";
   id: string;
+  name: string;
 }
 
-export interface chapters_wordGroups_chapters_edges_node_wordGroups_edges_node {
-  __typename: "WordGroupType";
+export interface chapters_wordGroups_chapters_languages {
+  __typename: "api_chaptertitle";
+  id: any;
+  title: string;
   /**
-   * The ID of the object.
+   * An object relationship
    */
+  language: chapters_wordGroups_chapters_languages_language;
+}
+
+export interface chapters_wordGroups_chapters_parentChapter {
+  __typename: "api_chapter";
+  id: any;
+  number: number;
+  description: string;
+}
+
+export interface chapters_wordGroups_chapters_subChapters {
+  __typename: "api_chapter";
+  id: any;
+  description: string;
+}
+
+export interface chapters_wordGroups_chapters_wordgroups_words_word_translations_language {
+  __typename: "api_language";
   id: string;
+  name: string;
 }
 
-export interface chapters_wordGroups_chapters_edges_node_wordGroups_edges {
-  __typename: "WordGroupTypeEdge";
+export interface chapters_wordGroups_chapters_wordgroups_words_word_translations {
+  __typename: "api_wordtranslation";
+  id: any;
+  text: string;
+  audio: string | null;
+  exampleSentence: string | null;
   /**
-   * The item at the end of the edge
+   * An object relationship
    */
-  node: chapters_wordGroups_chapters_edges_node_wordGroups_edges_node | null;
+  language: chapters_wordGroups_chapters_wordgroups_words_word_translations_language;
 }
 
-export interface chapters_wordGroups_chapters_edges_node_wordGroups {
-  __typename: "WordGroupTypeConnection";
+export interface chapters_wordGroups_chapters_wordgroups_words_word {
+  __typename: "api_word";
+  id: any;
   /**
-   * Contains the nodes in this connection.
+   * An array relationship
    */
-  edges: (chapters_wordGroups_chapters_edges_node_wordGroups_edges | null)[];
+  translations: chapters_wordGroups_chapters_wordgroups_words_word_translations[];
 }
 
-export interface chapters_wordGroups_chapters_edges_node {
-  __typename: "ChapterType";
+export interface chapters_wordGroups_chapters_wordgroups_words {
+  __typename: "api_wordgroup_words";
+  id: number;
   /**
-   * The ID of the object.
+   * An object relationship
    */
-  id: string;
-  parentChapter: chapters_wordGroups_chapters_edges_node_parentChapter | null;
-  wordGroups: chapters_wordGroups_chapters_edges_node_wordGroups;
+  word: chapters_wordGroups_chapters_wordgroups_words_word;
 }
 
-export interface chapters_wordGroups_chapters_edges {
-  __typename: "ChapterTypeEdge";
+export interface chapters_wordGroups_chapters_wordgroups {
+  __typename: "api_wordgroup";
+  parentChapterId: any | null;
+  id: any;
   /**
-   * The item at the end of the edge
+   * An array relationship
    */
-  node: chapters_wordGroups_chapters_edges_node | null;
+  words: chapters_wordGroups_chapters_wordgroups_words[];
 }
 
 export interface chapters_wordGroups_chapters {
-  __typename: "ChapterTypeConnection";
+  __typename: "api_chapter";
+  id: any;
+  number: number;
+  description: string;
+  created: any;
+  updated: any;
   /**
-   * Contains the nodes in this connection.
+   * An array relationship
    */
-  edges: (chapters_wordGroups_chapters_edges | null)[];
+  languages: chapters_wordGroups_chapters_languages[];
+  /**
+   * An object relationship
+   */
+  parentChapter: chapters_wordGroups_chapters_parentChapter | null;
+  /**
+   * An array relationship
+   */
+  subChapters: chapters_wordGroups_chapters_subChapters[];
+  /**
+   * An array relationship
+   */
+  wordgroups: chapters_wordGroups_chapters_wordgroups[];
 }
 
 export interface chapters_wordGroups {
-  chapters: chapters_wordGroups_chapters | null;
+  /**
+   * fetch data from the table: "api_chapter"
+   */
+  chapters: chapters_wordGroups_chapters[];
 }
diff --git a/src/queries/__generated__/createComment.ts b/src/queries/__generated__/createComment.ts
index d2b18c6..3c5c81b 100644
--- a/src/queries/__generated__/createComment.ts
+++ b/src/queries/__generated__/createComment.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { api_comment_insert_input } from "./../../__generated__/globalTypes";
diff --git a/src/queries/__generated__/createComponent.ts b/src/queries/__generated__/createComponent.ts
index a51f55f..4626b5d 100644
--- a/src/queries/__generated__/createComponent.ts
+++ b/src/queries/__generated__/createComponent.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { api_component_insert_input } from "./../../__generated__/globalTypes";
diff --git a/src/queries/__generated__/deleteComment.ts b/src/queries/__generated__/deleteComment.ts
index 88954ec..e7749be 100644
--- a/src/queries/__generated__/deleteComment.ts
+++ b/src/queries/__generated__/deleteComment.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/deleteComponent.ts b/src/queries/__generated__/deleteComponent.ts
index dcee74d..85d3693 100644
--- a/src/queries/__generated__/deleteComponent.ts
+++ b/src/queries/__generated__/deleteComponent.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getAllCharacters.ts b/src/queries/__generated__/getAllCharacters.ts
index 863ab03..ea309ce 100644
--- a/src/queries/__generated__/getAllCharacters.ts
+++ b/src/queries/__generated__/getAllCharacters.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getAllComponentTypes.ts b/src/queries/__generated__/getAllComponentTypes.ts
index f7fe1b0..8c66e61 100644
--- a/src/queries/__generated__/getAllComponentTypes.ts
+++ b/src/queries/__generated__/getAllComponentTypes.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getChapters.ts b/src/queries/__generated__/getChapters.ts
index 8952184..7b8a852 100644
--- a/src/queries/__generated__/getChapters.ts
+++ b/src/queries/__generated__/getChapters.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getCharacterById.ts b/src/queries/__generated__/getCharacterById.ts
index 6ce36f1..ea59a87 100644
--- a/src/queries/__generated__/getCharacterById.ts
+++ b/src/queries/__generated__/getCharacterById.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getCharactersByIds.ts b/src/queries/__generated__/getCharactersByIds.ts
index a7ab2fc..90c230d 100644
--- a/src/queries/__generated__/getCharactersByIds.ts
+++ b/src/queries/__generated__/getCharactersByIds.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getComponentTypeById.ts b/src/queries/__generated__/getComponentTypeById.ts
index 12eeca8..3ef8ffe 100644
--- a/src/queries/__generated__/getComponentTypeById.ts
+++ b/src/queries/__generated__/getComponentTypeById.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getEnum.ts b/src/queries/__generated__/getEnum.ts
index c250c86..0b0f11d 100644
--- a/src/queries/__generated__/getEnum.ts
+++ b/src/queries/__generated__/getEnum.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getLanguages.ts b/src/queries/__generated__/getLanguages.ts
index 2c006dc..26ff389 100644
--- a/src/queries/__generated__/getLanguages.ts
+++ b/src/queries/__generated__/getLanguages.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getLocalEditorLanguage.ts b/src/queries/__generated__/getLocalEditorLanguage.ts
index e99f8ac..64fdd30 100644
--- a/src/queries/__generated__/getLocalEditorLanguage.ts
+++ b/src/queries/__generated__/getLocalEditorLanguage.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getLocalEditorRole.ts b/src/queries/__generated__/getLocalEditorRole.ts
index 9e44502..1b0ed94 100644
--- a/src/queries/__generated__/getLocalEditorRole.ts
+++ b/src/queries/__generated__/getLocalEditorRole.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getLocalSelectedComponent.ts b/src/queries/__generated__/getLocalSelectedComponent.ts
index e561bb6..a345a25 100644
--- a/src/queries/__generated__/getLocalSelectedComponent.ts
+++ b/src/queries/__generated__/getLocalSelectedComponent.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getProfile.ts b/src/queries/__generated__/getProfile.ts
index b8a4703..c08e996 100644
--- a/src/queries/__generated__/getProfile.ts
+++ b/src/queries/__generated__/getProfile.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/getSelectedComponent.ts b/src/queries/__generated__/getSelectedComponent.ts
index 989032f..68c0fc6 100644
--- a/src/queries/__generated__/getSelectedComponent.ts
+++ b/src/queries/__generated__/getSelectedComponent.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/profile.ts b/src/queries/__generated__/profile.ts
index 1da15b1..b4c27e4 100644
--- a/src/queries/__generated__/profile.ts
+++ b/src/queries/__generated__/profile.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/queryMediaURL.ts b/src/queries/__generated__/queryMediaURL.ts
new file mode 100644
index 0000000..722746e
--- /dev/null
+++ b/src/queries/__generated__/queryMediaURL.ts
@@ -0,0 +1,17 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: queryMediaURL
+// ====================================================
+
+export interface queryMediaURL_mediaUrl {
+  __typename: "MediaUrlType";
+  data: string | null;
+  url: string | null;
+}
+
+export interface queryMediaURL {
+  mediaUrl: queryMediaURL_mediaUrl | null;
+}
diff --git a/src/queries/__generated__/resolveComment.ts b/src/queries/__generated__/resolveComment.ts
index 0c70409..2360adf 100644
--- a/src/queries/__generated__/resolveComment.ts
+++ b/src/queries/__generated__/resolveComment.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/subscribeActiveComments.ts b/src/queries/__generated__/subscribeActiveComments.ts
index 507df5b..e5fb821 100644
--- a/src/queries/__generated__/subscribeActiveComments.ts
+++ b/src/queries/__generated__/subscribeActiveComments.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/subscribeAllComments.ts b/src/queries/__generated__/subscribeAllComments.ts
index 8d9baa7..022d265 100644
--- a/src/queries/__generated__/subscribeAllComments.ts
+++ b/src/queries/__generated__/subscribeAllComments.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/subscribeChapterById.ts b/src/queries/__generated__/subscribeChapterById.ts
index 39845de..bfccc97 100644
--- a/src/queries/__generated__/subscribeChapterById.ts
+++ b/src/queries/__generated__/subscribeChapterById.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/subscribeChaptersWordGroupsByChapterId.ts b/src/queries/__generated__/subscribeChaptersWordGroupsByChapterId.ts
new file mode 100644
index 0000000..378b023
--- /dev/null
+++ b/src/queries/__generated__/subscribeChaptersWordGroupsByChapterId.ts
@@ -0,0 +1,83 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL subscription operation: subscribeChaptersWordGroupsByChapterId
+// ====================================================
+
+export interface subscribeChaptersWordGroupsByChapterId_chapters_languages {
+  __typename: "api_chaptertitle";
+  title: string;
+}
+
+export interface subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words_word_translations_language {
+  __typename: "api_language";
+  id: string;
+  name: string;
+}
+
+export interface subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words_word_translations {
+  __typename: "api_wordtranslation";
+  id: any;
+  text: string;
+  audio: string | null;
+  exampleSentence: string | null;
+  /**
+   * An object relationship
+   */
+  language: subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words_word_translations_language;
+}
+
+export interface subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words_word {
+  __typename: "api_word";
+  id: any;
+  /**
+   * An array relationship
+   */
+  translations: subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words_word_translations[];
+}
+
+export interface subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words {
+  __typename: "api_wordgroup_words";
+  id: number;
+  /**
+   * An object relationship
+   */
+  word: subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words_word;
+}
+
+export interface subscribeChaptersWordGroupsByChapterId_chapters_wordgroups {
+  __typename: "api_wordgroup";
+  parentChapterId: any | null;
+  id: any;
+  /**
+   * An array relationship
+   */
+  words: subscribeChaptersWordGroupsByChapterId_chapters_wordgroups_words[];
+}
+
+export interface subscribeChaptersWordGroupsByChapterId_chapters {
+  __typename: "api_chapter";
+  id: any;
+  /**
+   * An array relationship
+   */
+  languages: subscribeChaptersWordGroupsByChapterId_chapters_languages[];
+  /**
+   * An array relationship
+   */
+  wordgroups: subscribeChaptersWordGroupsByChapterId_chapters_wordgroups[];
+  parentChapter: any | null;
+}
+
+export interface subscribeChaptersWordGroupsByChapterId {
+  /**
+   * fetch data from the table: "api_chapter" using primary key columns
+   */
+  chapters: subscribeChaptersWordGroupsByChapterId_chapters | null;
+}
+
+export interface subscribeChaptersWordGroupsByChapterIdVariables {
+  id: any;
+}
diff --git a/src/queries/__generated__/subscribeWordById.ts b/src/queries/__generated__/subscribeWordById.ts
new file mode 100644
index 0000000..505b1a3
--- /dev/null
+++ b/src/queries/__generated__/subscribeWordById.ts
@@ -0,0 +1,45 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL subscription operation: subscribeWordById
+// ====================================================
+
+export interface subscribeWordById_word_translations_language {
+  __typename: "api_language";
+  id: string;
+  name: string;
+}
+
+export interface subscribeWordById_word_translations {
+  __typename: "api_wordtranslation";
+  id: any;
+  text: string;
+  audio: string | null;
+  exampleSentence: string | null;
+  /**
+   * An object relationship
+   */
+  language: subscribeWordById_word_translations_language;
+}
+
+export interface subscribeWordById_word {
+  __typename: "api_word";
+  id: any;
+  /**
+   * An array relationship
+   */
+  translations: subscribeWordById_word_translations[];
+}
+
+export interface subscribeWordById {
+  /**
+   * fetch data from the table: "api_word" using primary key columns
+   */
+  word: subscribeWordById_word | null;
+}
+
+export interface subscribeWordByIdVariables {
+  id: any;
+}
diff --git a/src/queries/__generated__/subscribeWordGroupById.ts b/src/queries/__generated__/subscribeWordGroupById.ts
index f9f8b7c..c7a1ca6 100644
--- a/src/queries/__generated__/subscribeWordGroupById.ts
+++ b/src/queries/__generated__/subscribeWordGroupById.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/subscribeWordGroups.ts b/src/queries/__generated__/subscribeWordGroups.ts
index 21d0715..1e0d5c6 100644
--- a/src/queries/__generated__/subscribeWordGroups.ts
+++ b/src/queries/__generated__/subscribeWordGroups.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/updateComponent.ts b/src/queries/__generated__/updateComponent.ts
index ee2f2ed..962d370 100644
--- a/src/queries/__generated__/updateComponent.ts
+++ b/src/queries/__generated__/updateComponent.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { api_component_set_input, api_text_insert_input, api_text_update_column, api_translation_insert_input, api_translation_update_column, api_media_insert_input, api_media_update_column } from "./../../__generated__/globalTypes";
diff --git a/src/queries/__generated__/updateProfile.ts b/src/queries/__generated__/updateProfile.ts
index fc04650..0a8f238 100644
--- a/src/queries/__generated__/updateProfile.ts
+++ b/src/queries/__generated__/updateProfile.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { UpdateProfileInput } from "./../../__generated__/globalTypes";
diff --git a/src/queries/__generated__/update_profile.ts b/src/queries/__generated__/update_profile.ts
index 9caa83e..99ed1f7 100644
--- a/src/queries/__generated__/update_profile.ts
+++ b/src/queries/__generated__/update_profile.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 // ====================================================
diff --git a/src/queries/__generated__/upsertChapter.ts b/src/queries/__generated__/upsertChapter.ts
index eed7bd2..88296ca 100644
--- a/src/queries/__generated__/upsertChapter.ts
+++ b/src/queries/__generated__/upsertChapter.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { api_chapter_insert_input } from "./../../__generated__/globalTypes";
diff --git a/src/queries/__generated__/upsertWord.ts b/src/queries/__generated__/upsertWord.ts
index c56dae4..35e30d8 100644
--- a/src/queries/__generated__/upsertWord.ts
+++ b/src/queries/__generated__/upsertWord.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { api_wordtranslation_insert_input } from "./../../__generated__/globalTypes";
diff --git a/src/queries/__generated__/upsertWordGroup.ts b/src/queries/__generated__/upsertWordGroup.ts
index e1e39ee..0dd99d4 100644
--- a/src/queries/__generated__/upsertWordGroup.ts
+++ b/src/queries/__generated__/upsertWordGroup.ts
@@ -1,6 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-// @generated
 // This file was automatically generated and should not be edited.
 
 import { api_wordgroup_insert_input } from "./../../__generated__/globalTypes";
diff --git a/src/queries/chapters.ts b/src/queries/chapters.ts
index c77cd7a..71f56ec 100644
--- a/src/queries/chapters.ts
+++ b/src/queries/chapters.ts
@@ -28,6 +28,42 @@ export const CHAPTER_HEADER_PART = gql`
   }
 `;
 
+export const WORD_FRAGMENT = gql`
+  fragment WordParts on api_word {
+    id
+    translations {
+      id
+      text
+      audio
+      exampleSentence: example_sentence
+      language {
+        code
+        name
+      }
+    }
+  }
+`;
+
+export const WORDGROUP_FRAGMENT = gql`
+  fragment WordgroupParts on api_wordgroup {
+    chapterId: fk_chapter_id
+    id
+    titles {
+      title
+      language {
+        name
+      }
+    }
+    words {
+      id
+      word {
+        ...WordParts
+      }
+    }
+  }
+  ${WORD_FRAGMENT}
+`;
+
 export const GET_CHAPTERS = gql`
   query getChapters {
     chapters: api_chapter(where: { fk_belongs_to_id: { _is_null: true } }) {
@@ -76,25 +112,33 @@ export const GET_CHAPTER_BY_ID = gql`
 `;
 
 export const GET_CHAPTER_WORDGROUPS = gql`
-  query chapters_wordGroups {
-    chapters {
-      edges {
-        node {
-          id
-          parentChapter: fkBelongsTo {
-            id
-          }
-          wordGroups: wordgroupSet {
-            edges {
-              node {
-                id
-              }
-            }
-          }
-        }
+  subscription chapters_wordGroups {
+    chapters: api_chapter(where: { fk_belongs_to_id: { _is_null: false } }) {
+      ...ChapterHeaderParts
+      wordgroups {
+        ...WordgroupParts
       }
     }
   }
+  ${CHAPTER_HEADER_PART}
+  ${WORDGROUP_FRAGMENT}
+`;
+
+export const GET_CHAPTER_WORDGROUPS_BY_CHAPTER_ID = gql`
+  subscription subscribeChaptersWordGroupsByChapterId($id: uuid!) {
+    chapters: api_chapter_by_pk(id: $id) {
+      id
+      languages {
+        title
+      }
+      wordgroups {
+        ...WordgroupParts
+      }
+      parentChapter: fk_belongs_to_id
+        id
+      }
+    }
+    ${WORDGROUP_FRAGMENT}
 `;
 
 export const UPSERT_CHAPTER = gql`
diff --git a/src/queries/wordgroups.ts b/src/queries/wordgroups.ts
index eab17f5..a01ff72 100644
--- a/src/queries/wordgroups.ts
+++ b/src/queries/wordgroups.ts
@@ -48,6 +48,15 @@ export const GET_WORDGROUP_BY_ID = gql`
   ${WORDGROUP_FRAGMENT}
 `;
 
+export const GET_WORD_BY_ID = gql`
+  subscription subscribeWordById($id: uuid!) {
+    word: api_word_by_pk(id: $id) {
+      ...WordParts
+    }
+  }
+  ${WORD_FRAGMENT}
+`;
+
 export const UPSERT_WORDGROUP = gql`
   mutation upsertWordGroup($input: [api_wordgroup_insert_input!]!) {
     insert_api_wordgroup(objects: $input) {
@@ -59,6 +68,10 @@ export const UPSERT_WORDGROUP = gql`
   ${WORDGROUP_FRAGMENT}
 `;
 
+
+
+// TODO This thing is fucked up..
+
 /**
  * See here why we are "updating" (--> actually not, just using it since otherwise the nested upsert would fail..) the ID column:
  * https://docs.hasura.io/1.0/graphql/manual/mutations/upsert.html
@@ -90,3 +103,13 @@ export const UPSERT_WORD = gql`
   }
   ${WORD_FRAGMENT}
 `;
+
+export const GET_MEDIA_URL = gql`
+query queryMediaURL {
+  mediaUrl(fileType: "audio/mpeg") {
+    data
+    url
+  }
+}
+
+`;
\ No newline at end of file