diff --git a/modules/client/createroom.cc b/modules/client/createroom.cc
index d005ac2d0..4268a906c 100644
--- a/modules/client/createroom.cc
+++ b/modules/client/createroom.cc
@@ -11,10 +11,118 @@
 using namespace ircd::m;
 using namespace ircd;
 
-const room::id::buf
-init_room_id
+mapi::header
+IRCD_MODULE
 {
-	"init", ircd::my_host()
+	"Client 7.1.1 :Create Room"
+};
+
+namespace ircd::m::name
+{
+    constexpr const auto visibility {"visibility"};
+    constexpr const auto room_alias_name {"room_alias_name"};
+    constexpr const auto name {"name"};
+    constexpr const auto topic {"topic"};
+    constexpr const auto invite {"invite"};
+    constexpr const auto invite_3pid {"invite_3pid"};
+    constexpr const auto creation_content {"creation_content"};
+    constexpr const auto initial_state {"initial_state"};
+    constexpr const auto preset {"preset"};
+    constexpr const auto is_direct {"is_direct"};
+    constexpr const auto guest_can_join {"guest_can_join"};
+
+    constexpr const auto id_server {"id_server"};
+    constexpr const auto medium {"medium"};
+    constexpr const auto address {"address"};
+}
+
+struct invite_3pid
+:json::tuple
+<
+	/// Required. The hostname+port of the identity server which should be
+	/// used for third party identifier lookups.
+	json::property<name::id_server, json::string>,
+
+	/// Required. The kind of address being passed in the address field,
+	/// for example email.
+	json::property<name::medium, json::string>,
+
+	/// Required. The invitee's third party identifier.
+	json::property<name::address, json::string>
+>
+{
+	using super_type::tuple;
+};
+
+struct body
+:json::tuple
+<
+	/// A public visibility indicates that the room will be shown in the
+	/// published room list. A private visibility will hide the room from
+	/// the published room list. Rooms default to private visibility if this
+	/// key is not included. NB: This should not be confused with join_rules
+	/// which also uses the word public. One of: ["public", "private"]
+	json::property<name::visibility, json::string>,
+
+	/// The desired room alias local part. If this is included, a room alias
+	/// will be created and mapped to the newly created room. The alias will
+	/// belong on the same homeserver which created the room. For example, if
+	/// this was set to "foo" and sent to the homeserver "example.com" the
+	/// complete room alias would be #foo:example.com.
+	json::property<name::room_alias_name, json::string>,
+
+	/// If this is included, an m.room.name event will be sent into the room
+	/// to indicate the name of the room. See Room Events for more information
+	/// on m.room.name.
+	json::property<name::name, json::string>,
+
+	/// If this is included, an m.room.topic event will be sent into the room to
+	/// indicate the topic for the room. See Room Events for more information on
+	/// m.room.topic.
+	json::property<name::topic, json::string>,
+
+	/// A list of user IDs to invite to the room. This will tell the server
+	/// to invite everyone in the list to the newly created room.
+	json::property<name::invite, json::array>,
+
+	/// A list of objects representing third party IDs to invite into the room.
+	json::property<name::invite_3pid, invite_3pid>,
+
+	/// Extra keys to be added to the content of the m.room.create. The server
+	/// will clobber the following keys: creator. Future versions of the
+	/// specification may allow the server to clobber other keys.
+	json::property<name::creation_content, json::object>,
+
+	/// A list of state events to set in the new room. This allows the user
+	/// to override the default state events set in the new room. The expected
+	/// format of the state events are an object with type, state_key and content
+	/// keys set. Takes precedence over events set by presets, but gets overriden
+	/// by name and topic keys.
+	json::property<name::initial_state, json::array>,
+
+	/// Convenience parameter for setting various default state events based on
+	/// a preset. Must be either: private_chat => join_rules is set to invite.
+	/// history_visibility is set to shared. trusted_private_chat => join_rules
+	/// is set to invite. history_visibility is set to shared. All invitees are
+	/// given the same power level as the room creator. public_chat: =>
+	/// join_rules is set to public. history_visibility is set to shared. One
+	/// of: ["private_chat", "public_chat", "trusted_private_chat"]
+	json::property<name::preset, json::string>,
+
+	/// This flag makes the server set the is_direct flag on the m.room.member
+	/// events sent to the users in invite and invite_3pid. See Direct
+	/// Messaging for more information.
+	json::property<name::is_direct, bool>,
+
+	/// Allows guests to join the room. See Guest Access for more information.
+	///
+	/// developer note: this is false if undefined, but an m.room.guest_access
+	/// may be present in the initial vector which allows guest access. This is
+	/// only meaningful if and only if true.
+	json::property<name::guest_can_join, bool>
+>
+{
+	using super_type::tuple;
 };
 
 extern "C" room
@@ -32,10 +140,10 @@ extern "C" room
 createroom(const id::room &room_id,
            const id::user &creator);
 
-mapi::header
-IRCD_MODULE
+const room::id::buf
+init_room_id
 {
-	"Client 7.1.1 :Create Room"
+	"init", ircd::my_host()
 };
 
 resource
@@ -48,20 +156,11 @@ createroom_resource
 };
 
 resource::response
-post__createroom(client &client, const resource::request &request)
+post__createroom(client &client,
+                 const resource::request::object<body> &request)
 try
 {
-	const auto name
-	{
-		unquote(request["name"])
-	};
-
-	const auto visibility
-	{
-		unquote(request["visibility"])
-	};
-
-	const id::user sender_id
+	const id::user &sender_id
 	{
 		request.user_id
 	};
@@ -85,7 +184,7 @@ try
 	{
 		client, http::CREATED,
 		{
-			{ "room_id", string_view{room_id} }
+			{ "room_id", room_id },
 		}
 	};
 }