diff --git a/endpoints.go b/endpoints.go
index 6946cb8..b18542f 100644
--- a/endpoints.go
+++ b/endpoints.go
@@ -53,12 +53,22 @@ func handleIndex(w http.ResponseWriter, r *http.Request) {
 func handleNew(w http.ResponseWriter, r *http.Request) {
 	defer trackTime(time.Now(), "handleNew")
 
+	classes := []string{}
+	err := db.Select(&classes, "SELECT distinct(class) FROM incoming")
+	if err != nil {
+		log.Fatal("db.Select incoming ", err)
+	}
+
 	t, err := template.ParseFiles("templates/new.html")
 	if err != nil {
 		log.Fatal("ParseFiles", err)
 	}
 
-	err = t.Execute(w, nil)
+	data := map[string]interface{}{
+		"classes": classes,
+	}
+
+	err = t.Execute(w, data)
 	if err != nil {
 		log.Fatal("t.Execute", err)
 	}
diff --git a/templates/new.html b/templates/new.html
index 198dcc3..e4b92fc 100644
--- a/templates/new.html
+++ b/templates/new.html
@@ -30,8 +30,9 @@
       </select>
       <br><br>
       <select name="class">
-        <option value="User">User</option>
-        <option value="Review">Review</option>
+        {{ range $class := .classes }}
+        <option value="{{$class}}">{{$class}}</option>
+        {{ end }}
       </select>
       <br><br>
       <textarea rows="4" cols="50" name="template" id="template"></textarea>