diff --git a/forms/questionnaire.html b/forms/questionnaire.html
index 161a706..ac3c4fe 100644
--- a/forms/questionnaire.html
+++ b/forms/questionnaire.html
@@ -14,21 +14,123 @@
             <img src="../assets/img/ccah-logo.png" alt="CCAH Logo" style="max-height:100px;">
         </div>
         <h3 class="text-center">CCAH IT Assessment Questionnaire</h3>
+        
         <form id="assessment-form">
-            <!-- Sample question block -->
+            <!-- General Information -->
             <div class="mb-3">
                 <label class="form-label">Role/Title at CCAH</label>
                 <input type="text" class="form-control" name="role" required>
             </div>
-            
-            <!-- Add more questions similarly -->
-            
+
+            <div class="mb-3">
+                <label class="form-label">Briefly describe your role function</label>
+                <textarea class="form-control" name="role_function" required></textarea>
+            </div>
+
+            <div class="mb-3">
+                <label class="form-label">Devices Used For CCAH Work</label>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="devices" value="PC" id="device-pc">
+                    <label class="form-check-label" for="device-pc">PC</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="devices" value="Mac" id="device-mac">
+                    <label class="form-check-label" for="device-mac">Mac</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="devices" value="Tablet" id="device-tablet">
+                    <label class="form-check-label" for="device-tablet">Tablet</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="devices" value="Phone" id="device-phone">
+                    <label class="form-check-label" for="device-phone">Phone</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="devices" value="Other" id="device-other"
+                           onclick="toggleOtherField(this, 'device-other-text')">
+                    <label class="form-check-label" for="device-other">Other</label>
+                </div>
+                <input type="text" class="form-control mt-2" id="device-other-text" name="device_other"
+                       placeholder="Specify other device" style="display: none;">
+            </div>
+
+            <!-- Work Location -->
+            <div class="mb-3">
+                <label class="form-label">Work Location</label>
+                <select class="form-control" name="work_location" required>
+                    <option value="">Select...</option>
+                    <option value="100% Office">100% Office</option>
+                    <option value="Mostly Office">Mostly office with some remote work</option>
+                    <option value="Balanced">Balanced (50/50 office & remote)</option>
+                    <option value="Mostly Remote">Mostly remote with some office work</option>
+                    <option value="100% Remote">100% Remote</option>
+                </select>
+            </div>
+
+            <!-- Email Access -->
+            <div class="mb-3">
+                <label class="form-label">How do you access your email?</label>
+                <select class="form-control" name="email_access" required>
+                    <option value="">Select...</option>
+                    <option value="Outlook">Outlook (Installed)</option>
+                    <option value="Webmail">Webmail (Browser)</option>
+                    <option value="Mobile">Mobile (Phone/Tablet)</option>
+                    <option value="All Methods">I use all 3 methods</option>
+                </select>
+            </div>
+
+            <!-- Multi-Factor Authentication (MFA) -->
+            <div class="mb-3">
+                <label class="form-label">Do you use Multi-Factor Authentication (MFA)?</label>
+                <select class="form-control" name="mfa" id="mfa-select" onchange="toggleDependentField(this, 'Yes', 'mfa-types')">
+                    <option value="No">No</option>
+                    <option value="Yes">Yes</option>
+                </select>
+            </div>
+
+            <div id="mfa-types" class="mt-3" style="display: none;">
+                <label class="form-label">What type of MFA do you use?</label>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="mfa_types" value="Email">
+                    <label class="form-check-label">Email</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="mfa_types" value="Text">
+                    <label class="form-check-label">Text</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="mfa_types" value="Authenticator App"
+                           onclick="toggleOtherField(this, 'mfa-app-name')">
+                    <label class="form-check-label">Authenticator App</label>
+                </div>
+                <input type="text" class="form-control mt-2" id="mfa-app-name" name="mfa_apps"
+                       placeholder="Specify MFA App" style="display: none;">
+            </div>
+
+            <!-- IT Challenges -->
+            <div class="mb-3">
+                <label class="form-label">Are there any IT challenges you face regularly?</label>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="it_challenges" value="Slow Performance">
+                    <label class="form-check-label">Slow Computer Performance</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="it_challenges" value="Software Issues">
+                    <label class="form-check-label">Software Issues</label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="it_challenges" value="Other"
+                           onclick="toggleOtherField(this, 'it-other-text')">
+                    <label class="form-check-label">Other</label>
+                </div>
+                <input type="text" class="form-control mt-2" id="it-other-text" name="it_other"
+                       placeholder="Specify other challenges" style="display: none;">
+            </div>
+
             <button type="submit" class="btn btn-primary">Submit</button>
         </form>
     </div>
 
-    <!-- Bootstrap JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
     <script src="../assets/js/main.js"></script>
 </body>
 </html>