--- a/http/src/luan/modules/http/Http.luan	Sat May 16 20:19:05 2015 -0600
+++ b/http/src/luan/modules/http/Http.luan	Sun May 17 19:25:47 2015 -0600
@@ -1,15 +1,87 @@
+local Luan = require "luan:Luan"
+local ipairs = Luan.ipairs
+local pairs = Luan.pairs
+local set_metatable = Luan.set_metatable
 local Io = require "luan:Io"
+local Html = require "luan:Html"
+local url_encode = Html.url_encode
 
 
+local singular_metatable = {}
+
+function singular_metatable.__index(table,key)
+	local list = table.__plural[key]
+	return list and list[1]
+end
+
+function singular_metatable.__new_index(table,key,value)
+	table.__plural[key] = {value}
+end
+
+function singular_metatable.__pairs(table)
+	local iter = pairs(table.__plural)
+	return function()
+		local key, value = iter()
+		return key, value and value[1]
+	end
+end
+
+
+local function new_common(this)
+	this = this or {}
+	this.headers = {}
+	this.header = {__plural=this.headers}
+	set_metatable(this.header,singular_metatable)
+	return this
+end
+
+
+function new_request(this)
+	this = new_common(this)
+	this.method = "GET"  -- default
+	-- this.path
+	-- this.protocol
+	this.scheme = "http"  -- default
+	this.parameters = {}
+	this.parameter = {__plural=this.parameters}
+	set_metatable(this.parameter,singular_metatable)
+	this.cookie = {}
+
+	function this.url()
+		local string_uri = Io.uri "string:"
+		local out = string_uri.text_writer()
+
+		out.write( this.scheme, "://", this.header.host, this.path )
+		if this.method ~= "POST" then
+			local and_char = "?"
+			for name, values in pairs(this.parameters) do
+				for _, value in ipairs(values) do
+					out.write( and_char, url_encode(name), "=", url_encode(value) )
+					and_char = "&"
+				end
+			end
+		end
+
+		out.close()
+		return string_uri.read_text()
+	end
+
+	return this
+end
+
+-- request = new_request{}  -- filled in by HttpServicer
+
 
 
 function init_for_test()
 
-	welcome_file = "index.html"
+	test = test or {}
+
+	test.welcome_file = "index.html"
 
 	function get_page(path)
-		if welcome_file ~= nil and path.matches ".*/" then
-			path = path .. welcome_file
+		if test.welcome_file ~= nil and path.matches ".*/" then
+			path = path .. test.welcome_file
 		end
 		local old_out = Io.stdout
 		local mod = require("site:"..path)
@@ -19,12 +91,10 @@
 		return result.read_text()
 	end
 
-	cookies = cookies or {}
+	test.cookies = test.cookies or {}
 
-	request = {
-		parameters = {};
-	}
-	request.cookies = cookies
+	request = new_request{}
+	request.cookies = test.cookies
 
 	response = {
 
@@ -35,11 +105,11 @@
 		end;
 
 		set_cookie = function(name,value)
-			cookies[name] = value
+			test.cookies[name] = value
 		end;
 
 		remove_cookie = function(name)
-			cookies[name] = nil
+			test.cookies[name] = nil
 		end;
 
 		send_redirect = function(url)