      (mapv #(dissoc % :dp/panel-id) dp-panels) ;(adjudicator-panels-xml->map xml id-generator-fn dp-adjudicators)
      (mapv #(dissoc % :dp/temp-id) dp-adjudicators)
      (make-activities (mapv :temp/activity dp-rounds) classes (mapcat :class/rounds classes))
-     classes
-     )))
-
-;; (defn competition->map [loc]
-;;   (let [competition-data (first (zx/xml-> loc :CompData))
-;;         classes (vec (class-list->map (zx/xml-> loc :ClassList :Class)))]
-;;     {:competition/name (get-name-attr competition-data)
-;;      :competition/date (tcr/to-date
-;;                         (tf/parse (tf/formatter "yyyy-MM-dd")
-;;                                   (zx/attr competition-data :Date)))
-;;      :competition/location (zx/attr competition-data :Place)
-;;      :competition/classes classes
-;;      :competition/events (event-list-post-process
-;;                           (vec (event-list->map (zx/xml-> loc :EventList :Event)))
-;;                           classes)
-;;      :competition/adjudicators
-;;      (if-let [adjudicator-list-loc (zx/xml-> loc :AdjPanelList :AdjList :Adjudicator)]
-;;        (into [] (adjudicator-list2->map adjudicator-list-loc))
-;;        [])
-;;     :competition/adjudicator-panels
-;;      (into [] (adjudicator-panel-list->map (zx/xml-> loc :AdjPanelList :PanelList :Panel)))
-;;      }))
-
-
+     classes)))
+
+

   :activity/comment comment ;"Comment"
   :activity/id id ;"1"
   :activity/position position ;"1"
   :activity/source-id source-id
   })

;; TODO - Activity stuff need to be parsed

;; comment:
 ;; <Event Seq="0" ClassNumber="0" DanceQty="0" EventNumber="" Time="" 


(defn- result-adjudicator [adjudicator-panels-loc]
  (filter
   :dp/temp-id
   (for [panel adjudicator-panels-loc]
     {:dp/result-local-panel-id (get-seq-attr panel)
      :dp/temp-id (get-number-attr panel)})))

(defn- result-list->map [result-loc]
  (for [result result-loc]
    (let [adjudicators (result-adjudicator (zx/xml-> result :AdjList :Adjudicator))]
      {:result/adjudicators (into [] adjudicators)
       :result/results (into [] (mark-list->map (zx/xml-> result :ResultArray :Couple) adjudicators))})))

(defn- class-list->map [classes-loc id-generator-fn]
