I'm thinking defer until we are fully on the request model.