diff --git a/magstock/forms.py b/magstock/forms.py
index 278c9fa..e469857 100644
--- a/magstock/forms.py
+++ b/magstock/forms.py
@@ -127,4 +127,11 @@ class PreregOtherInfo:
     def staffing_label(self):
         return ("We already have enough volunteers to run MAGStock this year. If you'd like to be added "
                 "to our waitlist, click here and indicate your areas of interest. If we can accommodate more "
-                "volunteers, Staffing Operations will reach out to you in mid-May")
\ No newline at end of file
+                "volunteers, Staffing Operations will reach out to you in mid-May")
+
+@MagForm.form_mixin
+class CheckInForm:
+    camping_type = HiddenField('Camping Type')
+    cabin_type = HiddenField('Cabin Type')
+    meal_plan = HiddenField('Meal Plan')
+    license_plate = PersonalInfo.license_plate
diff --git a/magstock/templates/forms/attendee/check_in_form.html b/magstock/templates/forms/attendee/check_in_form.html
new file mode 100644
index 0000000..f726aad
--- /dev/null
+++ b/magstock/templates/forms/attendee/check_in_form.html
@@ -0,0 +1,24 @@
+{% extends 'uber/templates/forms/attendee/check_in_form.html' %}
+
+{% block merch %}
+<div class="row g-sm-3">
+    <div class="col">{{ form_macros.form_input(check_in_form.camping_type, hidden_field_text=attendee.camping_type_label) }}</div>
+    {% if attendee.camping_type == c.CABIN %}
+    <div class="col">{{ form_macros.form_input(check_in_form.cabin_type, hidden_field_text=attendee.cabin_type_label) }}</div>
+    {% endif %}
+    <div class="col">{{ form_macros.form_input(check_in_form.meal_plan, hidden_field_text=attendee.meal_plan_label) }}</div>
+    
+    {{ super() }}
+</div>
+{% endblock %}
+
+{% block editable %}
+<div class="row g-sm-3">
+    {% if c.COLLECT_EXACT_BIRTHDATE %}
+        <div class="col">
+            {{ form_macros.form_input(check_in_form.birthdate) }}
+        </div>
+    {% endif %}
+    <div class="col">{{ form_macros.form_input(check_in_form.license_plate, help_text='The license plate # of the car they parked.') }}</div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/magstock/templates/registration/check_in_form.html b/magstock/templates/registration/check_in_form.html
deleted file mode 100644
index 54adccd..0000000
--- a/magstock/templates/registration/check_in_form.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "uber/templates/registration/check_in_form_base.html" %}
-{% block checkin_fields %}
-    <div class="form-group">
-        <label for="badge_type" class="col-sm-3 control-label">Pre-ordered Merch</label>
-        <div class="col-sm-6">
-            <div class="form-control-static">{{ attendee.amount_extra_label }}
-            {% if attendee.amount_extra >= c.SHIRT_LEVEL %}
-                (Shirt size: {{ attendee.shirt_label or 'Not Selected' }})
-            {% endif %}
-            </div>
-        </div>
-    </div>
-    {{ super() }}
-    <div class="form-group">
-        <label for="badge_type" class="col-sm-3 control-label">Camping Type</label>
-        <div class="col-sm-6">
-            <div class="form-control-static">{{ attendee.camping_type_label }}
-            {% if attendee.camping_type == c.CABIN %}
-                ({{ attendee.cabin_type }})
-            {% endif %}
-            </div>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="badge_type" class="col-sm-3 control-label">Meal Plan</label>
-        <div class="col-sm-6">
-            <div class="form-control-static">{{ attendee.meal_plan_label }}
-            </div>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="license_plate" class="col-sm-3 control-label">License Plate #</label>
-        <div class="col-sm-3">
-            <input class="num form-control" id="license_{{ attendee.id }}" name="license_plate" type="text" value="{{ attendee.license_plate }}" size="10" />
-        </div>
-    </div>
-{% endblock checkin_fields %}