Converting to compojure - in progress