diff --git a/products/analytics/package.json b/products/analytics/package.json
index ea02638c7ca50ec..99aab8aaeef1984 100644
--- a/products/analytics/package.json
+++ b/products/analytics/package.json
@@ -4,11 +4,11 @@
     "cloudflare-docs-engine": "git+https://github.com/cloudflare/cloudflare-docs-engine.git"
   },
   "scripts": {
-    "bootstrap": "node_modules/cloudflare-docs-engine/bin/commands.sh bootstrap",
-    "build": "node_modules/cloudflare-docs-engine/bin/commands.sh build",
-    "develop": "node_modules/cloudflare-docs-engine/bin/commands.sh develop",
-    "ghactionsbootstrap": "node_modules/cloudflare-docs-engine/bin/commands.sh ghactionsbootstrap",
-    "savechanges": "node_modules/cloudflare-docs-engine/bin/commands.sh savechanges",
-    "serve": "node_modules/cloudflare-docs-engine/bin/commands.sh serve"
+    "bootstrap": "sh ./node_modules/cloudflare-docs-engine/bin/commands.sh bootstrap",
+    "build": "sh ./node_modules/cloudflare-docs-engine/bin/commands.sh build",
+    "develop": "sh ./node_modules/cloudflare-docs-engine/bin/commands.sh develop",
+    "ghactionsbootstrap": "sh ./node_modules/cloudflare-docs-engine/bin/commands.sh ghactionsbootstrap",
+    "savechanges": "sh ./node_modules/cloudflare-docs-engine/bin/commands.sh savechanges",
+    "serve": "sh ./node_modules/cloudflare-docs-engine/bin/commands.sh serve"
   }
 }
diff --git a/products/analytics/src/content/graphql-api/getting-started/authentication/api-key-auth.md b/products/analytics/src/content/graphql-api/getting-started/authentication/api-key-auth.md
index fb804d88d76031a..10578760460d55b 100644
--- a/products/analytics/src/content/graphql-api/getting-started/authentication/api-key-auth.md
+++ b/products/analytics/src/content/graphql-api/getting-started/authentication/api-key-auth.md
@@ -1,6 +1,6 @@
 ---
 title: Authenticate with a Cloudflare API key
-order: 20
+order: 30
 ---
 
 # Authenticate with a Cloudflare API key
@@ -9,35 +9,3 @@ API keys are unique to each Cloudflare user and used only for authentication. An
 
 * Learn how to [find your API Key](https://support.cloudflare.com/hc/articles/200167836) in the Cloudflare Dashboard
 * Learn how to [retrieve your API Key](https://api.cloudflare.com/#getting-started-requests) using the Cloudflare API
-
-## Edit HTTP headers for GraphiQL authentication
-
-1. Launch _GraphiQL_
-
-2. Click **Edit HTTP Headers**
-   ![ ](../../../static/images/GraphiQL-edit-http-headers.png)
-   The _Edit HTTP Headers_ window appears.
-   ![ ](../../../static/images/GraphiQL-edit-http-headers-window.png)
-
-3. Click **Add Header**
-   ![ ](../../../static/images/GraphiQL-add-header.png)
-
-4. Enter **X-AUTH-EMAIL** in the _Header name_ field and your email address registered with Cloudflare in the _Header value_ field, and click **Save**
-
-5. Click **Add Header**
-
-6. Enter **X-AUTH-KEY** in the _Header Name_ field, then paste your Global API Key in the _Header value_ field, and click **Save**
-   ![ ](../../../static/images/GraphiQL-edit-http-headers-complete.png)
-
-7. Click anywhere outside the _Edit HTTP Headers_ window in _GraphiQL_ to return to the _Untitled Query 1_ tab
-
-8. Enter `https://api.cloudflare.com/client/v4/graphql` in the _GraphQL Endpoint_ field
-   ![ ](../../../static/images/GraphiQL-response-pane.png)
-
-<Aside type='note' header='Note'>
-
-The right-side response pane is empty when you enter your information correctly. An error displays when there are problems with your header credentials.
-
-</Aside>
-
-Now that you have configured authentication with a Cloudflare API key, you are ready to run queries using _GraphiQL_.
diff --git a/products/analytics/src/content/graphql-api/getting-started/authentication/api-token-auth.md b/products/analytics/src/content/graphql-api/getting-started/authentication/api-token-auth.md
index 6c090e203851a9c..45e56989e72533c 100644
--- a/products/analytics/src/content/graphql-api/getting-started/authentication/api-token-auth.md
+++ b/products/analytics/src/content/graphql-api/getting-started/authentication/api-token-auth.md
@@ -1,6 +1,6 @@
 ---
 title: Configure an Analytics API token
-order: 30
+order: 20
 ---
 
 # Configure an Analytics API token
@@ -48,7 +48,7 @@ To configure a custom token, follow these steps:
 
   ![Create Custom Token page](../../../static/images/create-custom-api-token.png)
 
-1. Use the **Token name** text input to enter a descriptive name for your token.
+1. Enter a descriptive name for your token in the **Token name** text input field.
 
 1. To configure access to the GraphQL Analytics API, use the **Permissions** drop-down lists. To set permissions for the GraphQL Analytics API, select _Analytics_ from the second drop-down list.
 
@@ -70,7 +70,7 @@ To configure a custom token, follow these steps:
 
 1. Click **Continue to summary**.
 
-The next section of this walk through shows you how to [review and test your API token](#review-and-test-your-api-token).
+The next section of this walkthrough shows you how to [review and test your API token](#review-and-test-your-api-token).
 
 ## Review and create your API token
 
@@ -90,11 +90,11 @@ When you create a new token, a confirmation page displays that includes your tok
 
 To copy the token to your device's clipboard, click the **Copy** button.  
 
-<Aside type='note' header='Note'>
+<Aside type='warning' header='Warning'>
 
-The confirmation page is the only time that you can see the token, so make sure you store it safely, since anyone who has token can use it to access your data.
+The token displays only on the confirmation page, so copy the token and store it safely, since anyone who has the token can use it to access your data.
 
-If you lose the secret, you can [regenerate the token from the API Tokens page](https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys#12345681), so that you do not have to configure all the permissions again.
+If you lose the token, you can [regenerate it from the API Tokens page](https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys#12345681), so that you do not have to configure all the permissions again.
 
 </Aside>
 
diff --git a/products/analytics/src/content/graphql-api/getting-started/authentication/graphql-client-headers.md b/products/analytics/src/content/graphql-api/getting-started/authentication/graphql-client-headers.md
new file mode 100644
index 000000000000000..5b713b03d333458
--- /dev/null
+++ b/products/analytics/src/content/graphql-api/getting-started/authentication/graphql-client-headers.md
@@ -0,0 +1,33 @@
+---
+title: Configure GraphQL client endpoint and HTTP headers
+order: 40
+---
+
+# Configure GraphQL client endpoint and HTTP headers
+
+1. Launch _GraphiQL_.
+1. Click **Edit HTTP Headers**.
+   ![Click Edit HTTP Headers](../../../static/images/GraphiQL-edit-http-headers.png)
+   The _Edit HTTP Headers_ window appears.
+   ![Edit HTTP Headers Window](../../../static/images/GraphiQL-edit-http-headers-window.png)
+1. Click **Add Header**.
+   ![Click Add Header](../../../static/images/GraphiQL-add-header.png)
+1. Enter **X-AUTH-EMAIL** in the _Header name_ field and your email address registered with Cloudflare in the _Header value_ field, and click **Save**.
+1. To configure authentication, click **Add Header**. You can use Cloudflare Analytics API token authentication (recommended) or Cloudflare API key authentication.
+   * **Token authentication**:
+   Enter **Authorization** in the _Header Name_ field, and enter **Bearer {your-analytics-token}**  in the _Header value_ field, then click **Save**.
+   ![HTTP Headers](../../../static/images/GraphiQL-edit-http-headers-token.png)
+   * **Key authentication**:
+   Enter **X-AUTH-KEY** in the _Header Name_ field, and paste your Global API Key in the _Header value_ field, then click **Save**.
+   ![HTTP Headers](../../../static/images/GraphiQL-edit-http-headers-complete.png)
+1. Click anywhere outside the _Edit HTTP Headers_ window in _GraphiQL_ to close it and return to the main _GraphiQL_ display.
+1. Enter `https://api.cloudflare.com/client/v4/graphql` in the _GraphQL Endpoint_ field
+   ![Edit GraphQL Endpoint](../../../static/images/GraphiQL-response-pane.png)
+
+<Aside type='note' header='Note'>
+
+The right-side response pane is empty when you enter your information correctly. An error displays when there are problems with your header credentials.
+
+</Aside>
+
+Now that you have configured authentication with a Cloudflare API key, you are ready to run queries using _GraphiQL_.
diff --git a/products/analytics/src/content/graphql-api/getting-started/authentication/index.md b/products/analytics/src/content/graphql-api/getting-started/authentication/index.md
index 55f654849f76cdd..2c408f9e0e8bce6 100644
--- a/products/analytics/src/content/graphql-api/getting-started/authentication/index.md
+++ b/products/analytics/src/content/graphql-api/getting-started/authentication/index.md
@@ -5,9 +5,9 @@ order: 10
 
 # Authentication
 
-Cloudflare separates service configuration by zone. When there are multiple accounts each with many zones, it is important to restrict GraphQL Analytics API access to only those account and zone resources that are relevant for the task at hand.
+Cloudflare separates service configuration by zone. When there are multiple accounts, each with many zones, it is important to restrict GraphQL Analytics API access to only those account and zone resources that are relevant for the task at hand.
 
-To secure access your GraphQL Analytics data, use a Cloudflare API key or token to authenticate an API request.
+To secure access to your GraphQL Analytics data, use a Cloudflare API key or token to authenticate an API request.
 
 This table outlines the differences between Cloudflare API keys and tokens:
 
@@ -21,20 +21,20 @@ This table outlines the differences between Cloudflare API keys and tokens:
       </tr>
   </thead>
   <tbody>
+      <tr>
+        <td><a href='https://developers.cloudflare.com/api/tokens/create'>API Tokens</a></td>
+        <td>Cloudflare recommends API Tokens as the preferred way to interact with Cloudflare APIs. You can configure the scope of tokens to limit access to account and zone resources, and you can define the Cloudflare APIs to which the token authorizes access.</td>
+      </tr>
       <tr>
         <td><a href='https://developers.cloudflare.com/api/keys'>API Keys</a></td>
         <td><p>Unique to each Cloudflare user and used only for authentication. API keys do not authorize access to accounts or zones.</p>
         <p>Use the Global API Key for authentication. Only use the Origin CA Key when you create origin certificates through the API.</p></td>
       </tr>
-      <tr>
-        <td><a href='https://developers.cloudflare.com/api/tokens/create'>API Tokens</a></td>
-        <td>Cloudflare recommends API Tokens as the preferred way to interact with Cloudflare APIs. You can configure the scope of tokens to limit access to account and zone resources, and you can define the Cloudflare APIs to which the token authorizes access.</td>
-      </tr>
   </tbody>
 </table>
 
 </TableWrap>
 
-To find and retrieve API keys, as well as edit HTTP headers for authentication in GraphiQL, see [_Authenticate with a Cloudflare API key_](/graphql-api/getting-started/authentication/api-key-auth/).
-
 To create and configure GraphQL Analytics API tokens, see [_Configure an Analytics API token_](/graphql-api/getting-started/authentication/api-token-auth/).
+
+To find and retrieve API keys, as well as edit HTTP headers for authentication in GraphiQL, see [_Authenticate with a Cloudflare API key_](/graphql-api/getting-started/authentication/api-key-auth/).
diff --git a/products/analytics/src/content/graphql-api/getting-started/compose-graphql-query.md b/products/analytics/src/content/graphql-api/getting-started/compose-graphql-query.md
new file mode 100644
index 000000000000000..a59b206d08e5827
--- /dev/null
+++ b/products/analytics/src/content/graphql-api/getting-started/compose-graphql-query.md
@@ -0,0 +1,100 @@
+---
+title: Create a query in GraphiQL
+order: 50
+---
+
+# Create a query in GraphiQL
+
+You can use a GraphQL client to build and execute queries to the GraphQL API endpoint. The example below uses the [GraphiQL](https://github.com/graphql/graphiql/tree/main/packages/graphiql#readme) client.
+
+## Prerequisites
+
+This article assumes that you are already familiar with [_Querying basics_](/graphql-api/getting-started/querying-basics).
+
+Before you begin, [configure the API endpoint and HTTP headers](/graphql-api/getting-started/authentication/graphql-client-headers) in the GraphiQL client.
+
+<Aside type='tip' header='Tip'>
+
+To explore the documentation for the data sets and fields in the Cloudflare GraphQL schema, click **Docs** to open the _Documentation Explorer_ pane.
+
+For an introduction, see [Explore the GraphQL schema](/graphql-api/getting-started/explore-graphql-schema).
+
+</Aside>
+
+## Set up a query and choose a data set
+
+Click on the editing pane of GraphiQL and add this base query, replacing `zone-id` with your Cloudflare zone ID:
+
+![GraphiQL base query](../../static/images/graphiql-base-query.png)
+
+<Aside type='tip' header='Tip'>
+
+To find the ID for a zone, log in to your Cloudflare account and click the site for which you want to obtain the zone ID. In the Cloudflare dashboard **Overview** page, scroll to the **API** section in the right sidebar, which displays your zone ID and account ID.
+
+</Aside>
+
+To assist query building, the GraphiQL client has word completion. Insert your cursor in the query, in this case on the line below `zones`, and start entering a value to engage the feature. For example, when you type `firewall`, a popup menu displays the data sets that return firewall information:
+
+![firewall nodes](../../static/images/graphiql-word-completion.png)
+
+The text at the bottom of the list displays a short description of the data that the node returns.
+
+Select the data set you want to query and insert it. Either click the item in the list, or scroll using arrow keys and press <kbd>Return</kbd>. This example uses the `firewallEventsAdaptive` data set.
+
+## Supply required parameters
+
+Hover your mouse over a field to display a tooltip that describes the data set. In this example, hovering over the `firewallEventsAdaptive` node displays this description:
+
+![GraphiQL parameters](../../static/images/graphiql-set-up-base-query.png)
+
+To display information about the data set, including required parameters, click the data set name (blue text). The **Documentation Explorer** opens and displays details about the data set:
+
+![GraphiQL parameters](../../static/images/graphiql-parameters.png)
+
+Note that the `filter` and `limit` arguments are required, as indicated by the exclamation mark (`!`) after their type definitions (gold text). In this example, the `orderBy` argument is not required, though when used it requires a value of type `ZoneFirewallEventsAdaptiveOrderBy`.
+
+To browse a list of supported filter fields, click the filter type definition (gold text) in the Documentation Explorer. In this example, the type is `ZoneFirewallEventsAdaptiveFilter_InputObject`:
+
+![GraphiQL filter fields](../../static/images/graphiql-filter-fields.png)
+
+This example query shows the required `filter` and `limit` arguments for `firewallEventsAdaptive`:
+
+![GraphiQL filter values](../../static/images/graphiql-filter-values.png)
+
+## Define the fields to return with your query
+
+To browse the fields you can return with your query, hover your cursor over the dataset name in your query, and in the tooltip that displays, click the data type definition (gold text):
+
+![GraphiQL parameters](../../static/images/graphiql-set-up-base-query.png)
+
+**The Documentation Explorer** opens and displays a list of fields:
+
+![List of fields](../../static/images/graphiql-return-fields.png)
+
+To add the data fields that you want to display, type an opening brace (`{`) after the closing parenthesis for the parameters, then start typing the name of a field that you want to fetch. Use word completion to choose a field.
+
+This example query returns the `action`, `datetime`, `clientRequestHTTPHost`, and `userAgent` fields:
+
+![Example query with return fields](../../static/images/graphiql-query-return-field-values.png)
+
+Once you have entered all the fields you want your query to return, click the **Play** button to submit the query. The response pane contains the data fetched from the Cloudflare GraphQL API endpoint.
+
+![GraphiQL response](../../static/images/create-query-fw-data-set-play.png)
+
+## Variable substitution
+
+The GraphiQL client allows you to create variables for use in your queries.
+
+To add a query variable, click the **Query Variables** pane and enter a JSON object that defines  your variable.
+
+This example JSON object defines a query variable for a zone ID:
+
+```json
+{"zoneTag":"xxxxxxxxx"}
+```
+
+To use a variable in your query, prepend the `$` character to your variable name and use it to replace the desired value. When using a variable as a value in a query, do not wrap the variable in quotes as you would for a literal value.
+
+This example query uses the `zoneTag` query variable to represent the zone ID:
+
+![GraphiQL query variables](../../static/images/graphiql-query-variables.png)
diff --git a/products/analytics/src/content/graphql-api/getting-started/execute-graphql-query.md b/products/analytics/src/content/graphql-api/getting-started/execute-graphql-query.md
new file mode 100644
index 000000000000000..65ced2de4877441
--- /dev/null
+++ b/products/analytics/src/content/graphql-api/getting-started/execute-graphql-query.md
@@ -0,0 +1,71 @@
+---
+title: Use curl to query the Analytics API
+order: 60
+---
+
+# Use curl to query the Analytics API
+
+You can submit a [query built with the GraphiQL client](/graphql-api/getting-started/compose-graphql-query) as the payload in the `data` field of a POST request to the Analytics API.
+
+The advantage of executing a request with [curl](https://curl.se/) is that you can redirect the response to a file and execute other post processing methods.
+
+The GraphQL endpoint requires valid JSON, so you must pass the query as the _value_ part of a JSON _key:value_ pair with a key named `query`.
+
+Pass the list of variables in another JSON _key:value_ pair with a key named `variables`.
+
+The script below returns the firewall events in one zone over the last 24 hours:
+
+```bash
+---
+header: Example bash script that uses curl to query Analytics API
+---
+#!/bin/bash
+#
+# This script fetches the last 24 hours of firewall events for the ZoneID passed
+# in as the first parameter using the global key passed in as the second parameter.
+######################################################################################
+ 
+ZoneID="$1"
+global_key="$2"
+Email="user@domain.com"
+#
+# Calculate 24 hours back and produce the start and end times in the appropriate format.
+back_seconds=60*60*24  # 24 hours
+end_epoch=$(date +'%s')
+let start_epoch=$end_epoch-$back_seconds
+start_date=$(date --date="@$start_epoch" +'%Y-%m-%dT%H:%m:%SZ')
+end_date=$(date --date="@$end_epoch" +'%Y-%m-%dT%H:%m:%SZ')
+ 
+PAYLOAD='{ "query":
+  "query {
+    viewer {
+      zones(filter: { zoneTag: $zoneTag }) {
+      firewallEventsAdaptive(
+        filter: $filter
+        limit: 10000
+        orderBy: [datetime_DESC, rayName_DESC]
+      ) {
+          action,
+          datetime,
+          rayName,
+          clientRequestHTTPHost,
+          userAgent
+        }
+      }
+    }
+  }",'
+PAYLOAD="$PAYLOAD
+
+  \"variables\": {
+    \"zoneTag\": \"$ZoneID\",
+    \"filter\": {
+      \"datetime_gt\": \"$start_date\",
+      \"datetime_leq\": \"$end_date\"
+    }
+  }
+}"
+
+# Run query to GraphQL API endpoint
+
+curl -s -X POST -H "Content-Type: application/json" -H "X-Auth-Email: $Email" -H  X-Auth-Key: $global_key --data "$(echo $PAYLOAD)" https://api.cloudflare.com/client/v4/graphql/
+```
diff --git a/products/analytics/src/content/graphql-api/getting-started/explore-graphql-schema.md b/products/analytics/src/content/graphql-api/getting-started/explore-graphql-schema.md
new file mode 100644
index 000000000000000..1bd125ab766bcb8
--- /dev/null
+++ b/products/analytics/src/content/graphql-api/getting-started/explore-graphql-schema.md
@@ -0,0 +1,96 @@
+---
+title: Explore the Analytics schema with GraphiQL
+order: 40
+---
+
+# Explore the Analytics schema with GraphiQL
+
+The GraphQL API offers [introspection](https://graphql.org/learn/introspection/), which allows you to explore the graph (by making API calls) to see the available data sets, fields, and operations you can perform.
+
+[GraphiQL](https://github.com/graphql/graphiql/tree/main/packages/graphiql#readme) is a GraphQL client that uses introspection to provide the **Documentation Explorer**, a tool with which you can visually browse a GraphQL schema.
+
+This article provides an introduction to browsing the Analytics GraphQL schema with the Documentation Explorer.
+
+## Prerequisites
+
+Before you begin, [configure the API endpoint and HTTP headers](/graphql-api/getting-started/authentication/graphql-client-headers) in the GraphiQL client.
+
+## Open the Documentation Explorer
+
+To open the GraphiQL Documentation Explorer, click the **Docs** link in header of the response pane:
+
+![GraphiQL Docs link](../../static/images/graphiql-docs-link.png)
+
+The **Documentation Explorer** opens and displays a list of available objects:
+
+![GraphiQl Doc Explorer](../../static/images/graphiql-doc-explorer.png)
+
+ Objects in the **Documentation Explorer** use this syntax:
+
+```
+object-name: object-type-definition
+```
+
+## Find the type definition of an object
+
+When you first open the **Documentation Explorer** pane, the `mutation` and `query` root types display:
+
+![Mutation and query nodes](../../static/images/graphiql-doc-explorer-query-mutations.png)
+
+In this example `query` is the name of a root, and `Query` is the type definition.
+
+## Find the fields available for a type definition
+
+Click on the **type definition** of a node to view the fields that it provides. The **Documentation Explorer** also displays descriptions of the nodes.
+
+For example, click the **Query** type definition. The **Documentation Explorer** displays the fields that `Query` provides. In this example, the fields are `cost` and `viewer`:
+
+![Cost and viewer fields](../../static/images/graphiql-doc-explorer-view-cost.png)
+
+To explore the schema, click the names of objects and definitions. You can also use the search input (magnifying glass icon) and breadcrumb links in the header.
+
+## Find the arguments associated with a field
+
+Click the type definition of the `viewer` field (gold text) to list its sub-fields. The `viewer` field provides sub-fields that allow you to query `accounts` or `zones` data:
+
+![viewer fields](../../static/images/graphiql-doc-explorer-viewer-fields.png)
+
+The `accounts` and `zones` fields take arguments to specify which data set to query.
+
+For example, `zones` can take a filter of `ZoneFilter_InputObject` type as an argument. To view the fields available to filter, click **ZoneFilter_InputObject**.
+
+## Find the data sets available for a zone
+
+To view a list of the data sets available to query, click the **zone** type definition (gold text):
+
+![Zones type definition](../../static/images/graphiql-doc-explorer-zones.png)
+
+A list of data sets displays in the **Fields** section, each with list of valid arguments and a brief description. Arguments that end with an exclamation mark (`!`) are required.
+
+![Search nodes](../../static/images/graphiql-doc-explorer-zone-fields.png)
+
+Use the search input (magnifying glass icon) to find specific data sets:
+
+![Find field in Doc Explorer](../../static/images/graphiql-doc-explorer-find-firewall.png)
+
+To select a data set, click its name.
+
+The definition for the data set displays. This example shows the `firewallEventsAdaptive` data set:
+
+![firewallEventsAdaptive data set definition](../../static/images/graphiql-doc-explorer-firewallevents-definition.png)
+
+Refer to [_Data Sets (tables)_](/graphql-api/features/data-sets) for details on the nomenclature and behavior of these nodes.
+
+## Find the fields available for a data set
+
+To view the fields available for a particular data set, click on its type definition (gold text).
+
+For example, click the **ZoneFirewallEventsAdaptive** type definition to view the fields available for the `firewallEventsAdaptive` data set:
+
+![firewallEventsAdaptive definition](../../static/images/graphiql-doc-explorer-firewall-type-definition.png)
+
+The list of fields displays:
+
+![ZoneFirewallEventsAdaptive type definition](../../static/images/graphiql-doc-explorer-firewall-fields.png)
+
+For more on working with the Analytics API in GraphiQL, see [Create a query in GraphiQL](/graphql-api/getting-started/compose-graphql-query).
diff --git a/products/analytics/src/content/graphql-api/getting-started/index.md b/products/analytics/src/content/graphql-api/getting-started/index.md
index 1c8c22d3755686c..edd61016c2381c6 100644
--- a/products/analytics/src/content/graphql-api/getting-started/index.md
+++ b/products/analytics/src/content/graphql-api/getting-started/index.md
@@ -9,5 +9,8 @@ Use these articles to get started with the Cloudflare GraphQL Analytics API:
 
 * [_Authentication_](/graphql-api/getting-started/authentication) walks you through the options and the steps required to successfully set up your access to Cloudflare API.
 * [_Querying basics_](/graphql-api/getting-started/querying-basics) brings you simple query examples for you to start exploring the GraphQL Analytics API.
+* [_Explore the GraphQL schema in the GraphQL client_](/graphql-api/getting-started/explore-graphql-schema/) introduces the introspective documentation in the GraphQL API.
+* [_Create a query in a GraphQL client_](/graphql-api/getting-started/compose-graphql-query/) describes how to build and run a query against the Cloudflare GraphQL API in the GraphiQL client.
+* [_Use curl to query the GraphQL API_](/graphql-api/getting-started/execute-graphql-query/) walks you through running a query against the Cloudflare GraphQL API from the command line.
 
 For examples of how to build your own GraphQL Analytics dashboard and query specific information, such as Firewall and Workers events, see [_Tutorials_](/graphql-api/tutorials).
diff --git a/products/analytics/src/content/graphql-api/getting-started/querying-basics.md b/products/analytics/src/content/graphql-api/getting-started/querying-basics.md
index d9172a214b17758..a9ee3e00120e174 100644
--- a/products/analytics/src/content/graphql-api/getting-started/querying-basics.md
+++ b/products/analytics/src/content/graphql-api/getting-started/querying-basics.md
@@ -5,25 +5,122 @@ order: 20
 
 # Querying basics
 
-GraphQL structures data as a graph. You can explore the edges of the graph by using queries to get the data you need. This is an example query format:
+## Structure of a GraphQL query
+
+GraphQL structures data as a graph. GraphQL uses a schema to define the objects and their hierarchy in your data graph. You can explore the edges of the graph by using queries to get the data you need. These queries must respect the structure of the schema.
+
+At the core of a GraphQL query is a _node_, followed by its _fields_. The node is an object of a certain _type_; the type specifies the fields that make up the object.
+
+A field can be another node, in which case the appropriate query would contain nested elements. Some nodes look like functions that can take on arguments to limit the scope of what they can act on. You can apply filters at each node.
+
+## Query against the Cloudflare GraphQL schema
+
+A typical query against the Cloudflare GraphQL schema is made up of five components:
+
+* `query` - The root node.
+* `viewer` - A nested node indicating to GraphQL that you want to view the results. The `viewer` component represents the initial node of the user running the query.
+* `zones` or `account` - A nested node indicating the domain area or account you want to query against. The `viewer` can access one or more zones or accounts. Each zone or account contains a collection of data sets.
+* **Leaf node** - This specifies the data set you want to query against in a zone or account. `firewallEventsAdaptive` is an example of a leaf node that represents a data set for firewall events in a `zone` node.
+* **Field** - The fields in a query specify the set of metrics that you want to fetch. The `firewallEventsAdaptive` leaf node includes the `clientIP` field. If your leaf node queries requests, possible fields would include response bytes or the time at which requests were received.
+
+The following example shows the format for a firewall query:
 
 ```code
-viewer {
-      zones(filter:...) {
-         requests(filter:...) {
-           date, time, bytes,...
+
+query{
+  viewer {
+      zones(filter: {...}) {
+         firewallEventsAdaptive( limit: 10, orderBy: [...], filter: {...} ) {
+           datetime, clientCountryName, action, ...
          }
       }
+  }
 }
 ```
 
- where the `viewer` represents the initial node of the user running the query.
+### Example Query
 
-The viewer can access one or more zones (domains) or accounts. Each zone or account contains various data sets, such as HTTP requests for a zone. There are numerous metrics and dimensions about requests, such as the the response bytes or the time at which the requests were received. You can apply filters at each node.
+The following query searches data from a zone for firewall events that occurred during a time interval. It sorts the results, limits the amount of results returned, and displays a set of fields for each firewall event.
 
-This example query shows a range of GraphQL functionality. Two data sets for the specified zone are queried simultaneously, filters and aggregations are applied, and a limit is set on the number of records returned (note that you must include the `limit` argument, which can be equal or up to 10,000).
+```json
+---
+header: Query Firewall events for a specific time interval
+---
+query
+{
+  viewer
+  {
+    zones(filter: { zoneTag: "11111111"})
+    {
+      firewallEventsAdaptive(
+          filter: {
+            datetime_gt: "2020-08-03T02:07:05Z",
+            datetime_lt: "2020-08-03T17:07:05Z" 
+          },
+          limit: 2,
+          orderBy: [datetime_DESC, rayName_DESC])
+      {
+        action
+        datetime
+        rayName
+        clientRequestHTTPHost
+        userAgent
+      }
+    }
+  }
+}
+```
 
-```code
+* `zones(filter: { zoneTag: "11111111"})` confines the query to search to one zone.
+* `firewallEventsAdaptive` is the large data set that you want to query against. The set of data returned is defined by the following:
+    * `filter:{}` limits the scope to firewall events between two times: `datetime_gt` (greater than) and `datetime_lt` (less than).
+    * `limit: 2` limits the results to 2 (the maximum value is 10,000).
+    * `orderBy` sorts the results, first by `datetime_DESC`, the datetime field , in descending order, and then by the rayname, also in descending order.
+    * The list of fields: `action` (Allow, Block, Challenge), `datetime`, `rayName` (the RayID), `clientRequestHTTPHost` (the host the client requested), and `userAgent`.
+
+You can send the query with an API call or by clicking **Play** in the GraphiQL client. The format of the response is in JSON:
+
+```json
+---
+header: Query response from firewallEventsAdaptive
+---
+{
+  "data": {
+    "viewer": {
+      "zones": [
+        {
+          "firewallEventsAdaptive": [
+            {
+              "action": "simulate",
+              "clientRequestHTTPHost": "cloudflare.guru",
+              "datetime": "2020-08-03T17:07:03Z",
+              "rayName": "5bd1a1fc584357ed",
+              "userAgent": "Mozilla/5.0 (compatible;Cloudflare-Healthchecks/1.0;+https://www.cloudflare.com/; healthcheck-id: 08c774cde2f3c385)"
+            },
+            {
+              "action": "simulate",
+              "clientRequestHTTPHost": "cloudflare.guru",
+              "datetime": "2020-08-03T17:07:01Z",
+              "rayName": "5bd1a1ef3bb5d296",
+              "userAgent": "Mozilla/5.0 (compatible;Cloudflare-Healthchecks/1.0;+https://www.cloudflare.com/; healthcheck-id: 764497f790f6a070)"
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "errors": null
+}
+```
+
+## Query two data sets in a single API call
+
+This example query employs a broad range of GraphQL functionality. The example queries two data sets for the specified zone simultaneously, applies filters and aggregations, and sets a limit on the number of records returned. (Note that you must include the `limit` argument, which can be equal or up to 10,000.)
+
+```json
+---
+header: Query two data sets simultaneously
+---
 query {
   viewer {
     zones(filter: {zoneTag: "<your zone ID>"}) {
@@ -58,11 +155,15 @@ This is only an example. You must specify the <code>zoneTag</code> for your doma
 
 </Aside>
 
-How can you tell what data sets, metrics, dimensions, operators, and functions are available? One of the great features of a GraphQL API is that it offers "introspection": you can explore the graph (by making API calls) to see the available data sets, the fields and their types, and the operations you can perform. _GraphiQL_ uses this functionality to provide a "Documentation Explorer" that you can use to understand the schema. Click on the _Docs_ link on the right-hand side and then drill down starting with `Query` and proceeding to `viewer` and then `zone`. Introspection is also used to provide query auto-complete and syntax validation.
+## Introspection
+
+The GraphQL API offers [introspection](https://graphql.org/learn/introspection/), which allows you to explore the graph (by making API calls) to see the available data sets, fields, and operations you can perform.
+
+For an introduction to browsing the Analytics GraphQL API, see [_Explore the Analytics schema with GraphiQL_](/graphql-api/getting-started/explore-graphql-schema).
 
 ## Helpful Resources
 
-Handy links for setting up the GraphQL Analytics API and learning about GraphQL.
+Here are some helpful articles about working with the Cloudflare Analytics API and GraphQL.
 
 ### Cloudflare specific
 
diff --git a/products/analytics/src/content/graphql-api/index.md b/products/analytics/src/content/graphql-api/index.md
index 6de48a71dfc03bc..1b35b00de097a32 100644
--- a/products/analytics/src/content/graphql-api/index.md
+++ b/products/analytics/src/content/graphql-api/index.md
@@ -11,6 +11,16 @@ The basis of the API is the [GraphQL framework](https://graphql.org/), created a
 
 GraphQL models a business domain as a graph using a schema. In the schema, there are logical definitions for different types of nodes and their connections (edges). These nodes are the data sets you use for your analytics. You write queries in GraphQL much like in SQL: you specify the data set (table), the metrics to retrieve (such as requests and bytes), and filter or group by dimensions (for example, a time period).
 
+GraphQL differs from a traditional API: it has one single endpoint:
+
+```
+https://api.cloudflare.com/client/v4/graphql
+```
+
+You pass the query parameters as a JSON object in the payload of a `POST` request to this endpoint.
+
+You can use `curl` to make requests to the GraphQL Analytics API. Alternatively, you can use a GraphQL client to construct queries and pass requests to the GraphQL Analytics API.
+
 ## Clients
 
-We are using [_GraphiQL_](https://electronjs.org/apps/graphiql) for our example GraphQL queries. There are many other popular open-source clients that you can find online, such as [_Altair_](https://altair.sirmuel.design) and [_Insomnia_](https://insomnia.rest). Using `curl` is also a possibility.
+We are using [_GraphiQL_](https://electronjs.org/apps/graphiql) for our example GraphQL queries. There are many other popular open-source clients that you can find online, such as [_Altair_](https://altair.sirmuel.design) and [_Insomnia_](https://insomnia.rest).
diff --git a/products/analytics/src/content/static/images/GraphiQL-edit-http-headers-token.png b/products/analytics/src/content/static/images/GraphiQL-edit-http-headers-token.png
new file mode 100644
index 000000000000000..33f219288684895
Binary files /dev/null and b/products/analytics/src/content/static/images/GraphiQL-edit-http-headers-token.png differ
diff --git a/products/analytics/src/content/static/images/create-query-fw-data-set-description.png b/products/analytics/src/content/static/images/create-query-fw-data-set-description.png
new file mode 100644
index 000000000000000..87e285b8e4b6b38
Binary files /dev/null and b/products/analytics/src/content/static/images/create-query-fw-data-set-description.png differ
diff --git a/products/analytics/src/content/static/images/create-query-fw-data-set-field-type.png b/products/analytics/src/content/static/images/create-query-fw-data-set-field-type.png
new file mode 100644
index 000000000000000..6da0edc6cf72831
Binary files /dev/null and b/products/analytics/src/content/static/images/create-query-fw-data-set-field-type.png differ
diff --git a/products/analytics/src/content/static/images/create-query-fw-data-set-filter.png b/products/analytics/src/content/static/images/create-query-fw-data-set-filter.png
new file mode 100644
index 000000000000000..7b1dc48e2854068
Binary files /dev/null and b/products/analytics/src/content/static/images/create-query-fw-data-set-filter.png differ
diff --git a/products/analytics/src/content/static/images/create-query-fw-data-set-play.png b/products/analytics/src/content/static/images/create-query-fw-data-set-play.png
new file mode 100644
index 000000000000000..c791005c390dfc8
Binary files /dev/null and b/products/analytics/src/content/static/images/create-query-fw-data-set-play.png differ
diff --git a/products/analytics/src/content/static/images/create-query-fw-data-set.png b/products/analytics/src/content/static/images/create-query-fw-data-set.png
new file mode 100644
index 000000000000000..944e7e1b2af874c
Binary files /dev/null and b/products/analytics/src/content/static/images/create-query-fw-data-set.png differ
diff --git a/products/analytics/src/content/static/images/docs-fw-data-set.png b/products/analytics/src/content/static/images/docs-fw-data-set.png
new file mode 100644
index 000000000000000..6ddb5cb161c71a5
Binary files /dev/null and b/products/analytics/src/content/static/images/docs-fw-data-set.png differ
diff --git a/products/analytics/src/content/static/images/docs-fw-fields-list.png b/products/analytics/src/content/static/images/docs-fw-fields-list.png
new file mode 100644
index 000000000000000..c30cfb16a626350
Binary files /dev/null and b/products/analytics/src/content/static/images/docs-fw-fields-list.png differ
diff --git a/products/analytics/src/content/static/images/docs-query.png b/products/analytics/src/content/static/images/docs-query.png
new file mode 100644
index 000000000000000..4fb1ab27349ed89
Binary files /dev/null and b/products/analytics/src/content/static/images/docs-query.png differ
diff --git a/products/analytics/src/content/static/images/docs-viewer.png b/products/analytics/src/content/static/images/docs-viewer.png
new file mode 100644
index 000000000000000..d5787baef658837
Binary files /dev/null and b/products/analytics/src/content/static/images/docs-viewer.png differ
diff --git a/products/analytics/src/content/static/images/docs-zone-filter.png b/products/analytics/src/content/static/images/docs-zone-filter.png
new file mode 100644
index 000000000000000..f1c52cbdf91dede
Binary files /dev/null and b/products/analytics/src/content/static/images/docs-zone-filter.png differ
diff --git a/products/analytics/src/content/static/images/docs-zone.png b/products/analytics/src/content/static/images/docs-zone.png
new file mode 100644
index 000000000000000..a019aa000ca0557
Binary files /dev/null and b/products/analytics/src/content/static/images/docs-zone.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-base-query.png b/products/analytics/src/content/static/images/graphiql-base-query.png
new file mode 100644
index 000000000000000..245005cd1334d8d
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-base-query.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-find-firewall.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-find-firewall.png
new file mode 100644
index 000000000000000..f245b332f9c7cf4
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-find-firewall.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-firewall-fields.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewall-fields.png
new file mode 100644
index 000000000000000..f75f590edf8bc65
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewall-fields.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-firewall-type-definition.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewall-type-definition.png
new file mode 100644
index 000000000000000..355013ead8ae415
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewall-type-definition.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-firewallevents-definition.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewallevents-definition.png
new file mode 100644
index 000000000000000..05a894eedfc3773
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewallevents-definition.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-firewalleventsadaptive.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewalleventsadaptive.png
new file mode 100644
index 000000000000000..f1246c27ca7882f
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-firewalleventsadaptive.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-query-mutations.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-query-mutations.png
new file mode 100644
index 000000000000000..b4518eb90a7837f
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-query-mutations.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-view-cost.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-view-cost.png
new file mode 100644
index 000000000000000..420938e5def6002
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-view-cost.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-viewer-fields.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-viewer-fields.png
new file mode 100644
index 000000000000000..75adf189b08d77b
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-viewer-fields.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-zone-fields.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-zone-fields.png
new file mode 100644
index 000000000000000..3bb57c04c3468cc
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-zone-fields.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer-zones.png b/products/analytics/src/content/static/images/graphiql-doc-explorer-zones.png
new file mode 100644
index 000000000000000..65cc8156d9d2de2
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer-zones.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-doc-explorer.png b/products/analytics/src/content/static/images/graphiql-doc-explorer.png
new file mode 100644
index 000000000000000..4b51a9bee06ee6a
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-doc-explorer.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-docs-link.png b/products/analytics/src/content/static/images/graphiql-docs-link.png
new file mode 100644
index 000000000000000..07cb0e061155ce9
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-docs-link.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-filter-fields.png b/products/analytics/src/content/static/images/graphiql-filter-fields.png
new file mode 100644
index 000000000000000..d13a5cb760fd454
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-filter-fields.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-filter-values.png b/products/analytics/src/content/static/images/graphiql-filter-values.png
new file mode 100644
index 000000000000000..a8c981f729f0588
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-filter-values.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-parameters.png b/products/analytics/src/content/static/images/graphiql-parameters.png
new file mode 100644
index 000000000000000..c601607b0f01846
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-parameters.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-query-return-field-values.png b/products/analytics/src/content/static/images/graphiql-query-return-field-values.png
new file mode 100644
index 000000000000000..e65687e7261e9f3
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-query-return-field-values.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-query-variables.png b/products/analytics/src/content/static/images/graphiql-query-variables.png
new file mode 100644
index 000000000000000..89a7e043e62e91c
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-query-variables.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-return-fields.png b/products/analytics/src/content/static/images/graphiql-return-fields.png
new file mode 100644
index 000000000000000..1d1f0d3cfd40f0b
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-return-fields.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-set-up-base-query.png b/products/analytics/src/content/static/images/graphiql-set-up-base-query.png
new file mode 100644
index 000000000000000..99c97d197689733
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-set-up-base-query.png differ
diff --git a/products/analytics/src/content/static/images/graphiql-word-completion.png b/products/analytics/src/content/static/images/graphiql-word-completion.png
new file mode 100644
index 000000000000000..ce7bd0d16ca2013
Binary files /dev/null and b/products/analytics/src/content/static/images/graphiql-word-completion.png differ