--- a/src/luan/modules/http/Server.luan	Thu Sep 01 21:32:28 2016 -0600
+++ b/src/luan/modules/http/Server.luan	Fri Sep 02 17:43:29 2016 -0600
@@ -91,10 +91,10 @@
 	M.resource_handler.setResourceBase(Io.uri(base).to_string())
 	M.resource_handler.setWelcomeFiles {M.welcome_file}
 	M.luan_handler.setWelcomeFile(M.welcome_file)
-	M.handlers.addHandler(NotFound.new())
+	M.handlers.addHandler(NotFound.new(M.luan_handler))
 	M.server = Server.new(M.port)
 	M.server.setHandler(hc)
-	Package.load("site:/init.luan")
+--	Package.load("site:/init.luan")
 end
 
 function M.start()
@@ -111,8 +111,8 @@
 
 function M.serve(dir)
 	M.init(dir)
+	M.start_rpc()
 	M.start()
-	M.start_rpc()
 end
 
 return M