 )
 
 (defn gen-saas
-  [districtName schoolName students assessment n output-file]
+  [schoolName students assessment n output-file]
   (gen-edfi :InterchangeStudentAssessment output-file
     (for [studentName students, i (range 1 n)]
-      (gen-saa districtName schoolName studentName assessment (str "2011-10-" (format "%02d" i)))
+      (gen-saa schoolName studentName assessment (str "2011-10-" (format "%02d" i)))
+    )
+  )
+)
+
+(defn gen-enroll
+  [schoolName student]
+  (element :StudentSchoolAssociation {}
+    (student-ref schoolName student)
+    (element :SchoolReference {}
+      (element :EducationalOrgIdentity {}
+        (element :StateOrganizationId {} schoolName)
+      )
+    )
+    (element :EntryDate {} "2011-09-01")
+    (element :EntryGradeLevel {} "Seventh grade")
+  )
+)
+
+(defn gen-section-assoc
+  [districtName schoolName studentName sectionName]
+  (element :StudentSectionAssociation {}
+    (student-ref schoolName studentName)
+    (element :SectionReference {}
+      (element :SectionIdentity {}
+        (element :StateOrganizationId {} districtName)
+        (element :UniqueSectionCode {} sectionName)
+      )
     )
   )
 )
 
 (defn enroll [districtName schoolName studentName]
-  (gen-enroll districtName schoolName studentName)
+  (gen-enroll schoolName studentName)
   (gen-section-assoc districtName schoolName studentName "Math-7-2011-Sec2")
 )
 

  )
)

(defn gen-student [districtName schoolName id]
  (element :Student {}
    (element :StudentUniqueStateId {} (join "-" [schoolName id]))
    (element :Name {}

  )
)

(defn create-assessment [assessmentName]
  (let [tmp (element :Assessment {:id "Grade_7_2011_State_Math"}
      (element :AssessmentTitle {} assessmentName)
