diff --git a/anatomy/forms.py b/anatomy/forms.py
index 4431ca69..321d51a2 100644
--- a/anatomy/forms.py
+++ b/anatomy/forms.py
@@ -191,3 +191,8 @@ class BodyPartForm(ModelForm):
     class Meta:
         model = BodyPart
         fields = ["bodypart"]
+
+class ExamForm(ModelForm):
+    class Meta:
+        model = Exam
+        fields = ["name", "time_limit", "exam_mode"]
\ No newline at end of file
diff --git a/anatomy/views.py b/anatomy/views.py
index 67dd184a..e1c184c7 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -32,6 +32,7 @@ from .forms import (
     MarkAnatomyQuestionForm,
     AnatomyQuestionForm,
     StructureForm,
+    ExamForm
 )
 from .models import (
     AnatomyQuestion,
@@ -46,7 +47,6 @@ from .models import (
 )
 from generic.models import Examination
 from generic.views import ExamViews
-from generic.forms import ExamForm
 
 from .tables import AnatomyQuestionTable, AnatomyUserAnswerTable
 from .filters import AnatomyQuestionFilter, AnatomyUserAnswerFilter
diff --git a/generic/forms.py b/generic/forms.py
index 44ab49d8..aa6b2fb1 100755
--- a/generic/forms.py
+++ b/generic/forms.py
@@ -9,7 +9,7 @@ from django.forms import (
 from django.forms import inlineformset_factory
 
 from generic.models import (
-    Examination, Exam
+    Examination
 )
 
 from django.contrib.admin.widgets import FilteredSelectMultiple
@@ -19,9 +19,4 @@ from django.forms.widgets import RadioSelect, TextInput, Textarea
 class ExaminationForm(ModelForm):
     class Meta:
         model = Examination
-        fields = ["examination"]
-
-class ExamForm(ModelForm):
-    class Meta:
-        model = Exam
-        fields = ["name", "time_limit", "exam_mode"]
\ No newline at end of file
+        fields = ["examination"]
\ No newline at end of file
diff --git a/rapids/forms.py b/rapids/forms.py
index ad76a608..fc8f776b 100755
--- a/rapids/forms.py
+++ b/rapids/forms.py
@@ -209,7 +209,7 @@ AnswerUpdateFormSet = inlineformset_factory(
 )
 
 
-# This should be made generic
+# This should be made generic?
 class ExamForm(ModelForm):
     class Meta:
         model = Exam