Large update.  Added clj stuff