diff --git a/config/SafetyQuiz.yaml b/config/SafetyQuiz.yaml
index f759f03..b924b71 100644
--- a/config/SafetyQuiz.yaml
+++ b/config/SafetyQuiz.yaml
@@ -9,11 +9,13 @@ Questions:
   #    - {Label: "[Text for this label]", Value: [True/False representing if this is the correct answer]}
   Q1:
     Text: "Some safety topics in J.V. Manufacturing Safety Orientation Training are General Safety, Safe Lifting, Fall Protection and Forklift Training."
+    Answer: A
     Choices:
       - {Label: "True", Value: true}
       - {Label: "False", Value: false}
   Q2:
     Text: "Accidents are caused by:"
+    Answer: D
     Choices:
       - {Label: "Unsafe acts of another employee.", Value: False}
       - {Label: "Shortcuts taken by employees", Value: False}
@@ -21,11 +23,13 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q3:
     Text: "The Universal Precautions is to treat all blood, body fluids and potential infectious materials as if they were not infectious"
+    Answer: B
     Choices:
       - {Label: "True", Value: False}
       - {Label: "False", Value: True}
   Q4:
     Text: "With the Control of bleeding with spurting blood you should:"
+    Answer: D
     Choices:
       - {Label: "Wear Gloves", Value: False}
       - {Label: "Wear Gloves and eyewear", Value: False}
@@ -33,6 +37,7 @@ Questions:
       - {Label: "Wear Gloves, eyewear, mask, and apron", Value: True}
   Q5:
     Text: "Proper lifting techniques include:"
+    Answer: A
     Choices:
       - {Label: "Bending knees, not wisting at the waist and having a clear path", Value: True}
       - {Label: "Bending knees, jerk load straight up and drop the load when setting it down", Value: False}
@@ -40,6 +45,7 @@ Questions:
       - {Label: "Bending knees, getting a helper, and pulling the load across the floor", Value: False}
   Q6:
     Text: "When using power grinders you should:"
+    Answer: D
     Choices:
       - {Label: "Wear safety glasses and a face shield", Value: False}
       - {Label: "Never clamp a handheld grinder in a vise", Value: False}
@@ -47,6 +53,7 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q7:
     Text: "When moving compressed gas cylinders used in welding operations:"
+    Answer: A
     Choices:
       - {Label: "Don't drop or bang cylinders. Always secure them in an upright position.", Value: True}
       - {Label: "Lift cylinders by their caps.", Value: False}
@@ -54,6 +61,7 @@ Questions:
       - {Label: "Both A and B", Value: False}
   Q8:
     Text: "Fall protection systems should prevent workers from falling more than:"
+    Answer: B
     Choices:
       - {Label: "2 Feet", Value: False}
       - {Label: "4 Feet", Value: True}
@@ -61,6 +69,7 @@ Questions:
       - {Label: "8 Feet", Value: False}
   Q9:
     Text: "Common fall protection systems are:"
+    Answer: D
     Choices:
       - {Label: "Guard rail systems and toe boards.", Value: False}
       - {Label: "Safety net systems.", Value: False}
@@ -68,6 +77,7 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q10:
     Text: "Hearing protection is important to wear when working in noisy situations."
+    Answer: C
     Choices:
       - {Label: "Only on the job.", Value: False}
       - {Label: "Only at home.", Value: False}
@@ -75,6 +85,7 @@ Questions:
       - {Label: "None of the above.", Value: False}
   Q11:
     Text: "What equipment is typically considered eye protection?"
+    Answer: D
     Choices:
       - {Label: "Face shields.", Value: False}
       - {Label: "Goggles.", Value: False}
@@ -82,6 +93,7 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q12:
     Text: "When a foreign object or chemical is in your eye, you should:"
+    Answer: A
     Choices:
       - {Label: "Flush your eyes with water.", Value: True}
       - {Label: "Rub your eye until it is removed.", Value: False}
@@ -89,6 +101,7 @@ Questions:
       - {Label: "All of the above", Value: False}
   Q13:
     Text: "Foot protection is made to meet a variety of occupational needs, including:"
+    Answer: D
     Choices:
       - {Label: "Reducing static electricity of the wearer.", Value: False}
       - {Label: "Protecting the toes from crushing injuries.", Value: False}
@@ -96,6 +109,7 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q14:
     Text: "Hazards to hands include:"
+    Answer: D
     Choices:
       - {Label: "Cuts, abrasions, punctures and crushing from machinery.", Value: False}
       - {Label: "Rashes from biological agents and chemicals.", Value: False}
@@ -103,6 +117,7 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q15:
     Text: "The purpose of Lockout/Tagout is:"
+    Answer: C
     Choices:
       - {Label: "To make it hard to service a piece of equipment.", Value: False}
       - {Label: "To keep all employees away from the equipment.", Value: False}
@@ -110,6 +125,7 @@ Questions:
       - {Label: "None of the above", Value: False}
   Q16:
     Text: "In order to prevent injuries due to a machine accidentally starting up during servicing:"
+    Answer: A
     Choices:
       - {Label: "An authorized worker should perform Lockout/Tagout procedures.", Value: True}
       - {Label: "An affected worker should perform Lockout/Tagout procedures.", Value: False}
@@ -117,6 +133,7 @@ Questions:
       - {Label: "None of the above", Value: False}
   Q17:
     Text: "Machine guards are used to:"
+    Answer: D
     Choices:
       - {Label: "Prevent injuries.", Value: False}
       - {Label: "Protect the operator.", Value: False}
@@ -124,6 +141,7 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q18:
     Text: "The point of operation is:"
+    Answer: C
     Choices:
       - {Label: "A rotation machine part.", Value: False}
       - {Label: "An access port for routine maintenance.", Value: False}
@@ -131,6 +149,7 @@ Questions:
       - {Label: "Part of the machine's operating procedures.", Value: False}
   Q19:
     Text: "Damaged guards:"
+    Answer: B
     Choices:
       - {Label: "Offer enough protection.", Value: False}
       - {Label: "Need to be repaired or replaced.", Value: True}
@@ -138,6 +157,7 @@ Questions:
       - {Label: "None of the above", Value: False}
   Q20:
     Text: "The hazard communication standard provides for:"
+    Answer: A
     Choices:
       - {Label: "Training, labeling and MSDS's.", Value: True}
       - {Label: "Annual training, testing and labels.", Value: False}
@@ -145,6 +165,7 @@ Questions:
       - {Label: "None of the above", Value: False}
   Q21:
     Text: "Flammable materials..."
+    Answer: D
     Choices:
       - {Label: "are able to catch on fire and burn.", Value: False}
       - {Label: "Will not burn.", Value: False}
@@ -152,6 +173,7 @@ Questions:
       - {Label: "Both A and C", Value: True}
   Q22:
     Text: "What is the path by which chemicals enter the body?"
+    Answer: D
     Choices:
       - {Label: "Inhalation.", Value: False}
       - {Label: "Ingestion.", Value: False}
@@ -159,6 +181,7 @@ Questions:
       - {Label: "All of the above", Value: True}
   Q23:
     Text: "Safety rules for cranes allow:"
+    Answer: D
     Choices:
       - {Label: "Walking away from the crane with a load suspended.", Value: False}
       - {Label: "Lifting loads over employees working.", Value: False}
@@ -166,16 +189,19 @@ Questions:
       - {Label: "Move more slowly; Avoid sudden acceleration or deceleration.", Value: True}
   Q24:
     Text: "Allowing someone to ride the hook of a crane or load during hoisting, lowering or traveling is ok, as long as it is done during working hours."
+    Answer: B
     Choices:
       - {Label: "True", Value: False}
       - {Label: "False", Value: True}
   Q25:
     Text: "The Emergency Action Plan is a plan with a safe means of evacuation in case of a fire or weather related emergency for J.V. Mfg., employees and visitors."
+    Answer: A
     Choices:
       - {Label: "True", Value: True}
       - {Label: "false", Value: False}
   Q26:
     Text: "In the Emergency Action Plan, a fire breaks out in the paint room and a code is called out over the intercom. What is the correct code?"
+    Answer: C
     Choices:
       - {Label: "Code Green, Paint Room", Value: False}
       - {Label: "Code Blue, Paint Room", Value: False}
@@ -183,6 +209,7 @@ Questions:
       - {Label: "Code Yellow, Paint Room", Value: False}
   Q27:
     Text: "When using a fire extinguisher, you should use the PASS method for fighting fires."
+    Answer: B
     Choices:
       - {Label: "Pull, alarm, squeeze and sweep.", Value: False}
       - {Label: "Pull, aim, squeeze and sweep.", Value: True}
@@ -190,6 +217,7 @@ Questions:
       - {Label: "Pull, alarm, squeeze and shout out loud.", Value: False}
   Q28:
     Text: "If an employee is injured:"
+    Answer: C
     Choices:
       - {Label: "Report it to your supervisor.", Value: False}
       - {Label: "Call the first response team.", Value: False}