Convert to compojure - in progress