Updated to include some clojure stuff - still wip