diff --git a/CodeChallenge/api/questions.py b/CodeChallenge/api/questions.py
index 4b8d733..9ea2480 100644
--- a/CodeChallenge/api/questions.py
+++ b/CodeChallenge/api/questions.py
@@ -22,7 +22,7 @@ def json_error(reason, status=400):
 def end_code_challenge():
     if core.challenge_ended():
         r = jsonify(status="error",
-                    message="code challenge has ended")
+                    reason="code challenge has ended")
         r.status_code = 403
         abort(r)
 
@@ -84,7 +84,7 @@ def next_question():
 
 
 def answer_limit_attempts():
-    return current_app.config.get("ANSWER_ATTEMPT_LIMIT", "3 per 30 minutes")
+    return current_app.config.get("ANSWER_ATTEMPT_LIMIT", "1 per 1 minutes")
 
 
 @bp.route("/answer", methods=["POST"])
@@ -163,10 +163,10 @@ def reset_all():
 
         db.session.commit()
 
-        return jsonify(status="success", message="all answers and rank reset")
+        return jsonify(status="success", reason="all answers and rank reset")
 
     return jsonify(status="error",
-                   message="resetting not allowed at this time"), 403
+                   reason="resetting not allowed at this time"), 403
 
 
 @bp.route("/final", methods=["POST"])
diff --git a/CodeChallenge/cli/questions.py b/CodeChallenge/cli/questions.py
index fd3e3f7..e49ead2 100644
--- a/CodeChallenge/cli/questions.py
+++ b/CodeChallenge/cli/questions.py
@@ -18,17 +18,21 @@
 @click.argument("answer")
 @click.argument("rank")
 @click.argument("asset")
-def q_add(title, answer, rank, asset):
+@click.argument("hint1")
+@click.argument("hint2")
+def q_add(title, answer, rank, asset, hint1, hint2):
     """Add a new question to the database
 
     TITLE is the text for the title of the question
     ANSWER is the answer stored only in the database
     RANK is the day rank the queestion should be revealed on
     ASSET is a path to a file to upload for a question
+    HINT1 is a hint string 
+    HINT2 is a hint string
     """
 
     asset = os.path.abspath(asset)
-    qid = add_question(title, answer, rank, asset)
+    qid = add_question(title, answer, rank, asset, hint1, hint2)
 
     click.echo(f"added question id {qid}")
 
@@ -66,7 +70,9 @@ def q_del(qid):
 @click.argument("answer")
 @click.argument("rank")
 @click.argument("asset")
-def q_replace(title, answer, rank, asset):
+@click.argument("hint1")
+@click.argument("hint2")
+def q_replace(title, answer, rank, asset, hint1, hint2):
     """Replace an existing rank's question.
 
     This basically deletes the previous rank then adds the new rank
diff --git a/CodeChallenge/manage.py b/CodeChallenge/manage.py
index c6523d4..23f3154 100644
--- a/CodeChallenge/manage.py
+++ b/CodeChallenge/manage.py
@@ -3,7 +3,7 @@
 from .models import Question, db
 
 
-def add_question(title, answer, rank, asset) -> Question:
+def add_question(title, answer, rank, asset, hint1=None, hint2=None) -> Question:
 
     q = Question.query.filter_by(rank=rank).first()
 
@@ -19,6 +19,8 @@ def add_question(title, answer, rank, asset) -> Question:
 
     q.asset_ext = os.path.splitext(asset)[1]
     q.rank = rank
+    q.hint1 = hint1
+    q.hint2 = hint2
 
     db.session.add(q)
     db.session.commit()
diff --git a/Pipfile.lock b/Pipfile.lock
index 12f5ead..8f14295 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -310,6 +310,14 @@
             ],
             "version": "==19.3.0"
         },
+        "colorama": {
+            "hashes": [
+                "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff",
+                "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"
+            ],
+            "markers": "sys_platform == 'win32'",
+            "version": "==0.4.3"
+        },
         "entrypoints": {
             "hashes": [
                 "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19",
diff --git a/package.json b/package.json
index 43f4e42..e24211d 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "moment": "^2.24.0",
     "serialize-javascript": "^2.1.2",
     "vue": "^2.6.10",
+    "vue-codemirror": "^4.0.6",
     "vue-moment": "^4.1.0",
     "vue-router": "^3.1.3",
     "vue-the-mask": "^0.11.1",
@@ -33,6 +34,7 @@
     "prettier": "^1.18.2",
     "sass": "^1.19.0",
     "sass-loader": "^8.0.0",
+    "vue-cli-plugin-codemirror": "^0.0.6",
     "vue-cli-plugin-vuetify": "^2.0.2",
     "vue-template-compiler": "^2.6.10",
     "vuetify-loader": "^1.3.0"
diff --git a/public/index.html b/public/index.html
index 7f068dc..bb32131 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,23 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
-    <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+    <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
     <title>CodeWizardsHQ CODE CHALLENGE</title>
   </head>
 
diff --git a/src/api/auth.js b/src/api/auth.js
index 3042cb5..897d4ce 100644
--- a/src/api/auth.js
+++ b/src/api/auth.js
@@ -43,6 +43,10 @@ async function createAccount(data) {
   await login(data.username, data.password, false);
 }
 
+async function requestPasswordReset(email) {
+  await request(routes.userapi_forgot, { data: { email } });
+}
+
 async function fetchState() {
   const userData = await request(routes.userapi_hello, {}, state.auth);
   await setState({
@@ -75,11 +79,19 @@ function currentUser() {
 }
 
 async function forgotPassword(email) {
-  return await request(routes.userapi_forgot_password, { data: { email } }, false);
+  return await request(
+    routes.userapi_forgot_password,
+    { data: { email } },
+    false
+  );
 }
 
 async function resetPassword(token, password) {
-  return await request(routes.userapi_reset_password, { data: { token, password } }, false)
+  return await request(
+    routes.userapi_reset_password,
+    { data: { token, password } },
+    false
+  );
 }
 
 export default {
@@ -89,6 +101,7 @@ export default {
   fetchState,
   createAccount,
   currentUser,
+  requestPasswordReset,
   onAuthStateChange,
   offAuthStateChange,
   forgotPassword,
diff --git a/src/api/quiz.js b/src/api/quiz.js
index e854d8d..a36d99c 100644
--- a/src/api/quiz.js
+++ b/src/api/quiz.js
@@ -6,7 +6,7 @@ async function getQuestion() {
 }
 
 async function getRank() {
-  return (await request(routes.questionsapi_get_rank)).rank;
+  return request(routes.questionsapi_get_rank);
 }
 
 async function resetRank() {
@@ -22,9 +22,21 @@ async function submit(answer) {
   return result.correct;
 }
 
+async function submitFinal(answer, language, checkOnly) {
+  const result = await request(routes.questionsapi_answer_final_question, {
+    data: {
+      checkOnly,
+      text: answer,
+      language
+    }
+  });
+  return result;
+}
+
 export default {
   getQuestion,
   submit,
+  submitFinal,
   getRank,
   resetRank
 };
diff --git a/src/api/request.js b/src/api/request.js
index 145ed0d..6cbdaf1 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,7 +1,10 @@
 import axios from "axios";
-import routes from "./routes";
+// import routes from "./routes";
 
-export default async function request(route, options = {}, tryRefresh = true) {
+export default async function request(route, options = {}, _tryRefresh = true) {
+  if (_tryRefresh) {
+    // satisfy linter
+  }
   try {
     // attempt initial request and return great response
     const response = await axios({
@@ -9,24 +12,31 @@ export default async function request(route, options = {}, tryRefresh = true) {
       url: route.path,
       ...options
     });
-    return response.data;
-  } catch (err) {
-    if (err.response.status == 401 && tryRefresh) {
-      // our tokens have possibly expired, send refresh
-      // TODO: THIS IS UNFINISHED
-      await axios({
-        method: "POST",
-        url: routes.userapi_refresh.path
-      });
 
-      // try and return original request marked with no refresh
-      return request(route, options, false);
-    }
+    return {
+      ...response.data,
+      headers: response.headers
+    };
+  } catch (err) {
+    // console.log(err.response);
+    // if (err.response.status == 401 && tryRefresh) {
+    //   console.log("Trying refresh");
+    //   // our tokens have possibly expired, send refresh
+    //   // TODO: THIS IS UNFINISHED
+    //   await axios({
+    //     method: "POST",
+    //     url: routes.userapi_refresh.path
+    //   });
 
+    //   // try and return original request marked with no refresh
+    //   return request(route, options, false);
+    // }
     // return original error
+    // console.log()
     return Promise.reject({
       status: err.response.status,
       headers: err.response.headers,
+      data: err.response.data,
       message:
         !!err.response.data && !!err.response.data.reason
           ? err.response.data.reason
diff --git a/src/api/routes.js b/src/api/routes.js
index a79ae8f..10f2a1f 100644
--- a/src/api/routes.js
+++ b/src/api/routes.js
@@ -11,13 +11,15 @@ export default {
   userapi_login: route("/api/v1/users/token/auth", "POST"),
   userapi_logout: route("/api/v1/users/token/remove", "POST"),
   userapi_hello: route("/api/v1/users/hello", "GET"),
+  userapi_forgot: route("/api/v1/users/forgot", "POST"),
   userapi_refresh: route("/api/v1/users/token/refresh", "POST"),
   userapi_forgot_password: route("/api/v1/users/forgot", "POST"),
   userapi_reset_password: route("/api/v1/users/reset-password", "POST"),
   questionsapi_rank_reset: route("/api/v1/questions/reset", "DELETE"),
   questionsapi_answer_next_question: route("/api/v1/questions/answer", "POST"),
+  questionsapi_answer_final_question: route("/api/v1/questions/final", "POST"),
   questionsapi_get_rank: route("/api/v1/questions/rank", "GET"),
-  questions_api_next_question: route("/api/v1/questions/next", "GET"),
+  questions_api_next_question: route("/api/v1/questions/next", "GET")
 };
 
 // export default {
diff --git a/src/components/QuizAnswer.vue b/src/components/QuizAnswer.vue
deleted file mode 100644
index e227ee8..0000000
--- a/src/components/QuizAnswer.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <div class="quiz-answer">
-    <v-card flat>
-      <img src="/images/dragon1-dab.png" v-if="wasCorrect" />
-      <img src="/images/dragon1.png" v-else />
-      <v-card-text>
-        <v-form ref="form" @submit.prevent="submit">
-          <v-text-field
-            autocomplete="off"
-            v-model="fields.answer.value"
-            v-bind="fields.answer"
-            :disabled="isDisabled"
-            @blur="onBlur"
-          />
-
-          <v-btn x-large color="primary" :disabled="isDisabled" type="submit"
-            >Submit</v-btn
-          >
-
-          <v-btn
-            v-if="wasCorrect"
-            x-large
-            color="primary"
-            type="submit"
-            @click="next"
-            >NEXT</v-btn
-          >
-        </v-form>
-      </v-card-text>
-    </v-card>
-  </div>
-</template>
-
-<script>
-import * as api from "@/api";
-
-export default {
-  name: "quizAnswer",
-  props: ["isLoading"],
-  computed: {
-    isDisabled() {
-      return this.isSubmitting || this.isLoading || this.wasCorrect;
-    }
-  },
-  data() {
-    return {
-      isSubmitting: false,
-      wasCorrect: false,
-      fields: {
-        answer: {
-          label: "Your Answer",
-          value: "",
-          rules: [v => !!v || "You forgot to include an answer!"],
-          errorMessages: [],
-          successMessages: [],
-          success: false
-        }
-      }
-    };
-  },
-  methods: {
-    onBlur() {
-      this.fields.answer.errorMessages = [];
-      if (!this.fields.answer.value) {
-        this.$refs.form.resetValidation();
-      }
-    },
-    async next() {
-      try {
-        this.wasCorrect = false;
-        this.fields.answer.value = "";
-        this.fields.answer.successMessages = [];
-        this.fields.answer.success = false;
-        this.$refs.form.resetValidation();
-        this.$emit("next");
-      } catch (err) {
-        await this.$store.dispatch("Snackbar/showError", err);
-      }
-    },
-    async submit() {
-      if (!this.$refs.form.validate()) {
-        return;
-      }
-
-      if (this.isSubmitting) {
-        return false;
-      }
-      this.isSubmitting = true;
-      try {
-        const isCorrect = await api.quiz.submit(this.fields.answer.value);
-
-        if (isCorrect) {
-          await api.auth.fetchState();
-          await this.$store.dispatch(
-            "Snackbar/showSuccess",
-            "That answer was correct!"
-          );
-          this.wasCorrect = true;
-          this.fields.answer.successMessages = ["Your answer was correct!"];
-          this.fields.answer.success = true;
-        } else {
-          this.$store.dispatch(
-            "Snackbar/showError",
-            "That answer was not correct"
-          );
-          this.fields.answer.errorMessages = ["That answer was not correct"];
-        }
-      } catch (err) {
-        this.$store.dispatch("Snackbar/showError", err);
-      }
-      this.isSubmitting = false;
-    }
-  }
-};
-</script>
diff --git a/src/components/TermsOfServiceContent.vue b/src/components/TermsOfServiceContent.vue
new file mode 100644
index 0000000..cd40102
--- /dev/null
+++ b/src/components/TermsOfServiceContent.vue
@@ -0,0 +1,420 @@
+<template>
+  <div>
+    <h1 class="c13" id="h.u86egh3ptapa">
+      <span class="c3">Terms Of Service & Privacy Policy</span>
+    </h1>
+    <p class="c8">
+      <span class="c0"
+        >Students accessing the Defeat the Dragon Code Challenge websites or
+        CodeWizardsHQ Platform to view, upload, or edit content should refrain
+        from the following conduct:</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >1. Using any provided website for any commercial use or purpose unless
+        expressly permitted by CWHQ and the specific provider in writing, it is
+        understood that the website and related services are intended for
+        educational, personal, and non-commercial use only;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >2. Posting, uploading, or distributing any defamatory, libelous, or
+        inaccurate student material or content or other content;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >3. Posting, uploading, or distributing any student material or content
+        or other content that is unlawful or that a reasonable person could deem
+        to be objectionable, offensive, indecent, pornographic, harassing,
+        threatening, embarrassing, distressing, vulgar, hateful, racially or
+        ethnically offensive, or otherwise inappropriate;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >4. Impersonating any person or entity, falsely claiming an affiliation
+        with any person or entity, or accessing the website accounts of others
+        without permission, or performing any other fraudulent activity;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >5. Deleting the copyright or other proprietary rights notices on the
+        website or on any student material or content or other content;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >6. Asserting, or authorizing, assisting, or encouraging any third party
+        to assert, against CWHQ, the website provider, or any of their
+        affiliates or licensors any patent infringement or other intellectual
+        property infringement claim regarding any student material or content or
+        other content, submitted, or otherwise made available on or through the
+        website;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >7. Making unsolicited offers, advertisements, proposals, or sending
+        junk mail or spam to other users of the website or participants in any
+        Competition (including, but not limited to, unsolicited advertising,
+        promotional materials, or other solicitation material, bulk mailing of
+        commercial advertising, chain mail, informational announcements, charity
+        requests, and petitions for signatures);</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >8. Using the website for any illegal purpose, or in violation of any
+        local, state, national, or international law, including, without
+        limitation, laws governing intellectual property and other proprietary
+        rights, and data protection and privacy;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >9. Defaming, harassing, abusing, threatening or defrauding users of the
+        website or participants in the Defeat the Dragon Code Challenge, or
+        collecting, or attempting to collect, personal information about users,
+        participants, or third parties without their consent;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >10. Removing, circumventing, disabling, damaging or otherwise
+        interfering with security-related features of the website, student
+        material or content or other content, features that prevent or restrict
+        use or copying of any content accessible through the website, or
+        features that enforce limitations on the use of the website, student
+        material or content or other content;</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c0"
+        >11. Intentionally interfering with or damaging the operation of the
+        website or any user&rsquo;s enjoyment of it, by any means, including
+        without limitation by participation in any denial-of-service type
+        attacks or by uploading or otherwise disseminating viruses, adware,
+        spyware, worms, or other malicious code.</span
+      >
+    </p>
+    <p class="c8">
+      <span class="c4">Privacy Policy</span>
+    </p>
+    <p class="c5">
+      <span class="c4"></span>
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >By visiting and using the http://challenge.codewizardshq.com website
+        (&ldquo;CodeWizardsHQ&rdquo;) you acknowledge you have read and agree to
+        be bound by this Privacy Policy. If you do not wish to agree to the
+        Privacy Policy, please close this browser session and refrain from using
+        CodeWizardsHQ.</span
+      >
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >CodeWizardsHQ is committed to protecting your privacy online. Please
+        read the following to learn what information we collect from you and how
+        we use that information.</span
+      >
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">1. Changes to Privacy Policy</span>
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >CodeWizardsHQ may change this Privacy Policy at any time by posting the
+        revised Policy in the &ldquo;Privacy Policy&rdquo; section of the
+        website, located at https://codewizardshq.com/privacy-policy/. The
+        revised Privacy Policy is effective immediately when posted on the
+        CodeWizardsHQ website. It is your responsibility to review the website
+        and the Privacy Policy periodically for changes. Your continued use of
+        CodeWizardsHQ after posting any changes will constitute your
+        acknowledgment and acceptance of the terms of the revised Privacy
+        Policy.</span
+      >
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">2. Protecting Your Privacy</span>
+    </p>
+    <p class="c7">
+      <span class="c4"
+        >CodeWizardsHQ is committed to protecting your privacy:</span
+      >
+    </p>
+    <ul class="c10 lst-kix_wylw1qcyrxab-0 start">
+      <li class="c1">
+        <span class="c0"
+          >Your name and contact information will not be shared with Third
+          Parties for marketing purposes without your permission.</span
+        >
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >CodeWizardsHQ marketing communications are &ldquo;opt-out,&rdquo; and
+          you may choose not to receive our newsletters or other marketing
+          material at any time.</span
+        >
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >Your account information is password protected. You are responsible
+          for keeping your password secure and private. In the event of any
+          compromise of our website security, CodeWizardsHQ will notify you
+          immediately to take action to change your password on the
+          website.</span
+        >
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >CodeWizardsHQ does not knowingly collect any information or allow
+          accounts to be held by users under the age of 13 without permission of
+          a parent or guardian. If an account is discovered by CodeWizardsHQ
+          which is believed to be held by a user under 13 years of age, without
+          the permission of a parent or guardian, the account and all related
+          postings will be removed by CodeWizardsHQ.</span
+        >
+      </li>
+    </ul>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">3. What Information We Collect and Store and Why</span>
+    </p>
+    <ul class="c10 lst-kix_8go8xciji1y9-0 start">
+      <li class="c1">
+        <span class="c0">We may collect your email address.</span>
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >We may collect your email address, or other information needed to
+          contact you online. We also collect your student&rsquo;s email address
+          and information. We use contact information to send you notices on
+          CodeWizardsHQ products and services, as well as updates about the
+          Defeat the Dragon Code Challenge.</span
+        >
+      </li>
+      <li class="c1">
+        <span class="c0">We may collect challenge activity information.</span>
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >We may collect information generated by your student&rsquo;s activity
+          on CodeWizardsHQ. We use this information to track challenge progress
+          and to allow your student to participate in our game, as well as to
+          improve the functionality of the website, and to comply with any
+          requirements of law. This information may be disclosed only to our
+          staff and to our immediate agents and will never be shared with third
+          parties.</span
+        >
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >We may collect other kinds of information from you.</span
+        >
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >When you use CodeWizardsHQ, we may collect incidental identifying
+          information about you or your student, such as pages you visit and the
+          amount of time you spend looking at a page. This information does not
+          inherently reveal your identity or your student&rsquo;s identity and
+          will not be linked to you or your student personally. We use this
+          information to improve the functionality of the website. This
+          information may be disclosed only to our staff and to our immediate
+          agents.</span
+        >
+      </li>
+      <li class="c1">
+        <span class="c0">We do not collect financial information.</span>
+      </li>
+      <li class="c1">
+        <span class="c0"
+          >All of the financial transactions related to your use of
+          CodeWizardsHQ are handled through Stripe, so CodeWizardsHQ does not
+          collect or store your financial information at all.</span
+        >
+      </li>
+    </ul>
+    <p class="c7 c21">
+      <span class="c4">Postings</span>
+    </p>
+    <ul class="c10 lst-kix_8go8xciji1y9-0">
+      <li class="c1">
+        <span class="c0"
+          >All postings to CodeWizardsHQ, including code, comments, discussions,
+          etc. are stored in our databases and may be archived on-line or
+          off-line in the form of backup tapes or other electronic formats. This
+          information is used for your student&rsquo;s courses and may be
+          retained even after an account is &ldquo;deleted&rdquo; from the
+          website itself for us to use in improving our courses.</span
+        >
+      </li>
+    </ul>
+    <p class="c7 c21">
+      <span class="c4">Cookies</span>
+    </p>
+    <ul class="c10 lst-kix_8go8xciji1y9-0">
+      <li class="c1">
+        <span class="c0"
+          >We use browser cookies in several ways. First, we use cookies to keep
+          track of your progress in courses, login status, etc. This use of
+          cookies helps make the CodeWizardsHQ experience better for you. We
+          also use third-party cookies for advertising and remarketing. We use
+          remarketing, through Google AdWords to help reach parents and
+          prospective students, which allow us to show ads for CodeWizardsHQ on
+          other sites in the Google advertising network. Google uses these
+          cookies to potentially show you advertising for CodeWizardsHQ on other
+          sites in their network, or based on keyword searches. For more
+          information about how you can control Google ads, please visit
+          www.google.com/settings/ads .</span
+        >
+      </li>
+    </ul>
+    <p class="c5">
+      <span class="c4"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">4. Security of Information</span>
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >CodeWizardsHQ takes security seriously and takes numerous precautions
+        to protect the security of your account information. You can access your
+        account on our coding platform with your username and password. This
+        password is encrypted. We recommend that you do not share your password
+        with anyone. In addition, your account information resides on a secure
+        server that only selected personnel and contractors have access
+        to.</span
+      >
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >Unfortunately, no data transmission over the Internet or any wireless
+        network can be guaranteed to be 100% secure. As a result, while we
+        employ commercially reasonable security measures to protect data and
+        seek to partner with companies that do the same, CodeWizardsHQ cannot
+        guarantee the security of any information transmitted to or from the
+        website, and is not responsible for the actions of any third parties
+        that may receive any such information.</span
+      >
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">5. Third Party Sites</span>
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >This Privacy Policy only addresses the use and disclosure of
+        information CodeWizardsHQ collects from you. Other Sites that may be
+        accessible through CodeWizardsHQ have their own privacy policies and
+        data collection, use and disclosure practices. We are not responsible
+        for the policies or practices of third parties and you are solely
+        responsible for reviewing the privacy policies of any third party
+        sites.</span
+      >
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">6. Release of Information</span>
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >CodeWizardsHQ may release any user information as required by law or in
+        the good faith belief that disclosure of information is reasonably
+        necessary to comply with a subpoena, discovery request, court order or
+        other legal process issued by a court of competent jurisdiction.</span
+      >
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >CodeWizardsHQ may also release any user information in the good faith
+        belief that such disclosure of information is reasonably necessary to
+        enforce the Terms and Conditions of Use for the website, to defend or
+        respond to any legal actions initiated by third-parties related to the
+        user account or content posted by the user; or to protect the personal
+        safety of CodeWizardsHQ staff, users, or the general public.</span
+      >
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">7. International Users</span>
+    </p>
+    <p class="c7">
+      <span class="c0"
+        >By visiting and using the CodeWizardsHQ website, you acknowledge that
+        your information may be used and stored on servers located in the United
+        States of America and therefore transferred out of your resident
+        jurisdiction. By using the site, you are consenting to any international
+        exchange of the information provided and you are consenting to the
+        policies contained in this document and posted on the CodeWizardsHQ
+        website. You hereby acknowledge that you are providing all information
+        voluntarily, with the understanding that any use of the CodeWizardsHQ
+        website is governed by the laws of the United States of America, and you
+        hereby consent to the jurisdiction of the Federal District Court of the
+        Western District of Texas regarding any disputes which may arise under
+        this Agreement or use of the website.</span
+      >
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+    <p class="c7">
+      <span class="c4">8. Comments and Feedback</span>
+    </p>
+    <p class="c7">
+      <span
+        >CodeWizardsHQ welcomes and encourages your comments and feedback on
+        this Privacy Policy and any of our other website policies. Please</span
+      >
+      <span class="c18">
+        <a
+          class="c2"
+          href="https://www.google.com/url?q=https://codewizardshq.com/&amp;sa=D&amp;ust=1580228604038000"
+          >visit our website</a
+        >
+      </span>
+      <span class="c0"
+        >&nbsp;or email us at feedback@codewizardshq.com with any comments or
+        questions.</span
+      >
+    </p>
+    <p class="c11">
+      <span class="c14"></span>
+    </p>
+    <p class="c11">
+      <span class="c14"></span>
+    </p>
+    <p class="c11">
+      <span class="c14"></span>
+    </p>
+    <p class="c5">
+      <span class="c0"></span>
+    </p>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
diff --git a/src/main.js b/src/main.js
index 1e6bee8..f8b1747 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,7 @@ import "./plugins/moment";
 import store from "./store";
 import "@/styles/styles.scss";
 import { auth } from "@/api";
-
+import "./plugins/codemirror";
 Vue.config.productionTip = false;
 
 (async function() {
@@ -14,7 +14,17 @@ Vue.config.productionTip = false;
     store.dispatch("User/refresh");
   });
 
-  await auth.autoLogin();
+  try {
+    await auth.autoLogin();
+  } catch (err) {
+    // console.error("Was unable to authenticate user");
+  }
+
+  try {
+    await store.dispatch("Quiz/refresh");
+  } catch (err) {
+    // console.error("Was unable to refresh question status", err.reason);
+  }
 
   new Vue({
     router,
diff --git a/src/plugins/codemirror.js b/src/plugins/codemirror.js
new file mode 100644
index 0000000..3cb675c
--- /dev/null
+++ b/src/plugins/codemirror.js
@@ -0,0 +1,5 @@
+import Vue from "vue";
+import VueCodeMirror from "vue-codemirror";
+import "codemirror/lib/codemirror.css";
+
+Vue.use(VueCodeMirror, {});
diff --git a/src/plugins/router.js b/src/plugins/router.js
index 2360214..b881787 100644
--- a/src/plugins/router.js
+++ b/src/plugins/router.js
@@ -1,6 +1,6 @@
 import Vue from "vue";
 import VueRouter from "vue-router";
-import {auth} from "@/api";
+import { auth } from "@/api";
 import store from "@/store";
 
 Vue.use(VueRouter);
@@ -9,7 +9,9 @@ const routes = [
   {
     path: "/home",
     name: "home",
-    component: () => import("@/views/Home")
+    redirect: {
+      name: "quiz"
+    }
   },
   {
     path: "/login",
@@ -59,40 +61,52 @@ const routes = [
   {
     path: "/quiz",
     name: "quiz",
-    component: () => import("@/views/Quiz"),
-    meta: {
-      secured: true
+    component: async () => {
+      await store.dispatch("Quiz/refresh");
+
+      // CHALLENGE IS OVER
+      if (store.state.Quiz.quizHasEnded) {
+        return import("@/views/Quiz/QuizFinished");
+      }
+
+      // CHALLENGE HAS NOT STARTED
+      if (!store.state.Quiz.quizHasStarted) {
+        return import("@/views/Quiz/QuizCountdown");
+      }
+
+      // USER HAS FINISHED QUIZ
+      if (store.state.Quiz.maxRank === store.state.User.rank - 1) {
+        return import("@/views/Quiz/QuizFinished");
+      }
+
+      // MUST WAIT FOR NEXT QUESTION
+      if (store.state.Quiz.awaitNextQuestion) {
+        return import("@/views/Quiz/QuizCountdown");
+      }
+
+      // SHOW THE LAST QUESTION
+      if (store.state.Quiz.isLastQuestion) {
+        return import("@/views/Quiz/QuizFinalQuestion");
+      }
+
+      // NORMAL QUIZ MODE
+      return import("@/views/Quiz/Quiz");
     },
-    beforeEnter: (to, from, next) => {
-      if (!store.state.Quiz.hasSeenIntro && store.state.User.rank == 0) {
+    beforeEnter(from, to, next) {
+      // USER MUST SEE INTRO VIDEO
+      if (!store.state.Quiz.hasSeenIntro && store.state.User.rank == 1) {
         next({ name: "quiz-intro" });
-      } else {
-        next();
       }
-    }
-  },
-  {
-    path: "/quiz-scores",
-    name: "quiz-scores",
-    component: () => import("@/views/QuizScores"),
+      next();
+    },
     meta: {
       secured: true
-    },
-    beforeEnter: (to, from, next) => {
-      if (!store.state.Quiz.hasScores) {
-        next({ name: "quiz" });
-      } else {
-        next();
-      }
     }
   },
   {
-    path: "/quiz-intro",
+    path: "/quiz/intro",
     name: "quiz-intro",
-    component: () => import("@/views/QuizIntro"),
-    meta: {
-      secured: true
-    }
+    component: () => import("@/views/Quiz/QuizIntro")
   },
   {
     path: "*",
@@ -114,7 +128,7 @@ router.beforeEach((to, from, next) => {
   const requireAnon = to.matched.some(record => record.meta.anon);
 
   if (!isAuthenticated && requireAuth) {
-    next({ name: "home" });
+    next({ name: "register" });
     return;
   }
 
diff --git a/src/store/index.js b/src/store/index.js
index ffa6cda..27f5b6d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -17,4 +17,4 @@ export default new Vuex.Store({
   }
 });
 
-export { User, Snackbar };
+export { User, Quiz, Snackbar };
diff --git a/src/store/quiz.js b/src/store/quiz.js
index 1109a2c..90a9d4d 100644
--- a/src/store/quiz.js
+++ b/src/store/quiz.js
@@ -1,11 +1,53 @@
 import { mapState } from "vuex";
+import { quiz } from "@/api";
+import moment from "moment";
 
 const moduleName = "Quiz";
 
+function parseDateResponse(dateResponse) {
+  const timeSplit = dateResponse.split(",");
+  let daysString = "0 days";
+  let timeString = "0:0:0";
+
+  if (timeSplit.length == 1) {
+    // returning only timeString
+    timeString = timeSplit[0];
+  } else if (timeSplit.length == 2) {
+    // returning days and timeString
+    daysString = timeSplit[0];
+    timeString = timeSplit[1];
+  } else {
+    throw new Error("Unexpected error with time response");
+  }
+  const days = parseInt(daysString);
+  const time = timeString.split(":");
+  const hours = time[0];
+  const minutes = time[1];
+  const seconds = time[2];
+  return moment()
+    .add(days, "days")
+    .add(hours, "hours")
+    .add(minutes, "minutes")
+    .add(seconds, "seconds");
+}
+
 function getDefaultState() {
   return {
     hasSeenIntro: false,
-    hasScores: false
+    nextUnlockMoment: moment(),
+    quizStartedMoment: moment(),
+    question: "",
+    asset: "",
+    rank: 0,
+    maxRank: 0,
+    isLastQuestion: false,
+    hints: ["", ""],
+    wrongCount: localStorage.getItem("wrongCount")
+      ? parseInt(localStorage.getItem("wrongCount"))
+      : 0,
+    quizHasStarted: false,
+    quizHasEnded: false,
+    awaitNextQuestion: false
   };
 }
 
@@ -17,17 +59,114 @@ const actions = {
   async markAsSeen({ commit }) {
     commit("hasSeenIntro", true);
   },
-  async setScores({ commit }) {
-    commit("scores", true);
+  async addWrongCount({ state, commit }) {
+    commit("wrongCount", state.wrongCount + 1);
+  },
+  async clearWrongCount({ commit }) {
+    commit("wrongCount", 0);
+  },
+  async refresh({ state, commit }) {
+    // get current rank and see if quiz has started
+    try {
+      const rank = await quiz.getRank();
+      commit("maxRank", rank.maxRank);
+      commit(
+        "quizStartedMoment",
+        moment(rank.startsOn + "+0000", "MM/DD/YYYY HH:mm   Z")
+      );
+      if (rank.rank < 0) {
+        commit("quizHasStarted", false);
+        commit("awaitNextQuestion", false);
+        commit("question", "");
+        commit("asset", "");
+        commit("rank", 0);
+        commit("hints", ["", ""]);
+        commit("nextUnlockMoment", parseDateResponse(rank.timeUntilNextRank));
+        return;
+      }
+      commit("quizHasStarted", true);
+      commit("rank", rank.rank);
+    } catch (err) {
+      if (err.status === 403) {
+        commit("quizHasEnded", true);
+        return;
+      }
+      throw new Error(err);
+    }
+
+    // get current question and see if question is even unlocked
+    try {
+      const response = await quiz.getQuestion();
+      commit("awaitNextQuestion", false);
+      commit("question", response.question);
+      commit("asset", response.asset);
+      commit("rank", response.rank);
+      commit("hints", response.hints);
+      commit("nextUnlockMoment", moment());
+      commit("isLastQuestion", response.rank === state.maxRank);
+    } catch (err) {
+      if (err.status === 404) {
+        commit("awaitNextQuestion", true);
+        commit("question", "");
+        commit("asset", "");
+        commit("rank", 0);
+        commit("hints", ["", ""]);
+        commit(
+          "nextUnlockMoment",
+          parseDateResponse(err.data.timeUntilNextRank)
+        );
+      } else if (err.status === 401) {
+        commit("question", "");
+        commit("asset", "");
+        commit("rank", 0);
+        commit("hints", ["", ""]);
+      } else {
+        return Promise.reject(err);
+      }
+    }
   }
 };
 
 const mutations = {
+  quizHasStarted(state, value) {
+    state.quizHasStarted = value;
+  },
   hasSeenIntro(state, value) {
     state.hasSeenIntro = value;
   },
-  scores() {
-    state.hasScores = true;
+  awaitNextQuestion(state, value) {
+    state.awaitNextQuestion = value;
+  },
+  nextUnlockMoment(state, value) {
+    state.nextUnlockMoment = value;
+  },
+  question(state, value) {
+    state.question = value;
+  },
+  rank(state, value) {
+    state.rank = value;
+  },
+  asset(state, value) {
+    state.asset = value;
+  },
+  quizStartedMoment(state, value) {
+    state.quizStartedMoment = value;
+  },
+  wrongCount(state, value) {
+    state.wrongCount = value;
+    localStorage.setItem("wrongCount", state.wrongCount);
+  },
+  hints(state, value) {
+    state.hints = value;
+  },
+  maxRank(state, value) {
+    state.maxRank = value;
+  },
+  isLastQuestion(state, value) {
+    state.isLastQuestion = value;
+  },
+  quizHasEnded(state, value) {
+    state.quizHasEnded = value;
   }
 };
 
diff --git a/src/store/user.js b/src/store/user.js
index 473eecb..2e75d37 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -23,7 +23,7 @@ const state = {
 const actions = {
   async refresh({ commit }) {
     const user = api.auth.currentUser();
-
+    user.rank = user.rank + 1;
     if (user.auth) {
       commit("set", user);
     } else {
diff --git a/src/styles/quiz-answer.scss b/src/styles/quiz-answer.scss
index 37c2d8d..6c6669d 100644
--- a/src/styles/quiz-answer.scss
+++ b/src/styles/quiz-answer.scss
@@ -8,6 +8,11 @@
     padding: 12px;
     z-index: 2;
 
+    .attempts-remaining{
+      text-align: center;
+      height: 100px;
+    }
+
     .v-btn {
       width: 100%;
       margin-top: 12px;
diff --git a/src/views/ForgotPassword.vue b/src/views/ForgotPassword.vue
index 2bbeda1..9c76307 100644
--- a/src/views/ForgotPassword.vue
+++ b/src/views/ForgotPassword.vue
@@ -19,99 +19,93 @@
           </v-card-text>
 
           <v-card-actions>
-            <v-spacer/>
+            <v-spacer />
             <v-btn color="secondary" type="submit" dark :disabled="isSubmitting"
-            >Send Reset Password Request
-            </v-btn
-            >
+              >Send Reset Password Request
+            </v-btn>
           </v-card-actions>
         </v-form>
       </v-card>
     </v-col>
 
-    <v-dialog
-      v-model="multiple"
-      max-width="290"
-    >
+    <v-dialog v-model="multiple" max-width="290">
       <v-card>
         <v-card-title class="headline">Multiple Accounts</v-card-title>
         <v-card-text>
-          That email address is associated with multiple accounts.
-          Password reset emails have been sent for each account.
-          Double check the email body for the username so that you reset the intended account's password!
+          That email address is associated with multiple accounts. Password
+          reset emails have been sent for each account. Double check the email
+          body for the username so that you reset the intended account's
+          password!
         </v-card-text>
 
         <v-card-actions>
-          <v-spacer/>
+          <v-spacer />
           <v-btn text color="green" @click="multiple = false">OK</v-btn>
         </v-card-actions>
       </v-card>
     </v-dialog>
-
   </v-row>
 </template>
 
 <script>
-  import {auth} from "@/api";
+import { auth } from "@/api";
 
-  export default {
-    name: "forgot-password",
-    methods: {
-      async submit() {
-        try {
-          let res = await auth.forgotPassword(this.fields.username.value);
-          this.multiple = res.multiple;
+export default {
+  name: "forgot-password",
+  methods: {
+    async submit() {
+      try {
+        let res = await auth.forgotPassword(this.fields.username.value);
+        this.multiple = res.multiple;
+        this.$store.dispatch(
+          "Snackbar/showInfo",
+          "A password reset link was sent to your email."
+        );
+      } catch (e) {
+        if (e.status === 400) {
           this.$store.dispatch(
-            "Snackbar/showInfo",
-            "A password reset link was sent to your email."
+            "Snackbar/showError",
+            "No accounts associated with that email address."
           );
-        } catch (e) {
-          if (e.status === 400) {
-            this.$store.dispatch(
-              "Snackbar/showError",
-              "No accounts associated with that email address."
-            );
-            return;
-          }
-          if (e.status === 429) {
-            let totalSeconds = parseInt(e.headers["retry-after"]);
-            let hours = Math.floor(totalSeconds / 3600);
-            totalSeconds %= 3600;
-            let minutes = Math.floor(totalSeconds / 60);
-            let seconds = totalSeconds % 60;
+          return;
+        }
+        if (e.status === 429) {
+          let totalSeconds = parseInt(e.headers["retry-after"]);
+          let hours = Math.floor(totalSeconds / 3600);
+          totalSeconds %= 3600;
+          let minutes = Math.floor(totalSeconds / 60);
+          let seconds = totalSeconds % 60;
 
-            this.$store.dispatch(
-              "Snackbar/showError",
-              `Reset attempts exceeded. Try again in ${hours} hours ${minutes} minutes ${seconds} seconds.`
-            );
-            return;
-          }
           this.$store.dispatch(
             "Snackbar/showError",
-            "Request failed, try again."
+            `Reset attempts exceeded. Try again in ${hours} hours ${minutes} minutes ${seconds} seconds.`
           );
-
-          console.error(e);
-        }
-      },
-      validate() {
-        if (this.$refs.form.validate()) {
-          this.submit();
+          return;
         }
+        this.$store.dispatch(
+          "Snackbar/showError",
+          "Request failed, try again."
+        );
       }
     },
-    data() {
-      return {
-        isSubmitting: false,
-        multiple: false,
-        fields: {
-          username: {
-            label: "Parents E-mail",
-            type: "email",
-            rules: [v => !!v || "Please provide a valid e-mail address"]
-          }
-        }
-      };
+    validate() {
+      if (this.$refs.form.validate()) {
+        this.submit();
+      }
     }
-  };
+  },
+  data() {
+    return {
+      isSubmitting: false,
+      multiple: false,
+      fields: {
+        username: {
+          label: "Parents E-mail",
+          type: "email",
+          rules: [v => !!v || "Please provide a valid e-mail address"]
+        }
+      }
+    };
+  }
+};
 </script>
diff --git a/src/views/Home.vue b/src/views/Home.vue
deleted file mode 100644
index 26e76f7..0000000
--- a/src/views/Home.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div />
-  <!-- <v-row align="center" justify="center">
-    <v-col cols="12" sm="8" md="4">
-      <v-card flat class="mt-12">
-        <v-toolbar color="primary" dark flat>
-          <v-toolbar-title>Home Screen</v-toolbar-title>
-        </v-toolbar>
-
-        <v-card-text style="height: 300px" />
-      </v-card>
-    </v-col>
-	</v-row>-->
-</template>
-
-<script>
-export default {
-  name: "home",
-  mounted() {
-    if (window.location.hostname !== "localhost") {
-      // window.location.replace("/");
-    }
-  }
-};
-</script>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 630c2e1..4833d26 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -43,9 +43,9 @@
 </template>
 
 <script>
-  import {auth} from "@/api";
+import { auth } from "@/api";
 
-  export default {
+export default {
   name: "login",
   methods: {
     async submit() {
diff --git a/src/views/Quiz.vue b/src/views/Quiz.vue
deleted file mode 100644
index b637ff0..0000000
--- a/src/views/Quiz.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <div class="mt-6" v-if="!isLoading">
-    <v-row justify="center">
-      <quiz-scroll>
-        <template v-slot:title>{{ title }}</template>
-        <template v-slot:default>
-          <img class="asset" :src="asset" v-if="!!asset" />
-          <div class="scroll-content" v-html="question" />
-        </template>
-      </quiz-scroll>
-      <quiz-answer @next="onNext" :isLoading="isLoading" v-if="!maxQuiz" />
-    </v-row>
-    <quiz-need-help />
-  </div>
-</template>
-
-<script>
-import QuizScroll from "@/components/QuizScroll";
-import QuizAnswer from "@/components/QuizAnswer";
-import QuizNeedHelp from "@/components/QuizNeedHelp";
-import * as api from "@/api";
-import { User } from "@/store";
-
-export default {
-  name: "quiz",
-  components: {
-    QuizScroll,
-    QuizAnswer,
-    QuizNeedHelp
-  },
-  data() {
-    return {
-      localRank: this.$store.state.User.rank + 1,
-      isLoading: false,
-      actualQuestion: "",
-      actualAsset: "",
-      maxQuiz: false,
-      showIntro: true
-    };
-  },
-  async mounted() {
-    // document.getElementsByTagName("html")[0].style.overflowY = "hidden";
-    // window.scrollTo(0, 0);
-    await this.loadQuestion();
-    this.localRank = this.User.rank + 1;
-  },
-  methods: {
-    async onNext() {
-      this.$store.dispatch("Quiz/setScores");
-      this.$router.push({ name: "quiz-scores" });
-    },
-    async loadQuestion() {
-      this.isLoading = true;
-      this.actualQuestion = "";
-      this.actualAsset = "";
-      try {
-        const data = await api.quiz.getQuestion();
-        this.actualQuestion = data.question;
-        this.actualAsset = data.asset;
-      } catch (err) {
-        if (!!err && !!err.status && err.status == 404) {
-          this.maxQuiz = true;
-        } else {
-          this.$store.dispatch("Snackbar/showError", err);
-        }
-      }
-      this.isLoading = false;
-    }
-  },
-  // beforeDestroy() {
-  // 	// document.getElementsByTagName("html")[0].style.overflowY = "scroll";
-  // },
-  computed: {
-    ...User.mapState(),
-    title() {
-      return this.maxQuiz ? "Challenge Complete!" : "Level " + this.localRank;
-    },
-    question() {
-      if (this.isLoading) {
-        return "Loading...";
-      }
-      if (this.maxQuiz) {
-        return "<center>Thanks for beta testing!</center>";
-      }
-      return this.actualQuestion;
-    },
-    asset() {
-      return !this.isLoading ? this.actualAsset : "";
-    }
-  }
-};
-</script>
diff --git a/src/views/Quiz/CodeEditor.vue b/src/views/Quiz/CodeEditor.vue
new file mode 100644
index 0000000..e5c383e
--- /dev/null
+++ b/src/views/Quiz/CodeEditor.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="codemirror">
+    <!-- codemirror -->
+    <codemirror v-model="code" :options="cmOption"></codemirror>
+  </div>
+</template>
+
+<script>
+// language
+import "codemirror/mode/vue/vue.js";
+import "codemirror/mode/javascript/javascript.js";
+import "codemirror/mode/python/python.js";
+
+// theme css
+import "codemirror/theme/base16-dark.css";
+
+// active-line.js
+import "codemirror/addon/selection/active-line.js";
+
+// styleSelectedText
+import "codemirror/addon/selection/mark-selection.js";
+import "codemirror/addon/search/searchcursor.js";
+
+// highlightSelectionMatches
+import "codemirror/addon/scroll/annotatescrollbar.js";
+import "codemirror/addon/search/matchesonscrollbar.js";
+import "codemirror/addon/search/searchcursor.js";
+import "codemirror/addon/search/match-highlighter.js";
+
+// keyMap
+import "codemirror/mode/clike/clike.js";
+import "codemirror/addon/edit/matchbrackets.js";
+import "codemirror/addon/comment/comment.js";
+import "codemirror/addon/dialog/dialog.js";
+import "codemirror/addon/dialog/dialog.css";
+import "codemirror/addon/search/searchcursor.js";
+import "codemirror/addon/search/search.js";
+import "codemirror/keymap/sublime.js";
+
+// foldGutter
+import "codemirror/addon/fold/foldgutter.css";
+import "codemirror/addon/fold/brace-fold.js";
+import "codemirror/addon/fold/comment-fold.js";
+import "codemirror/addon/fold/foldcode.js";
+import "codemirror/addon/fold/foldgutter.js";
+import "codemirror/addon/fold/indent-fold.js";
+import "codemirror/addon/fold/markdown-fold.js";
+import "codemirror/addon/fold/xml-fold.js";
+
+export default {
+  props: ["value", "language"],
+  computed: {
+    cmOption() {
+      return {
+        tabSize: 4,
+        foldGutter: true,
+        styleActiveLine: true,
+        lineNumbers: true,
+        line: true,
+        keyMap: "sublime",
+        mode: this.language,
+        theme: "base16-dark"
+      };
+    }
+  },
+  watch: {
+    value(val) {
+      if (this.code !== val) {
+        this.code = val;
+      }
+    },
+    code(val) {
+      if (this.value !== val) {
+        this.$emit("input", val);
+      }
+    }
+  },
+  data() {
+    return {
+      code: this.value
+    };
+  }
+};
+</script>
diff --git a/src/views/Quiz/Quiz.vue b/src/views/Quiz/Quiz.vue
new file mode 100644
index 0000000..b94a716
--- /dev/null
+++ b/src/views/Quiz/Quiz.vue
@@ -0,0 +1,52 @@
+<template>
+  <div class="mt-6">
+    <v-row justify="center">
+      <quiz-scroll>
+        <template v-slot:title>Level {{ rank }}</template>
+        <template v-slot:default>
+          <img class="asset" :src="'/' + asset" v-if="!!asset" />
+          <div class="scroll-content" v-html="question" />
+        </template>
+      </quiz-scroll>
+      <quiz-answer :rank="rank" @next="onNext" />
+    </v-row>
+    <quiz-need-help />
+  </div>
+</template>
+
+<script>
+import QuizScroll from "@/components/QuizScroll";
+import QuizAnswer from "./QuizAnswer.vue";
+import QuizNeedHelp from "@/components/QuizNeedHelp";
+import { User, Quiz } from "@/store";
+
+export default {
+  name: "quiz",
+  components: {
+    QuizScroll,
+    QuizAnswer,
+    QuizNeedHelp
+  },
+  data() {
+    return {
+      question: "",
+      rank: "",
+      asset: ""
+    };
+  },
+  async created() {
+    this.question = this.Quiz.question;
+    this.rank = this.Quiz.rank;
+    this.asset = this.Quiz.asset;
+  },
+  methods: {
+    async onNext() {
+      this.$router.go();
+    }
+  },
+  computed: {
+    ...User.mapState(),
+    ...Quiz.mapState()
+  }
+};
+</script>
diff --git a/src/views/Quiz/QuizAnswer.vue b/src/views/Quiz/QuizAnswer.vue
new file mode 100644
index 0000000..661c2c7
--- /dev/null
+++ b/src/views/Quiz/QuizAnswer.vue
@@ -0,0 +1,221 @@
+<template>
+  <div class="quiz-answer">
+    <v-card flat>
+      <img src="/images/dragon1.png" />
+      <v-card-text>
+        <v-form ref="form" @submit.prevent="submit">
+          <v-text-field
+            autocomplete="off"
+            v-model="fields.answer.value"
+            v-bind="fields.answer"
+            :disabled="isDisabled"
+            @blur="onBlur"
+          />
+
+          <v-btn
+            x-large
+            color="primary"
+            v-if="showHint1"
+            @click="showHint1Modal = true"
+            >Hint #1</v-btn
+          >
+          <v-btn
+            x-large
+            color="primary"
+            v-if="showHint2"
+            @click="showHint2Modal = true"
+            >Hint #2</v-btn
+          >
+          <v-btn x-large color="primary" :disabled="isDisabled" type="submit"
+            >Submit</v-btn
+          >
+        </v-form>
+      </v-card-text>
+    </v-card>
+    <v-dialog v-model="showSuccessModal" persistent max-width="400">
+      <v-card>
+        <v-card-title class="headline">Your answer was correct!</v-card-title>
+        <div v-if="Quiz.awaitNextQuestion">
+          <v-card-text>
+            Congratulations, {{ User.displayName }}!
+            <br />
+            You've conquered Level {{ rank }}. {{ successMessage }}
+            <br />
+            <br />
+            That's all the questions available for now. The next question
+            unlocks {{ Quiz.nextUnlockMoment.fromNow() }}
+          </v-card-text>
+          <v-card-actions>
+            <v-btn block color="primary darken-1" @click="next">OKAY</v-btn>
+          </v-card-actions>
+        </div>
+        <div v-else>
+          <v-card-text>
+            Congratulations, {{ User.displayName }}!
+            <br />
+            You've conquered Level {{ rank }}. {{ successMessage }}
+            <br />
+            <br />
+          </v-card-text>
+          <v-card-actions>
+            <v-btn block color="primary darken-1" @click="next"
+              >NEXT QUESTION</v-btn
+            >
+          </v-card-actions>
+        </div>
+      </v-card>
+    </v-dialog>
+
+    <v-dialog v-model="showRateLimitModal" persistent max-width="400">
+      <v-card>
+        <v-card-title class="headline">Woah slow down!</v-card-title>
+        <v-card-text
+          >We noticed you are submitting a lot of requests. Please wait 60
+          seconds before submitting another answer.</v-card-text
+        >
+        <v-card-actions>
+          <v-btn
+            block
+            color="primary darken-1"
+            @click="showRateLimitModal = false"
+            >OKAY</v-btn
+          >
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
+    <v-dialog v-model="showHint1Modal" persistent max-width="400">
+      <v-card>
+        <v-card-title class="headline">HINT #1</v-card-title>
+        <v-card-text>{{ Quiz.hints[0] }}</v-card-text>
+        <v-card-actions>
+          <v-btn block color="primary darken-1" @click="showHint1Modal = false"
+            >OKAY</v-btn
+          >
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
+    <v-dialog v-model="showHint2Modal" persistent max-width="400">
+      <v-card>
+        <v-card-title class="headline">HINT #2</v-card-title>
+        <v-card-text>{{ Quiz.hints[1] }}</v-card-text>
+        <v-card-actions>
+          <v-btn block color="primary darken-1" @click="showHint2Modal = false"
+            >OKAY</v-btn
+          >
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+  </div>
+</template>
+
+<script>
+import * as api from "@/api";
+import { User, Quiz } from "@/store";
+
+export default {
+  name: "quizAnswer",
+  props: ["rank"],
+  computed: {
+    ...Quiz.mapState(),
+    ...User.mapState(),
+    isDisabled() {
+      return this.isSubmitting || this.wasCorrect;
+    },
+    successMessage() {
+      return this.successMessages[
+        Math.floor(Math.random() * this.successMessages.length)
+      ];
+    },
+    showHint1() {
+      return this.Quiz.wrongCount > 0;
+    },
+    showHint2() {
+      return this.Quiz.wrongCount > 1;
+    }
+  },
+  data() {
+    return {
+      successMessages: [
+        "Your coding skills are quite admirable. ",
+        "You really are the best. "
+      ],
+      isSubmitting: false,
+      wasCorrect: false,
+      attemptsRemaining: 3,
+      totalAttempts: 3,
+      showSuccessModal: false,
+      showRateLimitModal: false,
+      showHint1Modal: false,
+      showHint2Modal: false,
+      fields: {
+        answer: {
+          label: "Your Answer",
+          value: "",
+          rules: [v => !!v || "You forgot to include an answer!"],
+          errorMessages: [],
+          successMessages: [],
+          success: false
+        }
+      }
+    };
+  },
+  methods: {
+    onBlur() {
+      this.fields.answer.errorMessages = [];
+      if (!this.fields.answer.value) {
+        this.$refs.form.resetValidation();
+      }
+    },
+    async next() {
+      try {
+        this.showSuccessModal = false;
+        this.fields.answer.value = "";
+        this.fields.answer.successMessages = [];
+        this.fields.answer.success = false;
+        this.$refs.form.resetValidation();
+        this.$emit("next");
+      } catch (err) {
+        await this.$store.dispatch("Snackbar/showError", err);
+      }
+    },
+    async submit() {
+      if (!this.$refs.form.validate()) {
+        return;
+      }
+
+      if (this.isSubmitting) {
+        return false;
+      }
+      this.isSubmitting = true;
+      try {
+        const isCorrect = await api.quiz.submit(this.fields.answer.value);
+
+        if (isCorrect) {
+          await this.$store.dispatch("Quiz/clearWrongCount");
+          await api.auth.fetchState();
+          await this.$store.dispatch("Quiz/refresh");
+          this.showSuccessModal = true;
+          this.fields.answer.successMessages = ["Your answer was correct!"];
+          this.fields.answer.success = true;
+        } else {
+          this.$store.dispatch("Quiz/addWrongCount");
+          this.$store.dispatch(
+            "Snackbar/showError",
+            "That answer was not correct"
+          );
+          this.fields.answer.errorMessages = ["That answer was not correct"];
+        }
+      } catch (err) {
+        if (err.status === 429) {
+          this.showRateLimitModal = true;
+        } else {
+          this.$store.dispatch("Snackbar/showError", err);
+        }
+      }
+      this.isSubmitting = false;
+    }
+  }
+};
+</script>
diff --git a/src/views/Quiz/QuizCountdown.vue b/src/views/Quiz/QuizCountdown.vue
new file mode 100644
index 0000000..df24cb8
--- /dev/null
+++ b/src/views/Quiz/QuizCountdown.vue
@@ -0,0 +1,55 @@
+<template>
+  <div class="mt-6">
+    <v-row justify="center">
+      <quiz-scroll v-if="Quiz.awaitNextQuestion">
+        <template v-slot:title>Next Challenge</template>
+        <template v-slot:default>
+          <div v-if="Quiz.awaitNextQuestion">
+            Congratulations, {{ User.displayName }}!
+            <br />
+            You've conquered Level {{ User.rank }}.
+            <br />
+            <br />That's all the questions available for now.
+            <br />
+            The next question unlocks {{ Quiz.nextUnlockMoment.fromNow() }}
+          </div>
+          <div v-else>
+            Congratulations, {{ User.displayName }}!
+            <br />
+            You've conquered Level {{ User.rank }}.
+            <br />
+            <br />
+          </div>
+        </template>
+      </quiz-scroll>
+      <quiz-scroll v-else-if="!Quiz.quizHasStarted">
+        <template v-slot:title>Woah Slow Down!</template>
+        <template v-slot:default>
+          <p class="text-center">The challenge has not yet begun!</p>
+          <p>Challenge begins: {{ Quiz.quizStartedMoment.fromNow() }}</p>
+        </template>
+      </quiz-scroll>
+    </v-row>
+  </div>
+</template>
+
+<script>
+import QuizScroll from "@/components/QuizScroll";
+import { Quiz, User } from "@/store";
+export default {
+  name: "quiz",
+  components: {
+    QuizScroll
+  },
+  computed: {
+    ...User.mapState(),
+    ...Quiz.mapState()
+  },
+  methods: {
+    async onClick() {
+      await this.$store.dispatch("Quiz/markAsSeen");
+      this.$router.push({ name: "quiz" });
+    }
+  }
+};
+</script>
diff --git a/src/views/Quiz/QuizFinalQuestion.vue b/src/views/Quiz/QuizFinalQuestion.vue
new file mode 100644
index 0000000..6efdfd4
--- /dev/null
+++ b/src/views/Quiz/QuizFinalQuestion.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="mt-6" v-if="!isLoading">
+    <v-container>
+      <v-row justify="center">
+        <v-col>
+          <v-card>
+            <br />
+            <v-card-text v-html="question"></v-card-text>
+            <v-card-title>Code your answer!</v-card-title>
+
+            <v-form ref="form" @submit.prevent="submit">
+              <v-card-text v-if="!!errorMessage">
+                <v-alert prominent type="error" color="red darken-4">
+                  <v-row align="center">
+                    <v-col class="grow">{{ errorMessage }}</v-col>
+                    <v-col class="shrink">
+                      <v-btn color="white" light @click="errorMessage = false"
+                        >Dismiss</v-btn
+                      >
+                    </v-col>
+                  </v-row>
+                </v-alert>
+              </v-card-text>
+              <v-card-text v-if="hasRightAnswer">
+                <v-alert prominent type="success" color="secondary darken-2">
+                  <v-row align="center">
+                    <v-col class="grow">
+                      You got the right answer! Go ahead and review your code.
+                      When you're ready to submit go ahead and click "Submit
+                      Answer"
+                    </v-col>
+                  </v-row>
+                </v-alert>
+              </v-card-text>
+              <v-card-text>
+                <v-select
+                  v-bind="fields.language"
+                  v-model="fields.language.value"
+                />
+                <code-editor
+                  v-bind="fields.code"
+                  v-model="fields.code.value"
+                  :language="fields.language.value"
+                />
+              </v-card-text>
+              <v-card-actions>
+                <v-spacer />
+                <v-btn
+                  :disabled="isSubmitting"
+                  large
+                  color="secondary darken-2"
+                  @click="checkAnswer"
+                  >Check Answer</v-btn
+                >
+                <v-btn
+                  type="submit"
+                  :disabled="isSubmitting || !hasRightAnswer"
+                  large
+                  color="secondary darken-2"
+                  >Submit Answer</v-btn
+                >
+              </v-card-actions>
+            </v-form>
+          </v-card>
+        </v-col>
+      </v-row>
+    </v-container>
+    <!-- <quiz-need-help /> -->
+  </div>
+</template>
+
+<script>
+import CodeEditor from "./CodeEditor";
+import * as api from "@/api";
+import { User, Quiz } from "@/store";
+
+export default {
+  name: "quiz",
+  components: {
+    CodeEditor
+  },
+  data() {
+    const jsCode = `function calculateAnswer(){
+  return 100;
+}
+var output = calculateAnswer();`;
+    const pyCode = `def calculateAnswer():
+  return 100
+
+output = calculateAnswer()`;
+    return {
+      isLoading: false,
+      isSubmitting: false,
+      hasRightAnswer: false,
+      question: "",
+      rank: "",
+      asset: "",
+      errorMessage: false,
+      pyCode,
+      jsCode,
+      fields: {
+        code: {
+          label: "Enter your code",
+          value: jsCode
+        },
+        language: {
+          label: "Choose your language",
+          value: "javascript",
+          items: ["javascript", "python"]
+        }
+      }
+    };
+  },
+  watch: {
+    ["fields.language.value"](val) {
+      if (val === "javascript") {
+        this.fields.code.value = this.jsCode;
+      } else {
+        this.fields.code.value = this.pyCode;
+      }
+    },
+    ["fields.code.value"](val) {
+      if (this.fields.language.value === "javascript") {
+        this.jsCode = val;
+      } else {
+        this.pyCode = val;
+      }
+    }
+  },
+  async mounted() {
+    this.question = this.Quiz.question;
+    this.rank = this.Quiz.rank;
+    this.asset = this.Quiz.asset;
+  },
+  methods: {
+    async makeRequest(checkOnly) {
+      const response = await api.quiz.submitFinal(
+        this.fields.code.value,
+        this.fields.language.value === "javascript" ? "js" : "py",
+        checkOnly
+      );
+      const isCorrect = response.correct;
+
+      if (isCorrect) {
+        return true;
+      } else {
+        if (response.js_error) {
+          return Promise.reject(response.js_error);
+        } else {
+          return Promise.reject(
+            "Hmmm.... Your code doesn't seem to generate the correct answer. Try again."
+          );
+        }
+      }
+    },
+    async checkAnswer() {
+      if (this.isSubmitting) {
+        return false;
+      }
+      this.hasRightAnswer = false;
+      this.errorMessage = false;
+      this.isSubmitting = true;
+
+      try {
+        const response = await this.makeRequest(true);
+        if (response !== true) {
+          return Promise.reject(response);
+        } else {
+          this.hasRightAnswer = true;
+        }
+      } catch (err) {
+        this.errorMessage = err;
+      }
+      this.isSubmitting = false;
+    },
+    async submit() {
+      if (this.isSubmitting) {
+        return false;
+      }
+      this.hasRightAnswer = false;
+      this.errorMessage = false;
+      this.isSubmitting = true;
+
+      try {
+        const response = await this.makeRequest(false);
+        if (response !== true) {
+          return Promise.reject(response);
+        } else {
+          this.$router.go();
+        }
+      } catch (err) {
+        this.errorMessage = err;
+      }
+      this.isSubmitting = false;
+    }
+  },
+  computed: {
+    ...User.mapState(),
+    ...Quiz.mapState()
+  }
+};
+</script>
diff --git a/src/views/Quiz/QuizFinished.vue b/src/views/Quiz/QuizFinished.vue
new file mode 100644
index 0000000..32e7ccb
--- /dev/null
+++ b/src/views/Quiz/QuizFinished.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="mt-6">
+    <v-row justify="center">
+      <quiz-scroll>
+        <template v-slot:title>The Challenge Is Over</template>
+        <template v-slot:default>Thank you for playing!</template>
+      </quiz-scroll>
+    </v-row>
+  </div>
+</template>
+
+<script>
+import QuizScroll from "@/components/QuizScroll";
+export default {
+  name: "quiz",
+  components: {
+    QuizScroll
+  },
+  mounted() {}
+};
+</script>
diff --git a/src/views/QuizIntro.vue b/src/views/Quiz/QuizIntro.vue
similarity index 100%
rename from src/views/QuizIntro.vue
rename to src/views/Quiz/QuizIntro.vue
diff --git a/src/views/QuizScores.vue b/src/views/QuizScores.vue
deleted file mode 100644
index 3fd5535..0000000
--- a/src/views/QuizScores.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <v-row align="center" justify="center">
-    <v-col cols="12" sm="8" md="4">
-      <v-card flat class="mt-12">
-        <v-toolbar color="secondary" dark flat>
-          <v-toolbar-title>Your scores</v-toolbar-title>
-        </v-toolbar>
-
-        <v-card-text style="height: 300px"
-          >This page is not implemented. You would see some stats
-          here.</v-card-text
-        >
-        <v-card-actions>
-          <v-spacer />
-          <v-btn :to="{ name: 'quiz' }">Next</v-btn>
-        </v-card-actions>
-      </v-card>
-    </v-col>
-  </v-row>
-</template>
-
-<script>
-export default {
-  name: "home"
-};
-</script>
diff --git a/src/views/Register/Step3.vue b/src/views/Register/Step3.vue
index 6f85aac..0ead2f6 100644
--- a/src/views/Register/Step3.vue
+++ b/src/views/Register/Step3.vue
@@ -3,72 +3,18 @@
     <v-card-text>
       <v-card max-height="500" style="overflow-y:scroll;">
         <v-card-text>
-          Terms Of Service: What Is It? A Terms of Service, or TOS, is a set of
-          rules that a user must agree to before they can engage in services or
-          use a product. It can also serve as a disclaimer under certain
-          conditions, such as for website use. A properly executed Terms of
-          Service is legally binding for both parties. A Terms of Service
-          agreement usually has many different sections, such as definitions,
-          user rights and responsibilities, and disclaimers. Terms of Service
-          can change often, and they will need to be re-accepted as changes are
-          made to the agreement. It is important to any company or business to
-          include as much information as possible in their Terms of Service to
-          avoid problems in the future. Getting legal counsel for the Terms of
-          Service can ensure no major points have been missed and that the Terms
-          of Service is legally binding to users. Click here to get started now!
-          Recent Reviews “I am very pleased with FormSwift products and have
-          already recommended them to a number of my friends. The ease of
-          creating documents has saved me countless hours.” -Carrie L. "I love
-          FormSwift. There have been so many new documents added since first
-          signing up. They walk you through every step. Great job and thanks for
-          everything you guys do for making this happen." -John M. "FormSwift
-          was very easy to use, even for someone who is not very tech savvy like
-          me. Will use again." -Phil T. What Are Terms of Service? what are
-          terms of service Terms of service perform two essential functions. The
-          first is to educate your customers on the rules of using your products
-          and services. The second is to protect your company from lawsuits .
-          The TOS is a simple enough document to draw up, whether you’re using a
-          free terms of service generator or working from a sample. Terms of
-          service should be one of the first documents issued to your clients,
-          and you should be sure to get it read and signed by each client before
-          proceeding with their business. Part One - Language A TOS starts off
-          by familiarizing the reader with the terms that will be used
-          throughout the document. Generally these terms are fairly, well,
-          general ones, such as “Terms,” “Services,” “The Company,” etc. Part
-          Two – Rules of the Road. The TOS then goes on to outline the rights
-          and responsibilities of the user. The key to this section is to keep
-          it short and sweet while including all relevant detail. The best
-          approach is to tell your client what they can’t do rather than what
-          they can do. Omission is more illustrative than inclusion. Plus, it’s
-          a good idea to keep the TOS as short as possible so people actually
-          them. Part Three – What Is and Is Not Your Company’s Fault Limit your
-          liabilities. Limit them as much as you can, and make their limits
-          clear. For example: TO THE MAXIMUM EXTENT PERMITTED BY LAW,
-          ARTHURMACARTHUR, INC. SHALL NOT BE LIABLE FOR AN YDIRECT, INDIRECT,
-          INCIDENTAL, CONSEQUENTIAL, OR SPECIAL DAMAGES OR LOSSES, WHETHER
-          TANGIBLE OR INTANGIBLE, RESULTING FROM AUTHORIZED OR UNAUTHORIZED USE
-          OF OR ACCESS TO OUR PRODUCTS You also might want to include a
-          disclaimer or return policy, particularly if you’re in the retail
-          business. This protects you from customers blaming you for damaged
-          goods: SUPERDUPER, INC. IS NOT RESPONSIBLE FOR THE CONDITIONS OF ITS
-          MERCHANDISE. THE COMPANY SELLS ALL ITS MERCHANDISE ON AN “AS IS” BASIS
-          AND ASSUMES NO LIABILITY OR RESPONSIBILITY FOR ANY DAMAGES INCURRED IN
-          THE TRANSFER OR USE OF OUR PRODUCTS BY YOU OR ANY THIRD PARTY. Part
-          Four – Verification Put a statement at the end like, “I have read and
-          agreed to abide by PenDragonPencil’s Terms of Service.” If you’re
-          issuing a paper TOS, follow this with a place for the user to print
-          his or her name and sign and date the form provide instructions as to
-          how the document should be returned to the company. If your TOS is
-          online, you can just have the user insert his or her initials and hit
-          the “I Agree” button.
+          <terms-of-service-content />
         </v-card-text>
       </v-card>
     </v-card-text>
 
-    <v-card-actions>
-      <v-spacer />
-      <v-switch v-model="fields.tos.vale" v-bind="fields.tos"></v-switch>
-    </v-card-actions>
+    <v-row>
+      <v-col cols="7"></v-col>
+      <v-col>
+        <v-switch v-model="fields.tos.value" v-bind="fields.tos"></v-switch>
+        <v-switch v-model="fields.tos2.value" v-bind="fields.tos2"></v-switch>
+      </v-col>
+    </v-row>
 
     <v-card-actions>
       <v-btn
@@ -100,9 +46,12 @@
 </template>
 
 <script>
+import TermsOfServiceContent from "@/components/TermsOfServiceContent";
+
 export default {
   name: "register-step-2",
   props: ["fields"],
+  components: { TermsOfServiceContent },
   methods: {
     async submit() {
       if (this.isSubmitting) {
diff --git a/src/views/Register/index.vue b/src/views/Register/index.vue
index 1a1b437..56af70d 100644
--- a/src/views/Register/index.vue
+++ b/src/views/Register/index.vue
@@ -156,9 +156,17 @@ export default {
           rules: [v => !!v || "Please enter a date of birth"]
         },
         tos: {
-          label: "I agree to the Terms of Use",
+          label: "I agree to the Terms of Use and Privacy Policy",
           value: false,
-          rules: [v => !!v || "You must agree to the Terms of Use"]
+          rules: [
+            v => !!v || "You must agree to the Terms of Use and Privacy Policy"
+          ]
+        },
+        tos2: {
+          label:
+            "I agree to receive Code Challenge related updates and offers (you may unsubscribe at any time)",
+          value: false,
+          rules: [v => !!v || "You must agree to recieve e-mail"]
         }
       }
     };
diff --git a/src/views/ResetPassword.vue b/src/views/ResetPassword.vue
index 70aeb88..b839c05 100644
--- a/src/views/ResetPassword.vue
+++ b/src/views/ResetPassword.vue
@@ -7,9 +7,7 @@
         </v-toolbar>
         <v-form @submit.prevent="validate" ref="form">
           <v-card-text>
-            <p>
-              Create a new password.
-            </p>
+            <p>Create a new password.</p>
 
             <v-text-field
               v-bind="fields.password"
@@ -26,7 +24,7 @@
           <v-card-actions>
             <v-spacer />
             <v-btn color="secondary" type="submit" dark :disabled="isSubmitting"
-            >Reset Password</v-btn
+              >Reset Password</v-btn
             >
           </v-card-actions>
         </v-form>
@@ -36,66 +34,65 @@
 </template>
 
 <script>
-  import {auth} from "@/api";
+import { auth } from "@/api";
 
-  export default {
-    name: "reset-password",
-    created() {
-      if (! this.$route.params.token) {
+export default {
+  name: "reset-password",
+  created() {
+    if (!this.$route.params.token) {
+      this.$store.dispatch(
+        "Snackbar/showError",
+        "Missing token from URL. Password cannot be reset."
+      );
+      this.$router.push({ name: "forgot-password" });
+    }
+  },
+  methods: {
+    async submit() {
+      try {
+        await auth.resetPassword(
+          this.$route.params.token,
+          this.fields.password.value
+        );
         this.$store.dispatch(
-          "Snackbar/showError",
-          "Missing token from URL. Password cannot be reset."
+          "Snackbar/showInfo",
+          "Password reset successfully. You may now login."
         );
-        this.$router.push({ name: "forgot-password" });
+        this.$router.push({ name: "login" });
+      } catch (e) {
+        this.$store.dispatch("Snackbar/showError", "Request failed");
       }
     },
-    methods: {
-      async submit() {
-        try {
-          await auth.resetPassword(this.$route.params.token, this.fields.password.value);
-          this.$store.dispatch(
-            "Snackbar/showInfo",
-            "Password reset successfully. You may now login."
-          );
-          this.$router.push({ name: "login" })
-        } catch (e) {
-          console.error(e);
-          this.$store.dispatch(
-            "Snackbar/showError",
-            "Request failed"
-          );
-        }
-      },
-      validate() {
-        if (this.$refs.form.validate()) {
-          this.submit();
-        }
+    validate() {
+      if (this.$refs.form.validate()) {
+        this.submit();
       }
-    },
-    data() {
-      return {
-        isSubmitting: false,
-        fields: {
-          password: {
-            label: "Password",
-            type: "password",
-            autocomplete: "new-password",
-            value: "",
-            rules: [
-              v => !!v || "Don't forget to give a password",
-              v => v.length >= 8 || "Password must be at least 8 characters"
-            ]
-          },
-          passwordConfirm: {
-            label: "Confirm Password",
-            type: "password",
-            value: "",
-            rules: [
-              v => v == this.fields.password.value || "Passwords do not match"
-            ]
-          },
-        }
-      };
     }
-  };
+  },
+  data() {
+    return {
+      isSubmitting: false,
+      fields: {
+        password: {
+          label: "Password",
+          type: "password",
+          autocomplete: "new-password",
+          value: "",
+          rules: [
+            v => !!v || "Don't forget to give a password",
+            v => v.length >= 8 || "Password must be at least 8 characters"
+          ]
+        },
+        passwordConfirm: {
+          label: "Confirm Password",
+          type: "password",
+          value: "",
+          rules: [
+            v => v == this.fields.password.value || "Passwords do not match"
+          ]
+        }
+      }
+    };
+  }
+};
 </script>
diff --git a/tests/conftest.py b/tests/conftest.py
index f701485..8d1b5e1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -20,6 +20,7 @@ def client(app):
     app.config["MAIL_SUPPRESS_SEND"] = True
     app.config["CODE_CHALLENGE_START"] = time.time()
     app.config["SANDBOX_API_URL"] = os.getenv("SANDBOX_API_URL")
+    app.config["ANSWER_ATTEMPT_LIMIT"] = "3/minute"
 
     with app.test_client() as client:
         with app.app_context():
diff --git a/tests/test_question.py b/tests/test_question.py
index af27755..3aa2b20 100644
--- a/tests/test_question.py
+++ b/tests/test_question.py
@@ -23,6 +23,7 @@ def client_challenge_today():
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
     app.config["CODE_CHALLENGE_START"] = time.time()
     app.config["ALLOW_RESET"] = True
+    app.config["ANSWER_ATTEMPT_LIMIT"] = "3/minute"
 
     with app.test_client() as client:
         with app.app_context():
@@ -50,6 +51,7 @@ def client_challenge_future():
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
     app.config["CODE_CHALLENGE_START"] = CC_2D_FUTURE
     app.config["SANDBOX_API_URL"] = os.getenv("SANDBOX_API_URL")
+    app.config["ANSWER_ATTEMPT_LIMIT"] = "3/minute"
 
     with app.test_client() as client:
         with app.app_context():
@@ -62,6 +64,7 @@ def client_challenge_past():
     app.config["TESTING"] = True
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
     app.config["CODE_CHALLENGE_START"] = CC_2D_PRIOR
+    app.config["ANSWER_ATTEMPT_LIMIT"] = "3/minute"
 
     with app.test_client() as client:
         with app.app_context():
@@ -74,6 +77,7 @@ def client_challenge_lastq():
     app.config["TESTING"] = True
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
     app.config["CODE_CHALLENGE_START"] = CC_4D_PRIOR
+    app.config["ANSWER_ATTEMPT_LIMIT"] = "3/minute"
 
     with app.test_client() as client:
         with app.app_context():
diff --git a/yarn.lock b/yarn.lock
index 904cd4b..7202fef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2199,6 +2199,11 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
+codemirror@^5.41.0:
+  version "5.51.0"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.51.0.tgz#7746caaf5223e68f5c55ea11e2f3cc82a9a3929e"
+  integrity sha512-vyuYYRv3eXL0SCuZA4spRFlKNzQAewHcipRQCOKgRy7VNAvZxTKzbItdbCl4S5AgPZ5g3WkHp+ibWQwv9TLG7Q==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2883,6 +2888,11 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+diff-match-patch@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
+  integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -8428,6 +8438,11 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+vue-cli-plugin-codemirror@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/vue-cli-plugin-codemirror/-/vue-cli-plugin-codemirror-0.0.6.tgz#ccc884bfe4b96eb453379d604fe10ba902b9b4fa"
+  integrity sha512-F6eRARgT2XoJlcOkRRn5TS3W/i/vyQ0oXNvQiOhd7DXclfgCgHv4V9PpoIYYASbAjdJlqpsUMc4k1Dau6QOxgg==
+
 vue-cli-plugin-vuetify@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.2.tgz#160e573d59f2594b89531e95b0fdd74ca76ecd9d"
@@ -8436,6 +8451,14 @@ vue-cli-plugin-vuetify@^2.0.2:
     semver "^6.0.0"
     shelljs "^0.8.3"
 
+vue-codemirror@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/vue-codemirror/-/vue-codemirror-4.0.6.tgz#b786bb80d8d762a93aab8e46f79a81006f0437c4"
+  integrity sha512-ilU7Uf0mqBNSSV3KT7FNEeRIxH4s1fmpG4TfHlzvXn0QiQAbkXS9lLfwuZpaBVEnpP5CSE62iGJjoliTuA8poQ==
+  dependencies:
+    codemirror "^5.41.0"
+    diff-match-patch "^1.0.0"
+
 vue-eslint-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"