diff --git a/theme/puzzle.html b/theme/puzzle.html
index 46c1ad9..e5a22f3 100644
--- a/theme/puzzle.html
+++ b/theme/puzzle.html
@@ -20,9 +20,7 @@
         <ul id="files"></ul>
         <p>Puzzle by <span id="authors">[loading]</span></p>
       </section>
-      <form>
-        <input type="hidden" name="cat">
-        <input type="hidden" name="points">
+      <form class="answer">
         Team ID: <input type="text" name="id"> <br>
         Answer: <input type="text" name="answer" id="answer"> <span id="answer_ok"></span><br>
         <input type="submit" value="Submit">
diff --git a/theme/puzzle.mjs b/theme/puzzle.mjs
index 76581fc..43fa17d 100644
--- a/theme/puzzle.mjs
+++ b/theme/puzzle.mjs
@@ -1,5 +1,13 @@
 import * as moth from "./moth.mjs"
 
+/** Stores the current puzzle, globally */
+let puzzle = null
+
+function submit(event) {
+    event.preventDefault()
+    console.log(event)
+}
+
 function puzzleElement(clear=true) {
     let e = document.querySelector("#puzzle")
     if (clear) {
@@ -16,7 +24,7 @@ function error(message) {
 
 async function loadPuzzle(category, points) {
     let server = new moth.Server()
-    let puzzle = server.GetPuzzle(category, points)
+    puzzle = server.GetPuzzle(category, points)
     await puzzle.Populate()
 
     let title = `${category} ${points}`
@@ -49,6 +57,9 @@ function hashchange() {
 }
 
 function init() {
+    for (let e of document.querySelectorAll("form.answer")) {
+        e.addEventListener("submit", submit)
+    }
     window.addEventListener("hashchange", hashchange)
     hashchange()
 }