 
 (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.

       (Date. 8 0 1)
       (Date. 9 0 1))))


(execute (msum (mgroup whales [[:type]] mcount) :count))
(execute (mcount whales))

(execute (mgroup whales [[:type]
			 [:time (fn [time] (list (or (.lower years time) time)))]]
		 mcount))

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