diff --git a/examples/course.html b/examples/course.html
index ece96c4..ffb5d90 100644
--- a/examples/course.html
+++ b/examples/course.html
@@ -105,5 +105,58 @@ <h5>
     </li>
    </ul>
   </section>
+  <h4>
+   Survey
+  </h4>
+  <section data-mu-type="survey">
+   <h5 data-max_submissions="10" data-private_results="true" data-xblock-family="xblock.v1">
+    My Survey
+   </h5>
+   <p>
+    Question 1
+   </p>
+   <p>
+    Question 2
+   </p>
+   <p>
+    Question 3
+   </p>
+   <ul>
+    <li>
+     Answer 1
+    </li>
+    <li>
+     Answer 2
+    </li>
+    <li>
+     Answer 3
+    </li>
+   </ul>
+   <code>
+    This is your feedback text after submitting the survey.
+   </code>
+  </section>
+  <section data-mu-type="survey">
+   <h5 data-max_submissions="10" data-private_results="true" data-xblock-family="xblock.v1">
+    My Poll
+   </h5>
+   <p>
+    Can you see this poll example?
+   </p>
+   <ul>
+    <li>
+     Yes
+    </li>
+    <li>
+     No
+    </li>
+    <li>
+     Maybe
+    </li>
+   </ul>
+   <code>
+    This is your feedback text after submitting the poll.
+   </code>
+  </section>
  </body>
 </html>
\ No newline at end of file
diff --git a/examples/course.md b/examples/course.md
index 28b5998..e025d3f 100644
--- a/examples/course.md
+++ b/examples/course.md
@@ -56,3 +56,37 @@ How many legs does a healthy snake have?
 
 :::
 
+#### Survey
+ 
+::: {mu-type=survey}
+
+#### My Survey {private_results=true max_submissions=10}
+
+Question 1
+
+Question 2
+
+Question 3
+
+* Answer 1
+* Answer 2
+* Answer 3
+
+`This is your feedback text after submitting the survey.`
+
+:::
+
+::: {mu-type=survey}
+
+#### My Poll {private_results=true max_submissions=10}
+
+Can you see this poll example?
+ 
+* Yes
+* No
+* Maybe
+
+`This is your feedback text after submitting the poll.`
+ 
+:::
+
diff --git a/examples/olx/sequential/5e20663dadd1e483ac628951dd582ea8.xml b/examples/olx/sequential/5e20663dadd1e483ac628951dd582ea8.xml
index 7a605d1..687a36e 100644
--- a/examples/olx/sequential/5e20663dadd1e483ac628951dd582ea8.xml
+++ b/examples/olx/sequential/5e20663dadd1e483ac628951dd582ea8.xml
@@ -3,4 +3,6 @@
  </vertical>
  <vertical url_name="936721dab1ecfa97632df0cfccd801f4">
  </vertical>
+ <vertical url_name="21ab14cf7e8b30af0299c634785a5782">
+ </vertical>
 </sequential>
diff --git a/examples/olx/vertical/21ab14cf7e8b30af0299c634785a5782.xml b/examples/olx/vertical/21ab14cf7e8b30af0299c634785a5782.xml
new file mode 100644
index 0000000..1810196
--- /dev/null
+++ b/examples/olx/vertical/21ab14cf7e8b30af0299c634785a5782.xml
@@ -0,0 +1,69 @@
+<vertical display_name="Survey">
+ <survey answers='[
+    [
+        "answer_1",
+        "Answer 1"
+    ],
+    [
+        "answer_2",
+        "Answer 2"
+    ],
+    [
+        "answer_3",
+        "Answer 3"
+    ]
+]' block_name="My Survey" feedback="This is your feedback text after submitting the survey." max_submissions="10" private_results="true" questions='[
+    [
+        "question_1",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Question 1"
+        }
+    ],
+    [
+        "question_2",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Question 2"
+        }
+    ],
+    [
+        "question_3",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Question 3"
+        }
+    ]
+]' url_name="c00c90a1289c6f97a797d7f8a8b2df7e" xblock-family="xblock.v1">
+ </survey>
+ <poll answers='[
+    [
+        "yes",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Yes"
+        }
+    ],
+    [
+        "no",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "No"
+        }
+    ],
+    [
+        "maybe",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Maybe"
+        }
+    ]
+]' display_name="My Poll" feedback="This is your feedback text after submitting the poll." max_submissions="10" private_results="true" question="Can you see this poll example?" url_name="3ff7105da79eabe8a9adf96e98a0d6d7" xblock-family="xblock.v1">
+ </poll>
+</vertical>
diff --git a/mu/formats/base/writer.py b/mu/formats/base/writer.py
index ac581e8..bf6877a 100644
--- a/mu/formats/base/writer.py
+++ b/mu/formats/base/writer.py
@@ -31,3 +31,6 @@ def on_video(self, unit: units.Video) -> None:
 
     def on_rawhtml(self, unit: units.RawHtml) -> None:
         pass
+
+    def on_survey(self, unit: units.Survey) -> None:
+        pass
diff --git a/mu/formats/html/reader.py b/mu/formats/html/reader.py
index c40bdd6..e87c46c 100644
--- a/mu/formats/html/reader.py
+++ b/mu/formats/html/reader.py
@@ -120,6 +120,9 @@ def on_section(self, unit_html: BeautifulSoup) -> t.Iterable[units.Unit]:
         elif unit_type == "ftq":
             # Free text question
             yield from process_ftq(unit_html)
+        elif unit_type == "survey":
+            # Survey questionaire
+            yield from process_survey(unit_html)
         else:
             logger.warning("Unit type is unsupported by HTML reader: %s", unit_type)
 
@@ -231,6 +234,18 @@ def process_ftq(unit_html: BeautifulSoup) -> t.Iterable[units.Unit]:
     yield units.FreeTextQuestion(title=title, question=question, answers=answers)
 
 
+def process_survey(unit_html: BeautifulSoup) -> t.Iterable[units.Unit]:
+    title, questions, answers = get_questions_answers(unit_html)
+    feedback = unit_html.find("code").string.strip() if unit_html.find("code") else ""
+    yield units.Survey(
+        title=title,
+        questions=questions,
+        answers=answers,
+        feedback=feedback,
+        attributes=get_data_attributes(unit_html.find(re.compile("^h[1-6]$"))),
+    )
+
+
 def process_video(unit_html: BeautifulSoup) -> t.Iterable[units.Unit]:
     """
     https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video
@@ -288,6 +303,31 @@ def get_question_answers(unit_html: BeautifulSoup) -> t.Tuple[str, str, t.List[s
     return title, question, answers
 
 
+def get_questions_answers(
+    unit_html: BeautifulSoup,
+) -> t.Tuple[str, t.List[str], t.List[str]]:
+    title = ""
+    if title_html := find_title(unit_html):
+        title = title_html.string
+
+    answers = []
+
+    ul_html = unit_html.find("ul")
+    if ul_html is None:
+        raise MuError(f"Missing <ul> element in multiple choice question: {unit_html}")
+    for li_html in ul_html.find_all("li"):
+        answer = li_html.string.strip()
+        answers.append(answer.strip())
+
+    questions = []
+    for q in unit_html.findAll("p"):
+        if "code" not in [c.name for c in q.children]:
+            questions.append(q.string.strip())
+    if len(questions) < 1:
+        raise MuError(f"Missing <p> element in survey: {unit_html}")
+    return title, questions, answers
+
+
 def find_title(unit_html: BeautifulSoup) -> t.Optional[BeautifulSoup]:
     return unit_html.find(
         [
diff --git a/mu/formats/html/writer.py b/mu/formats/html/writer.py
index 866cb9e..0af7e32 100644
--- a/mu/formats/html/writer.py
+++ b/mu/formats/html/writer.py
@@ -86,6 +86,34 @@ def on_freetextquestion(self, unit: units.FreeTextQuestion) -> None:
 
         self.append_to_body(section_html)
 
+    def on_survey(self, unit: units.Survey) -> None:
+        section_html = Tag(name="section", attrs={TYPE_ATTR: "survey"})
+
+        # Write title
+        section_html.append(self.get_header(unit))
+
+        # Write questions
+        for question in unit.questions:
+            question_html = Tag(name="p")
+            question_html.string = question
+            section_html.append(question_html)
+
+        answers_html = Tag(name="ul")
+
+        # Write answers
+        for answer in unit.answers:
+            answer_html = Tag(name="li")
+            answer_html.string = answer
+            answers_html.append(answer_html)
+        section_html.append(answers_html)
+
+        # Write Feedback
+        feedback_html = Tag(name="code")
+        feedback_html.string = unit.feedback
+        section_html.append(feedback_html)
+
+        self.append_to_body(section_html)
+
     def on_video(self, unit: units.Video) -> None:
         """
         We parse the video sources. If one is youtube, we include a youtube iframe.
diff --git a/mu/formats/olx/reader.py b/mu/formats/olx/reader.py
index aa701f1..bfd6cab 100644
--- a/mu/formats/olx/reader.py
+++ b/mu/formats/olx/reader.py
@@ -126,6 +126,46 @@ def on_video(self, unit_xml: BeautifulSoup) -> t.Iterable[units.Unit]:
             sources=sources,
         )
 
+    def on_poll(self, unit_xml: BeautifulSoup) -> t.Iterable[units.Unit]:
+        import json
+
+        attributes: t.Dict[str, str] = unit_xml.attrs
+        attributes["olx-type"] = unit_xml.name
+        questions: t.List[str] = list()
+        questions.append(attributes.pop("question", ""))
+        try:
+            answers: t.List[str] = json.loads(attributes.pop("answers", "[]"))
+        except:
+            answers = list()
+        feedback: str = attributes.pop("feedback", "")
+        yield units.Survey(
+            questions=questions,
+            answers=answers,
+            feedback=feedback,
+            attributes=attributes,
+        )
+
+    def on_survey(self, unit_xml: BeautifulSoup) -> t.Iterable[units.Unit]:
+        import json
+
+        attributes: t.Dict[str, str] = unit_xml.attrs
+        attributes["olx-type"] = unit_xml.name
+        try:
+            questions: t.List[str] = json.loads(attributes.pop("questions", "[]"))
+        except:
+            questions = list()
+        try:
+            answers: t.List[str] = json.loads(attributes.pop("answers", "[]"))
+        except:
+            answers = list()
+        feedback: str = attributes.pop("feedback", "")
+        yield units.Survey(
+            questions=questions,
+            answers=answers,
+            feedback=feedback,
+            attributes=attributes,
+        )
+
 
 class StringReader(InlineReader):
     """
diff --git a/mu/formats/olx/writer.py b/mu/formats/olx/writer.py
index a5c76cb..ebd745a 100644
--- a/mu/formats/olx/writer.py
+++ b/mu/formats/olx/writer.py
@@ -2,6 +2,7 @@
 import logging
 import os
 import typing as t
+import json
 
 from bs4 import BeautifulSoup, Tag
 
@@ -77,7 +78,39 @@ def on_multiplechoicequestion(self, unit: units.MultipleChoiceQuestion) -> None:
         response_xml.append(responsegroup_xml)
         problem_xml.append(response_xml)
 
-    def on_freetextquestion(self, unit: units.MultipleChoiceQuestion) -> None:
+    def on_survey(self, unit: units.Survey) -> None:
+        """
+        https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/latest/exercises_tools/survey.html
+        """
+        title_attribute = "display_name"
+        unit_type = "poll" if len(unit.questions) < 2 else "survey"
+        attrs = dict()
+        make_dict: t.Callable[
+            [t.List[str]], t.List[t.List[str | t.Dict[str, str]]]
+        ] = lambda x: [
+            [
+                y.lower().replace(" ", "_"),
+                {"img": "", "img_alt": "", "label": y},
+            ]
+            for y in x
+        ]
+        if unit_type == "survey":
+            title_attribute = "block_name"
+            attrs["questions"] = json.dumps(make_dict(unit.questions), indent=4)
+            attrs["answers"] = json.dumps(
+                [[a.lower().replace(" ", "_"), a] for a in unit.answers], indent=4
+            )
+        else:
+            attrs["question"] = unit.questions[0] if unit.questions else ""
+            attrs["answers"] = json.dumps(make_dict(unit.answers), indent=4)
+
+        problem_xml = self.process_single_tag_block(
+            unit=unit, unit_type=unit_type, title_attribute=title_attribute
+        )
+        problem_xml.attrs.update(attrs)
+        problem_xml.attrs["feedback"] = unit.feedback
+
+    def on_freetextquestion(self, unit: units.FreeTextQuestion) -> None:
         """
         https://edx.readthedocs.io/projects/edx-open-learning-xml/en/latest/problem-xml/text_input.html
         """
@@ -186,6 +219,35 @@ def process_unit(self, unit: units.Unit, unit_type: str) -> Tag:
 
         return unit_xml
 
+    def process_single_tag_block(
+        self, unit: units.Unit, unit_type: str, title_attribute: str = "display_name"
+    ) -> Tag:
+        # Get/Generate url_name
+        url_name = get_url_name(unit)
+
+        # <unit_type>/<url_name>.xml
+        display_name = unit.title
+        if not display_name and unit.parent:
+            # Borrow the title from the above unit
+            display_name = unit.parent.title
+        unit_xml = Tag(name=unit_type, attrs={title_attribute: display_name})
+        unit_xml.attrs.update(unit.attributes)
+
+        unit_xml.attrs["url_name"] = url_name
+
+        self.unit_xml[unit] = unit_xml
+
+        # Find the nearest parent for which we have created an xml element
+        parent = unit.parent
+        while parent is not None:
+            # Append <type url_name="..."> to that parent (if any)
+            if parent_xml := self.unit_xml.get(parent):
+                parent_xml.append(unit_xml)
+                break
+            parent = parent.parent
+
+        return unit_xml
+
 
 def get_url_name(unit: units.Unit) -> str:
     if url_name := unit.attributes.get("olx-url_name"):
diff --git a/mu/units.py b/mu/units.py
index 7fb1a85..0f40dec 100644
--- a/mu/units.py
+++ b/mu/units.py
@@ -1,7 +1,11 @@
 import typing as t
+import logging
+import json
 
 U = t.TypeVar("U", bound="Unit")
 
+logger = logging.getLogger(__name__)
+
 
 class Unit:
     """
@@ -91,6 +95,26 @@ def __init__(
         )
 
 
+class Survey(Unit):
+    def __init__(
+        self,
+        attributes: t.Dict[str, str] = dict(),
+        title: str = "",
+        answers: t.Optional[t.List[str]] = None,
+        questions: t.Optional[t.List[str]] = None,
+        feedback: str = "",
+    ):
+        """
+        Multiple  questions with multiple choices common for all the questions.
+        """
+        self.questions = questions or []
+        self.feedback = feedback
+        attributes["xblock-family"] = "xblock.v1"
+        self.answers = answers or []
+
+        super().__init__(attributes=attributes, title=title)
+
+
 class RawHtml(Unit):
     def __init__(
         self,
diff --git a/tests/test_html.py b/tests/test_html.py
index f84cb35..9e6e9be 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -91,6 +91,57 @@ def test_video(self) -> None:
             video.sources,
         )
 
+    def test_survey(self) -> None:
+        reader = StringReader(
+            """
+<h1>Survey</h1>
+<section data-mu-type="survey">
+   <h2 data-max_submissions="10" data-private_results="true" data-xblock-family="xblock.v1">
+    My Survey
+   </h2>
+   <p>
+    Question1
+   </p>
+   <p>
+    Question2
+   </p>
+   <ul>
+    <li>
+     Answer1
+    </li>
+    <li>
+     Answer2
+    </li>
+   </ul>
+   <code>
+    Feedback Text.
+   </code>
+  </section>
+"""
+        )
+        course = reader.read()
+        survey = course.children[0]
+        self.assertEqual("My Survey", survey.title.strip(" \n"))
+        assert isinstance(survey, units.Survey)
+        self.assertListEqual(
+            ["Answer1", "Answer2"],
+            survey.answers,
+        )
+
+        self.assertListEqual(
+            ["Question1", "Question2"],
+            survey.questions,
+        )
+        self.assertEqual("Feedback Text.", survey.feedback)
+        self.assertDictEqual(
+            {
+                "max_submissions": "10",
+                "private_results": "true",
+                "xblock-family": "xblock.v1",
+            },
+            survey.attributes,
+        )
+
     def test_video_no_source(self) -> None:
         reader = StringReader(
             """
@@ -255,6 +306,51 @@ def test_video(self) -> None:
             "https://www.youtube.com/embed/dQw4w9WgXcQ", iframe.attrs["src"]
         )
 
+    def test_survey(self) -> None:
+        writer = Writer()
+        writer.write(
+            units.Survey(
+                attributes={"private_results": "true", "max_submissions": "10"},
+                title="My Survey",
+                answers=["Answer1", "Answer2"],
+                questions=["Question1", "Question2"],
+                feedback="Feedback Text.",
+            )
+        )
+        output = writer.dumps()
+        self.assertEqual(
+            """<!DOCTYPE html>
+<html>
+ <head>
+ </head>
+ <body>
+  <section data-mu-type="survey">
+   <h1 data-max_submissions="10" data-private_results="true" data-xblock-family="xblock.v1">
+    My Survey
+   </h1>
+   <p>
+    Question1
+   </p>
+   <p>
+    Question2
+   </p>
+   <ul>
+    <li>
+     Answer1
+    </li>
+    <li>
+     Answer2
+    </li>
+   </ul>
+   <code>
+    Feedback Text.
+   </code>
+  </section>
+ </body>
+</html>""",
+            output,
+        )
+
     def test_raw_html(self) -> None:
         writer = Writer()
         writer.write(units.RawHtml(contents="<p>hello</p>"))
diff --git a/tests/test_olx.py b/tests/test_olx.py
index 18f5f12..66ae379 100644
--- a/tests/test_olx.py
+++ b/tests/test_olx.py
@@ -45,6 +45,104 @@ def test_html(self) -> None:
         assert isinstance(html, units.RawHtml)
         self.assertEqual("<p>hello world!</p>", html.contents)
 
+    def test_poll(self) -> None:
+        reader = StringReader(
+            """<poll answers='[
+    [
+        "answer1",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Answer1"
+        }
+    ],
+    [
+        "answer2",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Answer2"
+        }
+    ]
+]' display_name="Poll" feedback="Feedback Text." max_submissions="10" private_results="true" question="Poll Question" xblock-family="xblock.v1"></poll>"""
+        )
+        poll = list(reader.parse())[0]
+        assert isinstance(poll, units.Survey)
+        self.assertListEqual(
+            poll.answers,
+            [
+                ["answer1", {"img": "", "img_alt": "", "label": "Answer1"}],
+                ["answer2", {"img": "", "img_alt": "", "label": "Answer2"}],
+            ],
+        )
+        self.assertListEqual(poll.questions, ["Poll Question"])
+        self.assertEqual(poll.feedback, "Feedback Text.")
+        self.assertDictEqual(
+            poll.attributes,
+            {
+                "display_name": "Poll",
+                "max_submissions": "10",
+                "private_results": "true",
+                "xblock-family": "xblock.v1",
+                "olx-type": "poll",
+            },
+        )
+
+    def test_survey(self) -> None:
+        reader = StringReader(
+            """<survey answers='[
+    [
+        "answer1",
+        "Answer1"
+    ],
+    [
+        "answer2",
+        "Answer2"
+    ]
+]' block_name="Survey" feedback="Feedback Text." max_submissions="10" private_results="true" questions='[
+    [
+        "question1",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Question1"
+        }
+    ],
+    [
+        "question2",
+        {
+            "img": "",
+            "img_alt": "",
+            "label": "Question2"
+        }
+    ]
+]' xblock-family="xblock.v1"></survey>"""
+        )
+        survey = list(reader.parse())[0]
+        assert isinstance(survey, units.Survey)
+
+        self.assertListEqual(
+            survey.answers, [["answer1", "Answer1"], ["answer2", "Answer2"]]
+        )
+        self.assertListEqual(
+            survey.questions,
+            [
+                ["question1", {"img": "", "img_alt": "", "label": "Question1"}],
+                ["question2", {"img": "", "img_alt": "", "label": "Question2"}],
+            ],
+        )
+        self.assertEqual(survey.feedback, "Feedback Text.")
+        self.assertDictEqual(
+            survey.attributes,
+            {
+                "block_name": "Survey",
+                "max_submissions": "10",
+                "private_results": "true",
+                "xblock-family": "xblock.v1",
+                "olx-type": "survey",
+            },
+        )
+
 
 class OlxWriterTests(unittest.TestCase):
     def build_course(self, title: str = "") -> units.Course:
@@ -131,3 +229,57 @@ def test_raw_html(self) -> None:
             os.path.join("html", w.get_url_name(html) + ".html"),
             str(writer.xml_paths[-1][1]),
         )
+
+    def test_poll(self) -> None:
+        survey = units.Survey(
+            attributes={"private_results": "true", "max_submissions": "10"},
+            title="Poll",
+            answers=["Answer1", "Answer2", "Answer3"],
+            questions=["Poll Question"],
+            feedback="Feedback Text.",
+        )
+        writer = w.Writer()
+        writer.write(survey)
+        self.assertEqual(len(writer.unit_xml), 1)
+        poll_tag = [v for v in writer.unit_xml.values()][0]
+        poll_tag_attrs = poll_tag.attrs
+        poll_tag_attrs.pop("url_name", "")
+        self.assertDictEqual(
+            {
+                "display_name": "Poll",
+                "private_results": "true",
+                "max_submissions": "10",
+                "xblock-family": "xblock.v1",
+                "question": "Poll Question",
+                "answers": '[\n    [\n        "answer1",\n        {\n            "img": "",\n            "img_alt": "",\n            "label": "Answer1"\n        }\n    ],\n    [\n        "answer2",\n        {\n            "img": "",\n            "img_alt": "",\n            "label": "Answer2"\n        }\n    ],\n    [\n        "answer3",\n        {\n            "img": "",\n            "img_alt": "",\n            "label": "Answer3"\n        }\n    ]\n]',
+                "feedback": "Feedback Text.",
+            },
+            poll_tag_attrs,
+        )
+
+    def test_survey(self) -> None:
+        survey = units.Survey(
+            attributes={"private_results": "true", "max_submissions": "10"},
+            title="Survey",
+            answers=["Answer1", "Answer2"],
+            questions=["Question1", "Question2"],
+            feedback="Feedback Text.",
+        )
+        writer = w.Writer()
+        writer.write(survey)
+        self.assertEqual(len(writer.unit_xml), 1)
+        survey_tag = [v for v in writer.unit_xml.values()][0]
+        survey_tag_attrs = survey_tag.attrs
+        survey_tag_attrs.pop("url_name", "")
+        self.assertDictEqual(
+            {
+                "block_name": "Survey",
+                "private_results": "true",
+                "max_submissions": "10",
+                "xblock-family": "xblock.v1",
+                "questions": '[\n    [\n        "question1",\n        {\n            "img": "",\n            "img_alt": "",\n            "label": "Question1"\n        }\n    ],\n    [\n        "question2",\n        {\n            "img": "",\n            "img_alt": "",\n            "label": "Question2"\n        }\n    ]\n]',
+                "answers": '[\n    [\n        "answer1",\n        "Answer1"\n    ],\n    [\n        "answer2",\n        "Answer2"\n    ]\n]',
+                "feedback": "Feedback Text.",
+            },
+            survey_tag_attrs,
+        )