diff --git a/yqform.etlua b/yqform.etlua
index fe4c5c8..eac8274 100644
--- a/yqform.etlua
+++ b/yqform.etlua
@@ -10,28 +10,84 @@
       <%=data%>
     </pre>
     <form method="POST" action="/cgi/yqtemplate" enctype="multipart/form-data">
-      <label for="name">Name</label>
-      <input type="test" name="name" value="name" /><br />
-      <label for="avatar">Portrait</label>
-      <input type="file" name="avatar" value="avatar" /><br />
-      <label for="isLeader">Party Leader</label>
-      <input type="checkbox" name="isLeader" value="isLeader" /><br />
-      <label for="class1">Class</label>
-      <select name="class1" id="class1">
-        <option value="1">Beast</option>
-        <option value="2">Swordsman</option>
-        <option value="3">Spirit Bird</option>
-        <option value="4">Twin Blades</option>
-        <option value="5">Healer</option>
-        <option value="6">Summoner</option>
-        <option value="7">Tamer</option>
-        <option value="8">Pugilist</option>
-        <option value="9">Mounted Fighter</option>
-        <option value="10">Fruit Animal</option>
-        <option value="11">Spellcaster</option>
+      <h2>General Information</h2>
+      <label for="name">Name:</label>
+      <input type="test" name="name"/><br />
+      <label for="avatar">Portrait:</label>
+      <input type="file" name="avatar"/><br />
+      <label for="isLeader">Party Leader:</label>
+      <input type="checkbox" name="is-leader"/><br />
+      <h2>Classes and Levels</h2>
+      <label for="class1">Class 1:</label>
+      <select name="class1">
+	<% for _, v in ipairs(classes) do %>
+        <option value="<%= v %>"><%= v %></option>
+	<% end %>
+      </select>
+      <label for="class1-lvl">Level:</label>
+      <input type="number" name="class1-lvl" min="1"/><br/>
+      <label for="class2">Class2:</label>
+      <select name="class2">
+	<% for _, v in ipairs(classes) do %>
+        <option value="<%= v %>"><%= v %></option>
+	<% end %>
+      </select>
+      <label for="class2-lvl">Level:</label>
+      <input type="number"name="class2-lvl" min="1"/><br/>
+      <label for="class-leaning">
+	Class leaning (0 for completely class 1, 100 for completely class 2):
+      </label>
+      <input type="number" name="class-leaning" min="0" max="100"></br>
+      <h2>Stats</h2>
+      <label for="stat-luc">Luck</label>
+      <input type="number" name="stat-luc" min="0" max="100" />
+      <label for="stat-str">Strength</label>
+      <input type="number" name="stat-str" min="0" max="100" />
+      <label for="stat-sta">Stamina</label>
+      <input type="number" name="stat-sta" min="0" max="100"/>
+      <label for="stat-agi">Agility</label>
+      <input type="number" name="stat-agi" min="0" max="100"/>
+      <label for="stat-int">Intelligence</label>
+      <input type="number" name="stat-int" min="0" max="100"/>
+      <label for="stat-res">Resistance</label>
+      <input type="number" name="stat-res" min="0" max="100"/><br/>
+
+      <h2>Skills</h2>
+      <label for="allegiance">Allegiance:</label>
+      <input type="text" name="allegiance"/><br />
+      <label for="affinity">Affinity:</label>
+      <input type="text" name="affinity"/><br />
+      <label for="ability">Ability:</label>
+      <input type="text" name="ability"/><br />
+      <label for="advantage">Advantage:</label>
+      <select name="advantage">
+	<% for _, v in ipairs(elements) do %>
+        <option value="<%= v %>"><%= v %></option>
+	<% end %>
       </select><br/>
+      <label for="weakness">Weakness</label>
+      <select name="weakness">
+	<% for _, v in ipairs(elements) do %>
+        <option value="<%= v %>"><%= v %></option>
+	<% end %>
+      </select><br />
+      <h2>Equipment</h2>
+      <label for="weapon-name">Weapon</label>
+      <input type="file" name="weapon-ico" />
+      <input type="text" name="weapon-name" /><br />
+      <label for="outfit-name">Outfit</label>
+      <input type="file" name="outfit-ico" />
+      <input type="text" name="outfit-name" /><br />
+      <label for="accessory1-name">Accessory 1</label>
+      <input type="file" name="accessory1-ico" />
+      <input type="text" name="accessory1-name" /><br />
+      <label for="accessory2-name">Accessory 2</label>
+      <input type="file" name="accessory2-ico" />
+      <input type="text" name="accessory2-name" /><br />
+      <h2>Generate</h2>
       <input type="submit" value="Generate">
     </form>
+    
     <hr />
     <p>
       Based on the character profiles in the webcomic