I do believe that OTP/MFA is now working.

app/views/devise/passwords/edit.html.erb

@@ -21,5 +21,5 @@
     <%= f.submit "Change my password" %>
   </div>
 <% end %>
-
-<%= render "devise/shared/links" %>
+<hr/>
+<%#= render "devise/shared/links" %>

app/views/devise/registrations/edit.html.erb

@@ -35,5 +35,12 @@
     <%= f.submit "Update" %>
   </div>
 <% end %>
+<hr/>
 
+<% if current_user.otp_secret.to_s.size == 0 %>
+  <%= link_to "Enable MFA", new_mfa_path %>
+<% else %>
+  <%= link_to "Edit MFA", new_mfa_path %>
+<% end %>
+|
 <%= link_to "Back", :back %>

app/views/devise/sessions/new.html.erb

@@ -12,6 +12,11 @@
     <%= f.password_field :password, autocomplete: "current-password", class: "input" %>
   </div>
 
+    <div class="flex flex-column mt-3">
+    <%= f.label :otp_attempt, class: "my-2" %>
+    <%= f.password_field :otp_attempt, autocomplete: "OTP Code", class: "input" %>
+  </div>
+
   <% if devise_mapping.rememberable? %>
     <div class="flex flex-items-center mt-4">
       <%= f.check_box :remember_me, class: "checkbox mr-3" %>

app/views/layouts/application.html.erb

@@ -26,12 +26,21 @@
     <% if alert %><div class=""><%= alert %></div><% end %>
     <%= yield %>
   </main>
+  <% if Rails.env == "development" %>
   <footer>
     RoR Version <%= Rails.version %> (<%=Rails.env%>) | Ruby <%= "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}" %> | OS <%= RUBY_PLATFORM %> | App Version <%= `git describe --always` %>
+
+    <% if user_signed_in? %>
+    <hr/>
+    <%= "User:#{current_user.email} | OTP for login:#{current_user.otp_required_for_login} | " %>
+    <% end %>
+    <!--
     <h3>To-Do (In order of importance):</h3>
     <ul>
-      <li>2FA</li>
+
     </ul>
+    -->
+    <% end %>
   </footer>
   </body>
 </html>

app/views/mfas/new.html.erb

@@ -0,0 +1,9 @@
+<div class="mfa">
+    <h1 class="mfa-header">New MFA</h1>
+    <div class="mfa-list">
+        <p>Scan the code below and then click "Done".</p>
+        <p>You will only be able to login with your authenticator app once you have clicked "Done"</p>
+        <%= @svg.html_safe%>
+        <p><%= link_to "Done", mfas_path, data: { turbo_method: :post} %></p>
+    </div>
+</div>