diff --git a/generic/urls.py b/generic/urls.py
index 75cc2b83..5e782177 100755
--- a/generic/urls.py
+++ b/generic/urls.py
@@ -1,6 +1,13 @@
 from django.urls import path, include
 from . import views
 
+from rapids import views as rapid_views
+
+from rest_framework import routers
+
+router = routers.DefaultRouter()
+router.register(r'rapids/exams', rapid_views.ExamViewSet, basename="rapid-exams")
+
 app_name = "generic"
 
 urlpatterns = [
@@ -11,7 +18,11 @@ urlpatterns = [
     path("examination/ajax/get_examination_id",
          views.get_examination_id,
          name="get_examination_id"),
-    path("exam_json_edit",
+    path("generic_exam_json_edit",
          views.generic_exam_json_edit,
          name="generic_exam_json_edit"),
+
+
+    path('api/', include(router.urls)),
+    path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
 ]
diff --git a/generic/views.py b/generic/views.py
index b6cc64f5..9f156fe2 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -85,7 +85,9 @@ def generic_exam_json_edit(request):
             question_ids = json.loads(request.POST.get("add_exam_questions"))
             question_objects = Question.objects.filter(pk__in=question_ids)
 
-            exam.exam_questions.add(question_objects)
+            for i in question_ids:
+                exam.exam_questions.add(i)
+            #exam.exam_questions.add(question_objects)
             exam.save()
             data = {"status": "success"}
             return JsonResponse(data, status=200)
diff --git a/rad/settings.py b/rad/settings.py
index fcd84822..3c427c03 100644
--- a/rad/settings.py
+++ b/rad/settings.py
@@ -51,6 +51,7 @@ INSTALLED_APPS = [
     'debug_toolbar',
     "tagulous",
     "dbbackup",
+    "rest_framework",
 ]
 
 MIDDLEWARE = [
diff --git a/rad/urls.py b/rad/urls.py
index 8bda858b..3425925e 100644
--- a/rad/urls.py
+++ b/rad/urls.py
@@ -38,6 +38,7 @@ urlpatterns = [
     # Global url that registers RTS compatible exams
     path("exam/json/", views.active_exams, name="active_exams"),
     path("exam/submit", views.exam_submit, name="global_exam_answers_submit"),
+    #path('', include('generic.urls')),
 
 ]
 
diff --git a/rapids/forms.py b/rapids/forms.py
index 617e5816..ee17e8ca 100755
--- a/rapids/forms.py
+++ b/rapids/forms.py
@@ -70,6 +70,8 @@ class RapidCreationDefaultForm(ModelForm):
 
 
 class RapidForm(ModelForm):
+
+    exams = ModelMultipleChoiceField(required=False, queryset=Exam.objects.all())
     class Media:
         # Django also includes a few javascript files necessary
         # for the operation of this form element. You need to
@@ -106,6 +108,39 @@ class RapidForm(ModelForm):
             choices=Rapid.LATERALITY_CHOICES, required=True, widget=RadioSelect()
         )
 
+        if kwargs.get("instance"):
+            # We get the 'initial' keyword argument or initialize it
+            # as a dict if it didn't exist.
+            initial = kwargs.setdefault("initial", {})
+            # The widget for a ModelMultipleChoiceField expects
+            # a list of primary key for the selected data.
+            initial["exams"] = [t.pk for t in kwargs["instance"].exams.all()]
+
+        ModelForm.__init__(self, *args, **kwargs)
+
+    def save(self, commit=True):
+        # Get the unsaved Pizza instance
+        instance = ModelForm.save(self, False)
+
+        # Prepare a 'save_m2m' method for the form,
+        old_save_m2m = self.save_m2m
+
+        def save_m2m():
+            old_save_m2m()
+            # This is where we actually link the pizza with toppings
+            instance.exams.clear()
+            for exam in self.cleaned_data["exams"]:
+                instance.exams.add(exam)
+
+        self.save_m2m = save_m2m
+
+        # Do we need to save all changes now?
+        # if commit:
+        instance.save()
+        self.save_m2m()
+
+        return instance
+
     class Meta:
         model = Rapid
         # fields = ['due_back']
diff --git a/rapids/serializers.py b/rapids/serializers.py
new file mode 100644
index 00000000..5e5585fa
--- /dev/null
+++ b/rapids/serializers.py
@@ -0,0 +1,11 @@
+# serializers.py
+from rest_framework import serializers, permissions
+
+
+from .models import Exam
+
+class ExamSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = Exam
+        fields = ('name', 'id', 'active', "publish_results")
+        permission_classes = [permissions.IsAuthenticated]
diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 03dde6a1..3baa3ad1 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -16,6 +16,11 @@
         </span>
         {% endfor %}
     </div>
+    <div>
+        Exams: {% for exam in question.exams.all %}
+        <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>, 
+        {% endfor %}
+    </div>
     <p class="pre-whitespace"><b>Feedback:</b> {{ question.feedback }}</p>
     <p><b>Author(s):</b> {% for author in question.author.all %} <a
             href="{% url 'rapids:author_detail' pk=author.pk %}">{{author}}</a>, {% endfor %}</p>
diff --git a/rapids/templates/rapids/view.html b/rapids/templates/rapids/view.html
index 91e9becf..b86daa17 100755
--- a/rapids/templates/rapids/view.html
+++ b/rapids/templates/rapids/view.html
@@ -8,44 +8,78 @@
 
 <div id="view-filter-options">
     <h3>Filter Rapids</h3>
-<form action="" method="get">
-    {{ filter.form }}
-    <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
-</form>
+    <form action="" method="get">
+        {{ filter.form }}
+        <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
+    </form>
 </div>
 {% render_table table %}
 
-<button id="button-select-add-exam"></button>
+<button id="button-select-add-exam" data-exam_list_url="{% url 'generic:rapid-exams-list' %}">Add selected questions to
+    exam</button>
+<div id="exam-options"></div>
 
 <script type="text/javascript">
     $(document).ready(function () {
-        $("#button-select-add-exam").click(function () {
+        $("#button-select-add-exam").click(function (evt) {
             // Find selected objects
 
-            
 
-            $.ajax({
-                url: "{% url 'generic:generic_exam_json_edit' %}",
-                data: {
-                    csrfmiddlewaretoken: "{{ csrf_token }}",
-                    add_exam_questions: $("table input:checked").serialize(),
-                    type: "rapid",
-                    exam_id: exam_id,
-                },
-                type: "POST",
-                dataType: "json",
+
+            var jqxhr = $.get(evt.target.dataset.exam_list_url, function (data) {
+                console.log(data);
+                data.forEach((obj, n) => {
+                    $("#exam-options").append($(document.createElement('button')).prop({
+                        type: 'button',
+                        innerHTML: obj.name,
+                        class: '',
+
+                    }).data("exam-id", obj.id).click((evt) => { addToExam(evt) }))
+                })
             })
-                // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
-                .done(function (data) {
-                    console.log(data);
-
-                    if (data.status == "success") {
-                    toastr.info('Questions added to exams.')
-                    }
+                .done(function () {
+                    //alert( "second success" );
+                })
+                .fail(function () {
+                    //alert( "error" );
                 })
                 .always(function () {
-                    console.log('[Done]');
+                    //alert( "finished" );
+                });
+
+            return;
+
+
+            function addToExam(evt) {
+
+                ids = []
+                $("table input:checked").each((n, el) => {
+                    ids.push(el.value)
                 })
+                $.ajax({
+                    url: "{% url 'generic:generic_exam_json_edit' %}",
+                    data: {
+                        csrfmiddlewaretoken: "{{ csrf_token }}",
+                        add_exam_questions: JSON.stringify(ids),
+                        type: "rapid",
+                        exam_id: $(evt.target).data("exam-id"),
+                    },
+                    type: "POST",
+                    dataType: "json",
+                })
+                    // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
+                    .done(function (data) {
+                        console.log(data);
+
+                        if (data.status == "success") {
+                            toastr.info('Questions added to exams.')
+                        }
+                    })
+                    .always(function () {
+                        console.log('[Done]');
+                        $("#exam-options").empty();
+                    })
+            }
         })
 
 
diff --git a/rapids/views.py b/rapids/views.py
index 0a9f36c4..b0400c81 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -65,6 +65,12 @@ from django.forms.models import model_to_dict
 from rapids.forms import RapidCreationDefaultForm
 from rapids.models import RapidCreationDefault
 
+
+from rest_framework import viewsets
+
+from .serializers import ExamSerializer
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -875,4 +881,8 @@ class QuestionDelete(AuthorOrCheckerRequiredMixin, DeleteView):
     model = Rapid
     success_url = reverse_lazy("rapids:rapid_view")
 
-RapidExamViews = ExamViews(Exam, Rapid, "rapids", "rapid", loadJsonAnswer)
\ No newline at end of file
+RapidExamViews = ExamViews(Exam, Rapid, "rapids", "rapid", loadJsonAnswer)
+
+class ExamViewSet(viewsets.ModelViewSet):
+    queryset = Exam.objects.all().order_by('name')
+    serializer_class = ExamSerializer
diff --git a/requirements.txt b/requirements.txt
index 3dc2e6a9..b77922b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,4 +16,5 @@ pytesseract
 opencv-python
 pydicom
 django-dbbackup
-django-hashedfilenamestorage
\ No newline at end of file
+django-hashedfilenamestorage
+djangorestframework
\ No newline at end of file