worked a bunch on clojure stuff
merge