I'm a bit uncomfortable with splitting the request into two top level keys. Let me think about this one.