Added URI processing, testing Hy