 
 (def parsed (->> data
                  (remove #(= "Included in other discovery" (:dscCurrentActivityStatus %)))
-                 (map #(select-keys % [:dscName :fldName :dscDiscoveryYear :dscCurrentActivityStatus]))
-                 (csv/read-number-or-throw-columns [:dscDiscoveryYear])
+                 (map #(rename-keys % {:dscCurrentActivityStatus :status
+                                       :dscDiscoveryYear :year}))
+                 (map #(update % :status status-map))
+                 (map #(select-keys % [:dscName :fldName :year :status]))
+                 (csv/read-number-or-throw-columns [:year])
                  (map #(update % :fldName (fn [x] (if (empty? x) nil x))))
                  (map #(update % :dscName (fn [x] (if (empty? x) nil x))))
                  (map #(assoc % :name (or (:fldName %) (:dscName %))))
                  (group-by :name)
                  (vals)
-                 (map #(sort-by (fn [x] (:dscDiscoveryYear x)) %))
+                 (map #(sort-by (fn [x] (:year x)) %))
                  (map #(first %))
                  (flatten)
                  (map #(assoc % :fldRecoverableLiquids (recoverable % :fldRecoverableLiquids)))

                 (csv/number-or-throw-columns [:fldRecoverableLiquids :fldRecoverableGas])
                 (sort-by :name)
                 (vec)))

                 (distinct)
                 (vec))))

(def status-map {"Approved for production" :pdo-approved
                 "Producing" :producing
                 "Production in clarification phase" :clarification
                 "Production likely, but unclarified" :likely
                 "Production not evaluated" :not-evaluated
                 "Shut down" :shut-down})

(defn recoverable [{fld-name :fldName dsc-name :dscName} kind]
  (if (and (some? fld-name) (some #{fld-name} reserve/field-names-all))
      (reserve/get-reserve fld-name kind)
