 
 (def #^Class Whale (apply make-class "org.dada.demo.whales.Whale" Object attributes))
 (def #^Metadata whale-metadata (metadata Whale md-attributes))
-(def #^Model whales (model "Whales" :id :version whale-metadata))
+(def #^Model whales-model (model "Whales" :id :version whale-metadata))
 
 (def num-whales 100000)
 
-(insert *metamodel* whales)
+(insert *metamodel* whales-model)
 
 ;;----------------------------------------
 

  ((second (monad)) (fn [model key])))

;;--------------------------------------------------------------------------------

(def my-whales (mlift whales :id 0))	;TODO - col should be optional

(def #^NavigableSet years
     (TreeSet.

;; create some whales...
(time
 (doall
  (let [batcher (Batcher. 999 1000 (list whales-model))
	#^Creator creator (.getCreator whale-metadata)
	max-length-x-100 (* max-length 100)
	max-weight-x-100 (* max-weight 100)]
    (pmap
     (fn [id]
	 (insert
	  whales-model ;; batcher
	  (.create
	   creator
	   (into-array
