diff --git a/examples/next/getting-started/src/pages/posts/[postSlug].tsx b/examples/next/getting-started/src/pages/posts/[postSlug].tsx
index ef94986d0..81b5ed62b 100644
--- a/examples/next/getting-started/src/pages/posts/[postSlug].tsx
+++ b/examples/next/getting-started/src/pages/posts/[postSlug].tsx
@@ -2,11 +2,36 @@ import { getNextStaticProps, client, is404 } from '@wpengine/headless-next';
 import { Footer, Header, Hero } from 'components';
 import { GetStaticPropsContext } from 'next';
 import Head from 'next/head';
+import type { Post } from '@wpengine/headless-core';
+import styles from 'scss/pages/post.module.scss';
 
-export default function Page() {
-  const { usePost, useGeneralSettings } = client();
+export interface PostProps {
+  post: Post | Post['preview']['node'] | null | undefined;
+  preview?: boolean;
+}
+
+export function PostComponent({ post, preview }: PostProps) {
+  const { useGeneralSettings, useQuery } = client();
   const generalSettings = useGeneralSettings();
-  const post = usePost();
+  const { isLoading } = useQuery().$state;
+
+  if (preview && (typeof window === 'undefined' || isLoading)) {
+    return (
+      <>
+        <Header
+          title={generalSettings.title}
+          description={generalSettings.description}
+        />
+        <Hero title={'Loading...'} />
+        <main className="content content-single">
+          <div className="wrap">
+            <div>Loading...</div>
+          </div>
+        </main>
+        <Footer copyrightHolder={generalSettings.title} />
+      </>
+    );
+  }
 
   return (
     <>
@@ -17,18 +42,15 @@ export default function Page() {
 
       <Head>
         <title>
-          {post.title()} - {generalSettings.title}
+          {post?.title()} - {generalSettings.title}
         </title>
       </Head>
 
-      <Hero title={post.title()} bgImage={post.featuredImageId} />
+      <Hero title={post?.title()} bgImage={post?.featuredImageId} />
 
       <main className="content content-single">
         <div className="wrap">
-          {post && (
-            <div dangerouslySetInnerHTML={{ __html: post.content() ?? '' }} />
-          )}
-          <div>{ post.author.node.nicename }</div>
+          <div dangerouslySetInnerHTML={{ __html: post?.content() ?? '' }} />
         </div>
       </main>
 
@@ -37,6 +59,13 @@ export default function Page() {
   );
 }
 
+export default function Page() {
+  const { usePost } = client();
+  const post = usePost();
+
+  return <PostComponent post={post} />;
+}
+
 export async function getStaticProps(context: GetStaticPropsContext) {
   if (await is404(context)) {
     return {
diff --git a/examples/next/getting-started/src/pages/posts/index.tsx b/examples/next/getting-started/src/pages/posts/index.tsx
index 18298f2fa..79e4866c1 100644
--- a/examples/next/getting-started/src/pages/posts/index.tsx
+++ b/examples/next/getting-started/src/pages/posts/index.tsx
@@ -4,14 +4,14 @@ import { GetStaticPropsContext } from 'next';
 import Head from 'next/head';
 import { useRouter } from 'next/router';
 import React from 'react';
-import styles from 'scss/pages/home.module.scss';
+import styles from 'scss/pages/posts.module.scss';
 
 export default function Page() {
   const {
     query = {},
   } = useRouter();
   const { postSlug, postCursor } = query;
-  const { usePosts, useGeneralSettings } = client();
+  const { usePosts, useGeneralSettings, useQuery, } = client();
   const generalSettings = useGeneralSettings();
   const isBefore = postSlug === 'before';
   const posts = usePosts({
@@ -21,6 +21,10 @@ export default function Page() {
     last: isBefore ? 6 : undefined,
   });
 
+  if (useQuery().$state.isLoading) {
+    return null;
+  }
+
   return (
     <>
       <Header
diff --git a/examples/next/getting-started/src/pages/preview/post/preview.tsx b/examples/next/getting-started/src/pages/preview/post/preview.tsx
deleted file mode 100644
index 5327a6bc1..000000000
--- a/examples/next/getting-started/src/pages/preview/post/preview.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { client } from '@wpengine/headless-next';
-import { Footer, Header, CTA } from 'components';
-import { useRouter } from 'next/router';
-
-export default function Page() {
-  const { query: { p }} = useRouter();
-  const { usePost, useGeneralSettings, useQuery } = client();
-  const generalSettings = useGeneralSettings();
-  const post = usePost();
-  const { $state } = useQuery();
-
-  if ($state.isLoading) {
-    return <>Loading...</>;
-  }
-
-  return (
-    <>
-      <Header
-        title={generalSettings.title}
-        description={generalSettings.description}
-      />
-
-      <main className="content content-single">
-        <div className="wrap">
-          <div dangerouslySetInnerHTML={{ __html: post.content() ?? '' }} />
-        </div>
-
-        <CTA
-          title="Start your headless journey today"
-          buttonText="Get Started"
-          buttonURL="https://github.com/wpengine/headless-framework/"
-          headingLevel="h2">
-          <p>
-            Learn more in the{' '}
-            <a href="https://github.com/wpengine/headless-framework">
-              Headless Framework GitHub repository
-            </a>
-            .
-          </p>
-        </CTA>
-      </main>
-
-      <Footer copyrightHolder={generalSettings.title} />
-    </>
-  );
-}
diff --git a/examples/next/getting-started/src/scss/pages/home.module.scss b/examples/next/getting-started/src/scss/pages/home.module.scss
index 1e2e6d56a..f66a026e5 100644
--- a/examples/next/getting-started/src/scss/pages/home.module.scss
+++ b/examples/next/getting-started/src/scss/pages/home.module.scss
@@ -1,4 +1,4 @@
-// CSS for the themes/front-page.tsx template.
+// CSS for the index.tsx template.
 
 @import "scss/variables";
 
diff --git a/examples/next/getting-started/src/scss/pages/posts.module.scss b/examples/next/getting-started/src/scss/pages/posts.module.scss
index ee6e3417a..90447b325 100644
--- a/examples/next/getting-started/src/scss/pages/posts.module.scss
+++ b/examples/next/getting-started/src/scss/pages/posts.module.scss
@@ -1,4 +1,4 @@
-// CSS for the themes/front-page.tsx template.
+// CSS for the posts/index.tsx template.
 
 @import "scss/variables";
 
diff --git a/packages/core/src/auth/authorize.ts b/packages/core/src/auth/authorize.ts
index b0c23cf61..ce9db6706 100644
--- a/packages/core/src/auth/authorize.ts
+++ b/packages/core/src/auth/authorize.ts
@@ -1,8 +1,10 @@
 import { headlessConfig } from '../config';
 import isString from 'lodash/isString';
-import { parseUrl } from '../utils';
+import { isServerSide, parseUrl } from '../utils';
 import { CookieOptions, getAccessToken } from './cookie';
 import fetch from 'isomorphic-fetch';
+import isEmpty from 'lodash/isEmpty';
+import trimEnd from 'lodash/trimEnd';
 
 /**
  * Exchanges an Authorization Code for an Access Token that you can use to make authenticated requests to
@@ -61,13 +63,22 @@ export function ensureAuthorization(
   redirectUri: string,
   options?: CookieOptions,
 ): string | { redirect: string } | undefined {
-  const { wpUrl, apiUrl, apiEndpoint } = headlessConfig();
+  const { wpUrl, apiEndpoint } = headlessConfig();
+  let { apiUrl } = headlessConfig();
   const accessToken = getAccessToken(options);
 
-  if (!isString(apiUrl)) {
-    throw new Error(
-      'You must provide an apiUrl value in your Headless config in order to use the authorize middleware',
-    );
+  if (!!accessToken && accessToken.length > 0) {
+    return accessToken;
+  }
+
+  if (!isString(apiUrl) || isEmpty(apiUrl)) {
+    if (!isServerSide()) {
+      apiUrl = trimEnd(window.location.origin, '/');
+    } else {
+      throw new Error(
+        'You must provide an apiUrl value in your Headless config in order to use the authorize middleware',
+      );
+    }
   }
 
   if (!isString(apiEndpoint)) {
@@ -76,10 +87,6 @@ export function ensureAuthorization(
     );
   }
 
-  if (!!accessToken && accessToken.length > 0) {
-    return accessToken;
-  }
-
   const parsedUrl = parseUrl(redirectUri);
 
   if (!parsedUrl) {
diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index c3db1f071..f74c60725 100644
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -109,7 +109,7 @@ let configSet = false;
 export function normalizeConfig(config: HeadlessConfig): HeadlessConfig {
   const cfg = defaults({}, config, {
     blogUrlPrefix: '',
-    apiUrl: config.wpUrl,
+    apiUrl: '',
     apiEndpoint: '/api/auth/wpe-headless',
   });
 
diff --git a/packages/core/src/utils/convert.ts b/packages/core/src/utils/convert.ts
index a1d02746e..ec4681445 100644
--- a/packages/core/src/utils/convert.ts
+++ b/packages/core/src/utils/convert.ts
@@ -76,7 +76,11 @@ export function parseUrl(url: string | undefined): ParsedUrlInfo | undefined {
 
   const parsed = URL_REGEX.exec(url);
 
-  if (!isArrayLike(parsed) || isEmpty(parsed) || isUndefined(parsed[4])) {
+  if (
+    !isArrayLike(parsed) ||
+    isEmpty(parsed) ||
+    (isUndefined(parsed[4]) && url[0] !== '/')
+  ) {
     return;
   }
 
diff --git a/packages/next/src/client.ts b/packages/next/src/client.ts
index 8db3593b8..7ec1a621a 100644
--- a/packages/next/src/client.ts
+++ b/packages/next/src/client.ts
@@ -3,7 +3,7 @@ import {
   CreateReactClientOptions,
   ReactClient,
 } from '@gqless/react';
-import type { LoggerOptions } from '@gqless/logger';
+// import type { LoggerOptions } from '@gqless/logger';
 import { useRouter } from 'next/router';
 import isObject from 'lodash/isObject';
 import merge from 'lodash/merge';
@@ -13,19 +13,21 @@ import {
   GeneratedSchema,
   PostIdType,
   PageIdType,
+  ensureAuthorization,
 } from '@wpengine/headless-core';
+// import defaults from 'lodash/defaults';
+import { useEffect } from 'react';
+import isString from 'lodash/isString';
 import {
   hasCategoryId,
   hasCategorySlug,
+  HasObject,
   hasPageId,
   hasPageUri,
-  hasPagePreviewUri,
   hasPostId,
   hasPostSlug,
   hasPostUri,
-  hasPostPreviewUri,
 } from './utils';
-import defaults from 'lodash/defaults';
 
 /* eslint-disable @typescript-eslint/ban-types, @typescript-eslint/explicit-module-boundary-types */
 export function client<Schema extends GeneratedSchema = GeneratedSchema>(
@@ -111,13 +113,6 @@ export function client<Schema extends GeneratedSchema = GeneratedSchema>(
           idType: PostIdType.URI,
         }) as ReturnType<Schema['query']['post']>;
       }
-      if (hasPostPreviewUri(query)) {
-        return post({
-          id: query.postPreviewUri.join('/'),
-          idType: PostIdType.URI,
-          asPreview: true,
-        }) as ReturnType<Schema['query']['post']>;
-      }
     }
 
     return post(args as Parameters<Schema['query']['post']>[0]) as ReturnType<
@@ -150,13 +145,6 @@ export function client<Schema extends GeneratedSchema = GeneratedSchema>(
           idType: PageIdType.URI,
         }) as ReturnType<Schema['query']['page']>;
       }
-      if (hasPagePreviewUri(query)) {
-        return page({
-          id: query.pagePreviewUri.join('/'),
-          idType: PageIdType.URI,
-          asPreview: true,
-        }) as ReturnType<Schema['query']['page']>;
-      }
     }
 
     return page(args as Parameters<Schema['query']['page']>[0]) as ReturnType<
@@ -164,6 +152,52 @@ export function client<Schema extends GeneratedSchema = GeneratedSchema>(
     >;
   }
 
+  /* eslint-disable consistent-return */
+
+  function usePreview(
+    args: Record<'pageId', string>,
+  ): ReturnType<Schema['query']['page']>;
+  function usePreview(
+    args: Record<'postId', string>,
+  ): ReturnType<Schema['query']['post']>;
+  function usePreview(
+    args: HasObject,
+  ): ReturnType<Schema['query']['page'] | Schema['query']['post']> | undefined {
+    useEffect(() => {
+      if (typeof window === 'undefined') {
+        return;
+      }
+
+      const authResult = ensureAuthorization(window.location.href);
+
+      if (!isString(authResult) && isString(authResult?.redirect)) {
+        setTimeout(() => {
+          window.location.replace(authResult?.redirect as string);
+        }, 200);
+      }
+    }, []);
+
+    const { post, page } = useQuery();
+
+    const pagePreview = page({
+      id: (args?.pageId as string) ?? '',
+      idType: PageIdType.DATABASE_ID,
+    }) as ReturnType<Schema['query']['page']>;
+
+    const postPreview = post({
+      id: (args?.postId as string) ?? '',
+      idType: PostIdType.DATABASE_ID,
+    }) as ReturnType<Schema['query']['post']>;
+
+    if (hasPageId(args)) {
+      return pagePreview;
+    }
+    if (hasPostId(args)) {
+      return postPreview;
+    }
+  }
+  /* eslint-enable consistent-return */
+
   function useCategory(
     args?: Parameters<Schema['query']['category']>[0],
   ): ReturnType<Schema['query']['category']> {
@@ -204,22 +238,23 @@ export function client<Schema extends GeneratedSchema = GeneratedSchema>(
     usePost,
     usePages,
     usePage,
+    usePreview,
     useGeneralSettings,
   };
 }
 
-export async function logQueries(options?: LoggerOptions): Promise<() => void> {
-  try {
-    const { createLogger } = await import('@gqless/logger');
-    const logger = createLogger(
-      client().client,
-      defaults({}, options, {
-        showSelections: false,
-        showCache: false,
-      } as LoggerOptions),
-    );
-    return logger.start();
-  } catch (e) {
-    return () => {};
-  }
-}
+// export async function logQueries(options?: LoggerOptions): Promise<() => void> {
+//   try {
+//     const { createLogger } = await import('@gqless/logger');
+//     const logger = createLogger(
+//       client().client,
+//       defaults({}, options, {
+//         showSelections: false,
+//         showCache: false,
+//       } as LoggerOptions),
+//     );
+//     return logger.start();
+//   } catch (e) {
+//     return () => {};
+//   }
+// }
diff --git a/packages/next/src/utils/assert.ts b/packages/next/src/utils/assert.ts
index 194e64b64..3252d95d1 100644
--- a/packages/next/src/utils/assert.ts
+++ b/packages/next/src/utils/assert.ts
@@ -2,11 +2,12 @@ import isArray from 'lodash/isArray';
 import isObject from 'lodash/isObject';
 import isString from 'lodash/isString';
 import trim from 'lodash/trim';
-import { ParsedUrlQuery } from 'querystring';
+
+export type HasObject = Record<string, string | string[] | undefined>;
 
 function hasPropString<P extends string>(
   prop: P,
-): (params: ParsedUrlQuery) => params is Record<P, string> {
+): (params: HasObject) => params is Record<P, string> {
   return (params): params is Record<P, string> => {
     return isObject(params) && isString(params[prop]);
   };
@@ -14,7 +15,7 @@ function hasPropString<P extends string>(
 
 function hasPropStringArray<P extends string>(
   prop: P,
-): (params: ParsedUrlQuery) => params is Record<P, string[]> {
+): (params: HasObject) => params is Record<P, string[]> {
   return (params): params is Record<P, string[]> => {
     return (
       isObject(params) && isArray(params[prop]) && isString(params[prop]?.[0])
@@ -25,11 +26,9 @@ function hasPropStringArray<P extends string>(
 export const hasPostId = hasPropString('postId');
 export const hasPostSlug = hasPropString('postSlug');
 export const hasPostUri = hasPropStringArray('postUri');
-export const hasPostPreviewUri = hasPropStringArray('postPreviewUri');
 
 export const hasPageId = hasPropString('pageId');
 export const hasPageUri = hasPropStringArray('pageUri');
-export const hasPagePreviewUri = hasPropStringArray('pagePreviewUri');
 
 export const hasCategoryId = hasPropString('categoryId');
 export const hasCategorySlug = hasPropString('categorySlug');
