diff --git a/aleksis/apps/alsijil/tasks.py b/aleksis/apps/alsijil/tasks.py
index a207a6b8cd924e5da776ff6981d341373c3d58d5..a7020dc103961fb9792221b925afc6f5453f18a4 100644
--- a/aleksis/apps/alsijil/tasks.py
+++ b/aleksis/apps/alsijil/tasks.py
@@ -132,6 +132,7 @@ def generate_full_register_printout(group: int, file_object: int, recorder: Prog
     recorder.set_progress(5, _number_of_steps, _("Load statistics ..."))
 
     persons = group.members.prefetch_related(None).select_related(None)
+    # TODO: Make new version of this query (generate_person_list_with_class_register_statistics)
     persons = group.generate_person_list_with_class_register_statistics(persons)
 
     prefetched_persons = []
@@ -144,6 +145,10 @@ def generate_full_register_printout(group: int, file_object: int, recorder: Prog
     context["excuse_types"] = ExcuseType.objects.filter(count_as_absent=True)
     context["excuse_types_not_absent"] = ExcuseType.objects.filter(count_as_absent=False)
     context["extra_marks"] = ExtraMark.objects.all()
+    # TODO: Change in context lessons is now part of group = fetch lessons with group so group.lessons.all works
+    #       = make groups & child_groups similar
+    #       Do similar to lessons below.
+    # ALSO: Only possible if lesrooster is present
     context["group"] = group
     context["weeks"] = weeks
     context["register_objects_by_day"] = register_objects_by_day
@@ -171,6 +176,7 @@ def generate_full_register_printout(group: int, file_object: int, recorder: Prog
 
     recorder.set_progress(6, _number_of_steps, _("Generate template ..."))
 
+    # TODO: Use render pdf instead
     file_object, result = generate_pdf_from_template(
         "alsijil/print/register_for_group.html", context, file_object=file_object
     )