Untested

first pull into master since the process of converting QC to clojure began.