Working to regain parity with the Clojure version