JC: Replaced CGI with URI. refecotering views. spec passes.
JC: updated version.