diff --git a/@filter/CollectionsFilterList.tsx b/@filter/CollectionsFilterList.tsx
index 2efd7311..b3f9ed7c 100644
--- a/@filter/CollectionsFilterList.tsx
+++ b/@filter/CollectionsFilterList.tsx
@@ -1,6 +1,7 @@
+import { SearchableEntity } from 'types/zora.api.generated'
+
 import { useState } from 'react'
 
-import { SearchableEntity } from '@zoralabs/zdk/dist/queries/queries-sdk'
 import { Accordion, InputField, Stack } from '@zoralabs/zord'
 
 import { FilterCollectionListItem } from './FilterCollectionListItem'
diff --git a/@filter/FilterProperties.tsx b/@filter/FilterProperties.tsx
index 80118151..30b5fe43 100644
--- a/@filter/FilterProperties.tsx
+++ b/@filter/FilterProperties.tsx
@@ -36,6 +36,7 @@ export function FilterProperties({ collectionAddress }: { collectionAddress: str
         {filterPropertiesList.map((property: AggregateAttribute) => (
           <Box key={property.traitType} className={['filter-properties-list']}>
             <FilterPropertySelect
+              __typename={property.__typename}
               traitType={property.traitType || ''}
               valueMetrics={property.valueMetrics}
             />
diff --git a/@filter/FilterPropertySelect.tsx b/@filter/FilterPropertySelect.tsx
index 911a2c06..616cb66b 100644
--- a/@filter/FilterPropertySelect.tsx
+++ b/@filter/FilterPropertySelect.tsx
@@ -33,7 +33,6 @@ export function FilterPropertySelect({ traitType, valueMetrics }: AggregateAttri
       <Select
         name="filter-property"
         id="filter-property"
-        value={isReset ? '' : undefined}
         w="100%"
         color="text1"
         textAlign="right"
diff --git a/@filter/hooks/useSearchQuery.ts b/@filter/hooks/useSearchQuery.ts
index 8a4182b8..b9b0a276 100644
--- a/@filter/hooks/useSearchQuery.ts
+++ b/@filter/hooks/useSearchQuery.ts
@@ -1,7 +1,7 @@
 import useSWR from 'swr'
+import { SearchResult, SearchableEntity } from 'types/zora.api.generated'
 
 import { zdk } from '@shared'
-import { SearchResult, SearchableEntity } from '@zoralabs/zdk/dist/queries/queries-sdk'
 
 export function useSearchQuery(query: string, entityType: SearchableEntity) {
   const { data, ...rest } = useSWR(
diff --git a/@filter/hooks/useTokensQuery.ts b/@filter/hooks/useTokensQuery.ts
index 49ca05f4..3f2b8e2e 100644
--- a/@filter/hooks/useTokensQuery.ts
+++ b/@filter/hooks/useTokensQuery.ts
@@ -1,21 +1,22 @@
 import useSWRInfinite from 'swr/infinite'
+import {
+  FilteredTokensQuery,
+  NetworkInput,
+  PaginationInput,
+  TokenSortInput,
+  TokenWithMarketsSummary,
+  TokensQueryFilter,
+  TokensQueryInput,
+} from 'types/zora.api.generated'
+
+import { FILTERED_TOKENS } from 'data/filteredTokens'
 
-import { useCallback, useMemo } from 'react'
+import { useCallback } from 'react'
 
 import { flatten } from 'lodash'
 
 import { getAddress } from '@ethersproject/address'
-import { GetNFTReturnType } from '@shared'
-import { zdk } from '@shared/utils/zdk'
-import { transformNFTZDK } from '@zoralabs/nft-hooks/dist/backends'
-import { prepareJson } from '@zoralabs/nft-hooks/dist/fetcher/NextUtils'
-import { NFTObject } from '@zoralabs/nft-hooks/dist/types/NFTInterface'
-import { TokensQueryArgs } from '@zoralabs/zdk'
-import {
-  TokenSortInput,
-  TokensQueryFilter,
-  TokensQueryInput,
-} from '@zoralabs/zdk/dist/queries/queries-sdk'
+import { zoraApiFetcher } from '@shared'
 
 const PAGE_SIZE = 12 // must be divisible by 2,3,4 to ensure grid stays intact
 
@@ -23,7 +24,7 @@ export interface UseTokenQueryProps {
   contractAllowList?: string[] | undefined
   contractAddress?: string | null
   ownerAddress?: string
-  initialData?: GetNFTReturnType
+  initialData?: PaginatedFilteredTokensQueryResponse
   sort?: TokenSortInput
   filter?: TokensQueryFilter
   where?: TokensQueryInput
@@ -31,15 +32,39 @@ export interface UseTokenQueryProps {
   refreshInterval?: number
 }
 
-async function getNFTs(query: TokensQueryArgs): Promise<GetNFTReturnType> {
-  const resp = await zdk.tokens(query)
-  const tokens = resp.tokens.nodes
-    /* @ts-ignore */
-    .map((token) => transformNFTZDK(token, { rawData: token }))
-    .map(prepareJson)
+// async function _getNFTs(query: TokensQueryArgs): Promise<GetNFTReturnType> {
+//   const resp = await zdk.tokens(query)
+//   const tokens = resp.tokens.nodes
+//     /* @ts-ignore */
+//     .map((token) => transformNFTZDK(token, { rawData: token }))
+//     .map(prepareJson)
+//   return {
+//     tokens,
+//     nextCursor: resp.tokens.pageInfo.endCursor,
+//   }
+// }
+
+export type PaginatedFilteredTokensQueryResponse = {
+  tokens: TokenWithMarketsSummary[]
+  nextCursor?: string | null
+}
+
+type FilteredTokensQueryParams = {
+  where?: TokensQueryInput
+  sort?: TokenSortInput
+  filter?: TokensQueryFilter
+  pagination?: PaginationInput
+  networks: NetworkInput[]
+}
+
+async function getNFTs(
+  query: FilteredTokensQueryParams
+): Promise<PaginatedFilteredTokensQueryResponse> {
+  const res = await zoraApiFetcher<FilteredTokensQuery>(FILTERED_TOKENS, query)
+
   return {
-    tokens,
-    nextCursor: resp.tokens.pageInfo.endCursor,
+    tokens: res.tokens.nodes,
+    nextCursor: res.tokens.pageInfo.endCursor, // @bj wanna discuss it
   }
 }
 
@@ -53,8 +78,11 @@ export function useTokensQuery({
   initialData,
   refreshInterval = 30000,
 }: UseTokenQueryProps) {
-  const getKey = (pageIndex: number, previousPageData: GetNFTReturnType) => {
-    if (pageIndex > 0 && !previousPageData.nextCursor) return null // reached the end
+  const getKey = (
+    pageIndex: number,
+    previousPageData: PaginatedFilteredTokensQueryResponse | null
+  ) => {
+    if (pageIndex > 0 && !previousPageData?.nextCursor) return null // reached the end
     return {
       where: {
         ...(contractAddress && {
@@ -74,35 +102,31 @@ export function useTokensQuery({
         after: previousPageData?.nextCursor,
         limit: PAGE_SIZE,
       },
-      includeFullDetails: true,
     }
   }
 
-  const {
-    data: resp,
-    error,
-    setSize,
-    size,
-    isValidating,
-  } = useSWRInfinite<GetNFTReturnType>(getKey, getNFTs, {
-    fallbackData: initialData && [initialData],
-    refreshInterval: refreshInterval,
-  })
+  const { data, error, setSize, size, isValidating } =
+    useSWRInfinite<PaginatedFilteredTokensQueryResponse>(getKey, getNFTs, {
+      fallbackData: initialData && [initialData],
+      refreshInterval: refreshInterval,
+    })
 
-  const data = useMemo(() => resp?.map((r) => r.tokens), [resp])
-  const flattenedData = useMemo(() => flatten(data), [data])
+  if (error) {
+    console.error(error)
+  }
 
   const handleLoadMore = useCallback(() => setSize(size + 1), [setSize, size])
-
   const isLoadingInitialData = !data && !error
   const isLoadingMore =
     isLoadingInitialData || (size > 0 && data && typeof data[size - 1] === 'undefined')
-  const isEmpty = data?.[0]?.length === 0
-  const isReachingEnd = isEmpty || (data && data[data.length - 1]?.length < PAGE_SIZE)
+  const isEmpty = data?.length === 0
+  const isReachingEnd = isEmpty || (data && [data.length - 1]?.length < PAGE_SIZE)
   const isRefreshing = isValidating && data && data.length === size
 
+  console.log({ data, f: flatten(data) })
+
   return {
-    data: flattenedData,
+    data: flatten(data),
     isValidating,
     isRefreshing,
     isLoadingMore,
diff --git a/@filter/providers/CollectionFilterProvider.tsx b/@filter/providers/CollectionFilterProvider.tsx
index 534c675e..7d74063e 100644
--- a/@filter/providers/CollectionFilterProvider.tsx
+++ b/@filter/providers/CollectionFilterProvider.tsx
@@ -1,4 +1,6 @@
-import { createContext, useContext, useMemo } from 'react'
+import { TokenWithMarketsSummary } from 'types/zora.api.generated'
+
+import { ReactNode, createContext, useContext, useMemo } from 'react'
 
 import {
   attributesToFilterParams,
@@ -7,11 +9,15 @@ import {
   sortMethodToSortParams,
 } from '@filter'
 import { stringDefaults, themeDefaults } from '@filter/constants'
-import { useTokensQuery } from '@filter/hooks/useTokensQuery'
+import {
+  PaginatedFilteredTokensQueryResponse,
+  useTokensQuery,
+} from '@filter/hooks/useTokensQuery'
 import { initialFilterStore, useFilterStore } from '@filter/state/filterStore'
 import {
   CollectionFilterContextTypes,
   CollectionFilterProviderProps,
+  FilterContextInputProps,
 } from '@filter/typings'
 import { MARKET_INFO_STATUSES } from '@zoralabs/nft-hooks/dist/types/NFTInterface'
 
@@ -66,7 +72,10 @@ export function CollectionFilterProvider({
   useFilterOwnerCollections = false,
   strings = stringDefaults,
   theme = themeDefaults,
-}: CollectionFilterProviderProps) {
+}: {
+  children?: ReactNode
+  initialPage?: PaginatedFilteredTokensQueryResponse
+} & FilterContextInputProps) {
   const filterStore = useFilterStore(filtersVisible)
   const { filters } = filterStore
   const {
@@ -79,8 +88,7 @@ export function CollectionFilterProvider({
     contractAllowList,
     contractAddress,
     ownerAddress,
-    // initialData: initialPage && { tokens: initialPage },
-    initialData: initialPage && initialPage,
+    initialData: initialPage,
     refreshInterval: 60000,
     sort: sortMethodToSortParams(filters.sortMethod, filters.marketStatus),
     filter: {
@@ -91,15 +99,20 @@ export function CollectionFilterProvider({
     },
   })
 
-  const tokensWithActiveMarkets = useMemo(
-    () =>
-      items.filter((token) =>
-        token.markets?.map((mkt) =>
-          [MARKET_INFO_STATUSES.ACTIVE, MARKET_INFO_STATUSES.PENDING].includes(mkt.status)
-        )
-      ),
-    [items]
-  )
+  console.log({ AAAA: items })
+
+  const tokensWithActiveMarkets = useMemo(() => {
+    if (items.length === 0) return []
+
+    return items[0].tokens.filter((token) =>
+      token.marketsSummary?.map((mkt) =>
+        [
+          MARKET_INFO_STATUSES.ACTIVE.toString(),
+          MARKET_INFO_STATUSES.PENDING.toString(),
+        ].includes(mkt.status)
+      )
+    )
+  }, [items])
 
   // - Allows us to adjust the options available to users when sorting (eg. no sorting by price when there are no prices!)
   const tokensHaveActiveMarkets = useMemo(
@@ -111,7 +124,7 @@ export function CollectionFilterProvider({
     <CollectionFilterContext.Provider
       value={{
         filterStore,
-        items,
+        items: items.length > 0 ? items[0].tokens : ([] as TokenWithMarketsSummary[]),
         isValidating,
         isReachingEnd,
         isEmpty,
diff --git a/@filter/state/filterStore.ts b/@filter/state/filterStore.ts
index 3a572d52..7198dacb 100644
--- a/@filter/state/filterStore.ts
+++ b/@filter/state/filterStore.ts
@@ -1,3 +1,5 @@
+import { MediaType } from 'types/zora.api.generated'
+
 import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import {
@@ -12,7 +14,6 @@ import {
   SortMethodType,
   TokenContractsFilter,
 } from '@filter/typings'
-import { MediaType } from '@zoralabs/zdk/dist/queries/queries-sdk'
 
 import { removeItemAtIndex } from '../utils/store'
 
diff --git a/@filter/typings/filter-provider.ts b/@filter/typings/filter-provider.ts
index d5315e44..cf6cf232 100644
--- a/@filter/typings/filter-provider.ts
+++ b/@filter/typings/filter-provider.ts
@@ -1,8 +1,9 @@
+import { TokenWithMarketsSummary } from 'types/zora.api.generated'
+
 import { ReactNode } from 'react'
 
 import { stringDefaults, themeDefaults } from '@filter/constants'
 import { GetNFTReturnType } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
 
 import { FilterStore } from './filter-store'
 
@@ -52,7 +53,7 @@ export interface FilterContextInputProps extends FilterConfigProps {
 }
 
 export interface TokenQueryReturnTypes extends FilterContextInputProps {
-  items: NFTObject[]
+  items: TokenWithMarketsSummary[]
   isValidating: boolean
   isReachingEnd: boolean | undefined
   isEmpty: boolean
@@ -69,5 +70,6 @@ export interface CollectionFilterContextTypes extends TokenQueryReturnTypes {
 export interface CollectionFilterProviderProps extends FilterContextInputProps {
   children?: ReactNode
   // initialPage?: NFTObject[]
+  // TODO remove
   initialPage?: GetNFTReturnType
 }
diff --git a/@filter/typings/filter-store.ts b/@filter/typings/filter-store.ts
index be5f00ea..7ba2ea38 100644
--- a/@filter/typings/filter-store.ts
+++ b/@filter/typings/filter-store.ts
@@ -1,7 +1,8 @@
+import { MediaType } from 'types/zora.api.generated'
+
 import { MouseEventHandler } from 'react'
 
 import { Currency } from '@shared'
-import { MediaType } from '@zoralabs/zdk/dist/queries/queries-sdk'
 
 type Address = string
 
diff --git a/@filter/utils/sortMethods.ts b/@filter/utils/sortMethods.ts
index f0c6ddba..a4d83dfa 100644
--- a/@filter/utils/sortMethods.ts
+++ b/@filter/utils/sortMethods.ts
@@ -1,9 +1,3 @@
-import {
-  CollectionAttributesFilter,
-  MarketStatusFilter,
-  PriceRangeFilter,
-  SortMethodType,
-} from '@filter/typings'
 import {
   MarketCategory,
   MarketStatus,
@@ -12,7 +6,14 @@ import {
   TokenSortInput,
   TokenSortKey,
   TokensQueryFilter,
-} from '@zoralabs/zdk/dist/queries/queries-sdk'
+} from 'types/zora.api.generated'
+
+import {
+  CollectionAttributesFilter,
+  MarketStatusFilter,
+  PriceRangeFilter,
+  SortMethodType,
+} from '@filter/typings'
 
 export function marketStatusToSortAxis(marketType: MarketStatusFilter) {
   switch (marketType) {
diff --git a/@market/components/MarketModalHeading.tsx b/@market/components/MarketModalHeading.tsx
index 7142d7a7..4e5b87ff 100644
--- a/@market/components/MarketModalHeading.tsx
+++ b/@market/components/MarketModalHeading.tsx
@@ -1,25 +1,28 @@
 import React from 'react'
 
 import { CollectionThumbnail } from '@media/CollectionThumbnail'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { Flex, Heading } from '@zoralabs/zord'
 
 interface MarketModalHeadingProps {
-  nftObj: NFTObject
   action?: string
+  tokenId: string
+  contractAddress: string
+  collectionName: string
 }
 
-export function MarketModalHeading({ nftObj, action }: MarketModalHeadingProps) {
-  const { nft } = nftObj
+export function MarketModalHeading({
+  tokenId,
+  contractAddress,
+  collectionName,
+  action,
+}: MarketModalHeadingProps) {
   return (
     <Flex w="100%" justify="space-between" textAlign="left" gap="x6">
       <Heading as="h2" size="md">
-        {`${action} ${nftObj.nft?.contract.name} #${nft?.tokenId}`}
+        {`${action} ${collectionName} #${tokenId}`}
       </Heading>
       {/* @BJ TODO: This component causes 500 error when it hits the useNounsToken contract call? */}
-      {nft?.contract?.address && (
-        <CollectionThumbnail collectionAddress={nft?.contract.address} />
-      )}
+      {contractAddress && <CollectionThumbnail collectionAddress={contractAddress} />}
     </Flex>
   )
 }
diff --git a/@market/components/NFTAsks.tsx b/@market/components/NFTAsks.tsx
index 9bfeaece..ca26266e 100644
--- a/@market/components/NFTAsks.tsx
+++ b/@market/components/NFTAsks.tsx
@@ -3,37 +3,35 @@ import { OffchainOrderWithToken } from 'types/zora.api.generated'
 
 import { useMemo } from 'react'
 
-import { useAskHelper, useRelevantMarket } from '@market/hooks'
+import { useRelevantMarket } from '@market/hooks'
 import { V3AskSidebar } from '@market/modules/V3Ask'
 import { UniversalListAskFlow } from '@market/modules/V3Ask/UniversalListAskFlow'
-import { useIsOwner } from '@shared/hooks/useIsOwner'
-import { NFTObject } from '@zoralabs/nft-hooks'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { FlexProps } from '@zoralabs/zord'
 
 export interface NFTAskProps extends FlexProps {
-  nftObj: NFTObject
   offchainOrders?: OffchainOrderWithToken[]
+  isOwner: boolean
 }
 
-export function NFTAsks({ nftObj, offchainOrders, ...props }: NFTAskProps) {
-  const { markets } = nftObj
-  const { ask } = useRelevantMarket(markets)
-  const { isOwner } = useIsOwner(nftObj)
-  const { hasRelevantAsk } = useAskHelper({ ask })
+export function NFTAsks({ offchainOrders, isOwner }: NFTAskProps) {
+  const { markets } = useNftMarketContext()
+  const { hasRelevantAsk } = useRelevantMarket(markets)
+
   const showOffchainOrders = useMemo(
     () => offchainOrders && offchainOrders?.length > 0 && !isOwner,
     [isOwner, offchainOrders]
   )
 
   if (hasRelevantAsk) {
-    return <V3AskSidebar nftObj={nftObj} borderRadius="phat" />
+    return <V3AskSidebar isOwner={isOwner} borderRadius="phat" />
   }
 
   if (showOffchainOrders) {
-    return <NFTOffchainOrders nft={nftObj} offchainOrders={offchainOrders!} />
+    return <NFTOffchainOrders offchainOrders={offchainOrders!} />
   }
 
-  if (isOwner) return <UniversalListAskFlow nftObj={nftObj} />
+  if (isOwner) return <UniversalListAskFlow />
 
   return null
 }
diff --git a/@market/components/NFTCardMarket.tsx b/@market/components/NFTCardMarket.tsx
index 2f3cd9db..910c956b 100644
--- a/@market/components/NFTCardMarket.tsx
+++ b/@market/components/NFTCardMarket.tsx
@@ -1,37 +1,27 @@
-import { NFTCardMarketOwner } from '@market/components'
-import { useAskHelper, useRelevantMarket } from '@market/hooks'
+import { useRelevantMarket } from '@market/hooks'
 import { V3AskModal } from '@market/modules/V3Ask'
 import { UniversalListAskFlow } from '@market/modules/V3Ask/UniversalListAskFlow'
-import { useIsOwner, useNFTProvider } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { FlexProps } from '@zoralabs/zord'
 
-export interface NFTCardMarketProps extends FlexProps {}
+import { NFTCardMarketOwner } from './NFTCardMarketOwner'
 
-export function NFTCardMarket(props: NFTCardMarketProps) {
-  const { nft: nftObj } = useNFTProvider()
-
-  if (!nftObj) return null
-
-  return <NFTCardMarketComponent nftObj={nftObj} {...props} />
+export interface NFTCardMarketProps extends FlexProps {
+  isOwner?: boolean
+  ownerAddress?: string
 }
 
-export function NFTCardMarketComponent({
-  nftObj,
-  ...props
-}: { nftObj: NFTObject } & NFTCardMarketProps) {
-  const { markets } = nftObj
-  const { isOwner } = useIsOwner(nftObj)
-  const { ask } = useRelevantMarket(markets)
-  const { hasRelevantAsk } = useAskHelper({ ask })
+export function NFTCardMarket({ isOwner, ownerAddress, ...props }: NFTCardMarketProps) {
+  const { markets } = useNftMarketContext()
+  const { hasRelevantAsk } = useRelevantMarket(markets)
 
-  if (isOwner) {
-    return <UniversalListAskFlow nftObj={nftObj} {...props} />
+  if (hasRelevantAsk) {
+    return <V3AskModal isOwner={isOwner || false} modalName="V3AskV3" showOnlyTrigger />
   }
 
-  if (hasRelevantAsk) {
-    return <V3AskModal modalName="V3AskV3" nftObj={nftObj} />
+  if (isOwner) {
+    return <UniversalListAskFlow {...props} />
   }
 
-  return <NFTCardMarketOwner size="md" address={nftObj.nft?.owner?.address} />
+  return <NFTCardMarketOwner size="md" address={ownerAddress} />
 }
diff --git a/@market/components/NFTPrimaryAuction.tsx b/@market/components/NFTPrimaryAuction.tsx
index 405196c7..1850a40f 100644
--- a/@market/components/NFTPrimaryAuction.tsx
+++ b/@market/components/NFTPrimaryAuction.tsx
@@ -1,21 +1,21 @@
-import { useMemo } from 'react'
 import { TypeSafeNounsAuction } from 'validators/auction'
 
 import { useNounishAuctionHelper } from '@market/hooks/useNounishAuctionHelper'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { FlexProps } from '@zoralabs/zord'
 
 import { NFTPrimaryAuctionActive, NFTPrimaryAuctionEndedSettlement } from './'
 
 export interface NFTPrimaryAuctionProps extends FlexProps {
-  nftObj: NFTObject
   primaryAuction: TypeSafeNounsAuction
+  collectionAddress: string
+  tokenId: string
   isActiveAuctionToken: boolean
 }
 
 export function NFTPrimaryAuction({
-  nftObj,
   primaryAuction,
+  collectionAddress,
+  tokenId,
   isActiveAuctionToken,
   ...props
 }: NFTPrimaryAuctionProps) {
@@ -27,14 +27,7 @@ export function NFTPrimaryAuction({
 
   if (isEnded) {
     // Anyone can settle auction
-
-    return (
-      <NFTPrimaryAuctionEndedSettlement
-        nftObj={nftObj}
-        primaryAuction={primaryAuction}
-        {...props}
-      />
-    )
+    return <NFTPrimaryAuctionEndedSettlement primaryAuction={primaryAuction} {...props} />
   }
 
   // if (isEnded) { // @Oleg: please ignore for now. Won't be shown.
@@ -47,15 +40,12 @@ export function NFTPrimaryAuction({
   //   )
   // }
 
-  if (isActiveAuctionToken) {
-    return (
-      <NFTPrimaryAuctionActive
-        nftObj={nftObj}
-        primaryAuction={primaryAuction}
-        {...props}
-      />
-    )
-  }
-
-  return null
+  return (
+    <NFTPrimaryAuctionActive
+      collectionAddress={collectionAddress}
+      tokenId={tokenId}
+      primaryAuction={primaryAuction}
+      {...props}
+    />
+  )
 }
diff --git a/@market/components/NFTPrimaryAuctionActive.tsx b/@market/components/NFTPrimaryAuctionActive.tsx
index 59513b71..f0de8c50 100644
--- a/@market/components/NFTPrimaryAuctionActive.tsx
+++ b/@market/components/NFTPrimaryAuctionActive.tsx
@@ -1,31 +1,27 @@
-import { useMemo } from 'react'
 import { TypeSafeNounsAuction } from 'validators/auction'
 
 import { useAuctionDataTable } from '@market/hooks'
 import { useNounishAuctionHelper } from '@market/hooks/useNounishAuctionHelper'
 import { PlaceNounsBid } from '@noun-auction'
 import { DataTable, PriceWithLabel } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { FlexProps, Stack } from '@zoralabs/zord'
 
 interface NFTPrimaryAuctionActiveProps extends FlexProps {
-  nftObj: NFTObject
   primaryAuction: TypeSafeNounsAuction
+  collectionAddress: string
+  tokenId: string
 }
 
 export function NFTPrimaryAuctionActive({
-  nftObj,
   primaryAuction,
+  collectionAddress,
+  tokenId,
   ...props
 }: NFTPrimaryAuctionActiveProps) {
-  const {
-    formattedCryptoHighestBidPrice,
-    formattedUSDHighestBidPrice,
-    highestBidder,
-    hasBid,
-  } = useNounishAuctionHelper({
-    auction: primaryAuction,
-  })
+  const { formattedCryptoHighestBidPrice, formattedUSDHighestBidPrice, hasBid } =
+    useNounishAuctionHelper({
+      auction: primaryAuction,
+    })
 
   const { formattedAuctionDataTable } = useAuctionDataTable({
     primaryAuction,
@@ -39,19 +35,17 @@ export function NFTPrimaryAuctionActive({
           <PriceWithLabel
             symbol="ETH"
             cryptoAmount={formattedCryptoHighestBidPrice}
-            usdAmount={hasBid ? formattedUSDHighestBidPrice : '$0'}
+            usdAmount={hasBid ? formattedUSDHighestBidPrice : 0}
             label="Current Bid"
             invertColor
           />
         )}
-        {nftObj?.nft?.contract.address && (
-          <PlaceNounsBid
-            layout="sideBarBid"
-            collectionAddress={nftObj.nft?.contract.address}
-            tokenId={nftObj.nft?.tokenId}
-            enableModal
-          />
-        )}
+        <PlaceNounsBid
+          layout="sideBarBid"
+          collectionAddress={collectionAddress}
+          tokenId={tokenId}
+          enableModal
+        />
       </Stack>
     </Stack>
   )
diff --git a/@market/components/NFTPrimaryAuctionClaim.tsx b/@market/components/NFTPrimaryAuctionClaim.tsx
deleted file mode 100644
index 1b675c26..00000000
--- a/@market/components/NFTPrimaryAuctionClaim.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { mediumFont } from 'styles/styles.css'
-
-import { TypeSafeNounsAuction } from 'validators/auction'
-
-import { useNounishAuctionHelper } from '@market/hooks/useNounishAuctionHelper'
-import { PriceWithLabel } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
-import { FlexProps, Paragraph, Stack, Well } from '@zoralabs/zord'
-
-interface ClaimProps extends FlexProps {
-  nftObj: NFTObject
-  primaryAuction: TypeSafeNounsAuction
-}
-
-export function NFTPrimaryAuctionClaim({ nftObj, primaryAuction, ...props }: ClaimProps) {
-  const { formattedCryptoHighestBidPrice, formattedUSDHighestBidPrice } =
-    useNounishAuctionHelper({
-      auction: primaryAuction,
-    })
-
-  return (
-    <Well gap="x4" p="x6" borderRadius="phat" {...props}>
-      {formattedCryptoHighestBidPrice && formattedUSDHighestBidPrice && (
-        <PriceWithLabel
-          symbol="ETH"
-          cryptoAmount={formattedCryptoHighestBidPrice}
-          usdAmount={formattedUSDHighestBidPrice}
-          label="Sold for"
-        />
-      )}
-      <Paragraph size="md" className={[mediumFont]} color="text2">
-        Ownership will be transferred after you claim the NFT
-      </Paragraph>
-    </Well>
-  )
-}
diff --git a/@market/components/NFTPrimaryAuctionEndedSettlement.tsx b/@market/components/NFTPrimaryAuctionEndedSettlement.tsx
index 73b078a9..1a133d57 100644
--- a/@market/components/NFTPrimaryAuctionEndedSettlement.tsx
+++ b/@market/components/NFTPrimaryAuctionEndedSettlement.tsx
@@ -4,11 +4,9 @@ import { TypeSafeNounsAuction } from 'validators/auction'
 
 import { useNounishAuctionHelper } from '@market/hooks/useNounishAuctionHelper'
 import { SettleAuction } from '@noun-auction'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { FlexProps, Paragraph, Well } from '@zoralabs/zord'
 
 interface SettlementProps extends FlexProps {
-  nftObj: NFTObject
   primaryAuction: TypeSafeNounsAuction
 }
 
@@ -19,7 +17,6 @@ const paragraphCopy = {
 }
 
 export function NFTPrimaryAuctionEndedSettlement({
-  nftObj,
   primaryAuction,
   ...props
 }: SettlementProps) {
diff --git a/@market/components/NFTPrimaryAuctionEndedSummary.tsx b/@market/components/NFTPrimaryAuctionEndedSummary.tsx
deleted file mode 100644
index 099cea55..00000000
--- a/@market/components/NFTPrimaryAuctionEndedSummary.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { mediumFont } from 'styles/styles.css'
-
-import { TypeSafeNounsAuction } from 'validators/auction'
-
-import { useNounishAuctionHelper } from '@market/hooks/useNounishAuctionHelper'
-import { PriceWithLabel } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
-import { FlexProps, Paragraph, Stack, Well } from '@zoralabs/zord'
-
-interface SummaryProps extends FlexProps {
-  nftObj: NFTObject
-  primaryAuction: TypeSafeNounsAuction
-}
-
-export function NFTPrimaryAuctionEndedSummary({
-  nftObj,
-  primaryAuction,
-  ...props
-}: SummaryProps) {
-  const { formattedCryptoHighestBidPrice, formattedUSDHighestBidPrice } =
-    useNounishAuctionHelper({
-      auction: primaryAuction,
-    })
-
-  return (
-    <Well gap="x4" p="x6" borderRadius="phat" {...props}>
-      {formattedCryptoHighestBidPrice && formattedUSDHighestBidPrice && (
-        <PriceWithLabel
-          symbol="ETH"
-          cryptoAmount={formattedCryptoHighestBidPrice}
-          usdAmount={formattedUSDHighestBidPrice}
-          label="Sold for"
-        />
-      )}
-      <Paragraph size="md" className={[mediumFont]} color="text2">
-        Ownership will be transferred after the new owner claims this NFT
-      </Paragraph>
-    </Well>
-  )
-}
diff --git a/@market/components/PriceCards.tsx b/@market/components/PriceCards.tsx
index a56dc99f..2c86ffc7 100644
--- a/@market/components/PriceCards.tsx
+++ b/@market/components/PriceCards.tsx
@@ -4,19 +4,18 @@ import { mediumFont } from 'styles/styles.css'
 import { OffchainOrderWithToken } from 'types/zora.api.generated'
 
 import React, { useCallback, useMemo, useState } from 'react'
+import { TypeSafeMarket } from 'validators/market'
 
 import { useOffchainOrderAttribution } from '@market/hooks'
 import { SeaportFillOrderFlow } from '@market/modules'
 import { ModalComposition, useModal } from '@modal'
 import { useAuth, useButtonRequiresAuth } from '@shared'
 import { numberFormatter } from '@shared/utils'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { Box, Flex, Heading, Paragraph, Stack, Well } from '@zoralabs/zord'
 
 import * as styles from './PriceCards.css'
 
 export interface PriceCardsProps {
-  nft: NFTObject
   offchainOrders: OffchainOrderWithToken[]
   userAddress?: string
 }
@@ -26,12 +25,7 @@ const modalName = 'seaport-fill-modal'
 function PriceCard({
   order,
   userAddress,
-  nft,
-}: {
-  order: OffchainOrderWithToken
-  nft: NFTObject
-  userAddress?: string
-}) {
+}: PriceCardsProps & { order: OffchainOrderWithToken }) {
   const { offchainOrder } = order
   const { price } = offchainOrder
   const { chainTokenPrice, usdcPrice } = price
@@ -99,7 +93,7 @@ function PriceCard({
         }
         content={
           <Box p="x8">
-            <SeaportFillOrderFlow nft={nft} order={order} userAddress={userAddress} />
+            <SeaportFillOrderFlow order={order} userAddress={userAddress} />
           </Box>
         }
       />
@@ -107,7 +101,7 @@ function PriceCard({
   )
 }
 
-export function PriceCards({ nft, offchainOrders }: PriceCardsProps) {
+export function PriceCards({ offchainOrders }: PriceCardsProps) {
   const cardCount = useMemo(() => offchainOrders.length, [offchainOrders])
   const [currentCard, setCurrentCard] = useState<number>(0)
   const { address: userAddress } = useAuth()
@@ -156,7 +150,7 @@ export function PriceCards({ nft, offchainOrders }: PriceCardsProps) {
           </Flex>
         )}
         <PriceCard
-          nft={nft}
+          offchainOrders={offchainOrders}
           order={offchainOrders[currentCard]}
           userAddress={userAddress}
         />
diff --git a/@market/components/SelectListFlow.tsx b/@market/components/SelectListFlow.tsx
index 0f15f2b7..1d853b64 100644
--- a/@market/components/SelectListFlow.tsx
+++ b/@market/components/SelectListFlow.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import { TypeSafeMarket } from 'validators/market'
 
 import {
   APPROVE_MODULE_FOR_CREATE_PRIVATEASK,
@@ -8,23 +9,17 @@ import {
 } from '@market/modules/V3Ask'
 import { SaleTypeButton } from '@market/modules/V3Ask/SaleTypeButton'
 import { V3AskLearnMoreButton } from '@market/modules/V3Ask/V3AskLearnMoreButton'
-import { NFTObject } from '@zoralabs/nft-hooks'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { Eyebrow, Stack } from '@zoralabs/zord'
 
 interface SelectListFlowProps {
   closeModal?: () => void
-  nftObj: NFTObject
 }
 
-export function SelectListFlow({ nftObj, closeModal, ...props }: SelectListFlowProps) {
+export function SelectListFlow({ closeModal, ...props }: SelectListFlowProps) {
   const { state, dispatch } = useV3AskStateContext()
-  const { nft } = nftObj
   const { flow } = state
 
-  if (!nft) {
-    return null
-  }
-
   if (!flow) {
     return (
       <Stack gap="x5" {...props}>
@@ -49,5 +44,5 @@ export function SelectListFlow({ nftObj, closeModal, ...props }: SelectListFlowP
     )
   }
 
-  return <V3AskFlow nft={nftObj} />
+  return <V3AskFlow />
 }
diff --git a/@market/components/index.ts b/@market/components/index.ts
index 8e51716a..b2902013 100644
--- a/@market/components/index.ts
+++ b/@market/components/index.ts
@@ -4,7 +4,6 @@ export * from './FillV3AskInfo'
 export * from './NFTAsks'
 export * from './NFTPrimaryAuction'
 export * from './NFTPrimaryAuctionActive'
-export * from './NFTPrimaryAuctionEndedSummary'
 export * from './NFTPrimaryAuctionEndedSettlement'
 
 /* Approval Forms */
diff --git a/@market/hooks/index.ts b/@market/hooks/index.ts
index 0843c8d6..fb7f063c 100644
--- a/@market/hooks/index.ts
+++ b/@market/hooks/index.ts
@@ -1,7 +1,6 @@
 export * from './useRelevantMarket'
 export * from './useZoraV3ModuleApproval'
 export * from './useERC721TokenApproval'
-export * from './useAskHelper'
 export * from './useListingDataTable'
 export * from './useAuctionDataTable'
 export * from '../modules/Seaport/hooks/useValidateSeaportContractCall'
diff --git a/@market/hooks/useAskHelper.ts b/@market/hooks/useAskHelper.ts
deleted file mode 100644
index 2499f3d5..00000000
--- a/@market/hooks/useAskHelper.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useMemo } from 'react'
-
-import { isAddressMatch, numberFormatterUSDC, roundTwoDecimals } from '@shared'
-import { useAuth } from '@shared/hooks'
-import { FixedPriceLike, MARKET_INFO_STATUSES } from '@zoralabs/nft-hooks/dist/types'
-
-interface AskHelperProps {
-  ask: FixedPriceLike
-}
-
-export const useAskHelper = ({ ask }: AskHelperProps) => {
-  const { balance: walletBalance, address: userAddress } = useAuth()
-  const buyerAddress = useMemo(() => ask?.raw?.properties?.buyer, [ask])
-  const isPrivateAsk = useMemo(() => buyerAddress || false, [buyerAddress])
-  const isActiveAsk = useMemo(
-    () => ask?.status === MARKET_INFO_STATUSES.ACTIVE || false,
-    [ask]
-  )
-  const hasActivePrivateAsk = useMemo(
-    () => isActiveAsk && isPrivateAsk,
-    [isActiveAsk, isPrivateAsk]
-  )
-  const hasActiveV3Ask = useMemo(
-    () => isActiveAsk && !isPrivateAsk,
-    [isActiveAsk, isPrivateAsk]
-  )
-  const isCompletedAsk = useMemo(
-    () => ask?.status === MARKET_INFO_STATUSES.COMPLETE || false,
-    [ask]
-  )
-  const hasAsk = useMemo(() => ask !== undefined, [ask])
-  const hasRelevantAsk = useMemo(() => hasAsk && isActiveAsk, [hasAsk, isActiveAsk])
-
-  const rawAskAmount = useMemo(() => ask?.amount?.amount.raw.toString(), [ask])
-  const displayAskAmount = useMemo(() => ask?.amount?.amount.value.toString(), [ask])
-  const usdAskAmount = useMemo(
-    () =>
-      ask?.amount?.usd?.value
-        ? numberFormatterUSDC(roundTwoDecimals(ask.amount.usd.value))
-        : '...',
-    [ask]
-  )
-  const hasSufficientFunds = useMemo(
-    () => (rawAskAmount ? walletBalance?.value.gte(rawAskAmount) : false),
-    [rawAskAmount, walletBalance?.value]
-  )
-  const isValidPrivateAskBuyer = useMemo(
-    () => hasActivePrivateAsk && isAddressMatch(userAddress, buyerAddress),
-    [buyerAddress, hasActivePrivateAsk, userAddress]
-  )
-
-  return {
-    hasAsk,
-    hasRelevantAsk,
-    isPrivateAsk,
-    isActiveAsk,
-    hasActiveV3Ask,
-    hasActivePrivateAsk,
-    isCompletedAsk,
-    buyerAddress,
-    isValidPrivateAskBuyer,
-    rawAskAmount,
-    displayAskAmount,
-    usdAskAmount,
-    hasSufficientFunds,
-  }
-}
diff --git a/@market/hooks/useListingDataTable.ts b/@market/hooks/useListingDataTable.ts
index 71940b40..cb511df1 100644
--- a/@market/hooks/useListingDataTable.ts
+++ b/@market/hooks/useListingDataTable.ts
@@ -1,19 +1,15 @@
-import { format } from 'date-fns'
-
 import { useMemo } from 'react'
+import { TypeSafeMarket } from 'validators/market'
 
-import { useAskHelper, useRelevantMarket } from '@market/hooks'
+import { useRelevantMarket } from '@market/hooks'
 import { DataTableItemProps } from '@shared/components/DataTable/DataTableItem'
-import { NFTObject } from '@zoralabs/nft-hooks'
 
 interface ListingDataTableProps {
-  nft: NFTObject
+  markets: TypeSafeMarket[]
 }
 
-export const useListingDataTable = ({ nft: nftObj }: ListingDataTableProps) => {
-  const { markets } = nftObj
-  const { ask } = useRelevantMarket(markets)
-  const { isPrivateAsk } = useAskHelper({ ask })
+export const useListingDataTable = ({ markets }: ListingDataTableProps) => {
+  const { ask, isPrivateAsk } = useRelevantMarket(markets)
 
   const formattedListingDataTable = useMemo<DataTableItemProps[] | undefined>(
     () => [
@@ -23,14 +19,15 @@ export const useListingDataTable = ({ nft: nftObj }: ListingDataTableProps) => {
       },
       {
         label: 'Listed for',
-        value: `${ask?.amount?.eth?.value} ETH`,
-      },
-      {
-        label: 'Listed at',
-        value: format(new Date(ask.createdAt.timestamp), 'MMM d, y HH:mm:ss xxx'),
+        value: `${ask?.price?.nativePrice?.decimal} ETH`,
       },
+      // not timestamp in db, only block number
+      // {
+      //   label: 'Listed at',
+      //   value: format(new Date(ask.createdAt.timestamp), 'MMM d, y HH:mm:ss xxx'),
+      // },
     ],
-    [ask?.amount?.eth?.value, ask.createdAt, isPrivateAsk]
+    [ask?.price?.nativePrice?.decimal, isPrivateAsk]
   )
 
   return {
diff --git a/@market/hooks/useRelevantMarket.ts b/@market/hooks/useRelevantMarket.ts
index 4aba3ab0..fb36af32 100644
--- a/@market/hooks/useRelevantMarket.ts
+++ b/@market/hooks/useRelevantMarket.ts
@@ -1,36 +1,75 @@
-import {
-  AuctionLike,
-  FIXED_SIDE_TYPES,
-  FixedPriceLike,
-  MARKET_TYPES,
-  MarketModule,
-} from '@zoralabs/nft-hooks/dist/types/NFTInterface'
+import { useMemo } from 'react'
+import { isV3Ask } from 'validators/isV3Ask'
+import { TypeSafeMarket } from 'validators/market'
 
-function getLatestBlockNumber(a: MarketModule, b: MarketModule) {
-  return a.createdAt.blockNumber &&
-    b.createdAt.blockNumber &&
-    a.createdAt.blockNumber > b.createdAt.blockNumber
-    ? -1
-    : 1
-}
-
-function isAuctionLike(value: MarketModule): value is AuctionLike {
-  return value.type === MARKET_TYPES.AUCTION
-}
-function isAskLike(value: MarketModule): value is FixedPriceLike {
-  return value.type === MARKET_TYPES.FIXED_PRICE && value.side === FIXED_SIDE_TYPES.ASK
-}
-function isOfferLike(value: MarketModule): value is FixedPriceLike {
-  return value.type === MARKET_TYPES.FIXED_PRICE && value.side === FIXED_SIDE_TYPES.OFFER
-}
+import { isAddressMatch, useAuth } from '@shared'
+import { MARKET_INFO_STATUSES } from '@zoralabs/nft-hooks/dist/types/NFTInterface'
 
-export const useRelevantMarket = (markets: readonly MarketModule[] = []) => {
-  const auctions: AuctionLike[] = markets.filter(isAuctionLike).sort(getLatestBlockNumber)
-  const asks: FixedPriceLike[] = markets.filter(isAskLike).sort(getLatestBlockNumber)
-  const offers: FixedPriceLike[] = markets.filter(isOfferLike).sort(getLatestBlockNumber) // <-- *all* active offers are relevant
+export const useRelevantMarket = (markets: TypeSafeMarket[] = []) => {
+  const auctions = markets.filter(
+    (item) => item?.properties?.__typename === 'V3ReserveAuction'
+  )
+  const asks = markets.filter((item) => item?.properties?.__typename === 'V3Ask')
+  const offers = markets.filter((item) => item?.properties?.__typename === 'V1Offer')
 
-  const ask = asks[0]
+  const ask = asks.find((ask) => ask.status === 'ACTIVE')
   const auction = auctions[0]
 
-  return { offers, ask, auction, auctions }
+  const askProperties = ask?.properties
+  const { balance: walletBalance, address: userAddress } = useAuth()
+
+  const buyerAddress = useMemo(
+    () =>
+      isV3Ask(askProperties) && askProperties.buyer ? askProperties.buyer : undefined,
+    [askProperties]
+  )
+  const isPrivateAsk = useMemo(() => buyerAddress || false, [buyerAddress])
+  const isActiveAsk = useMemo(() => ask?.status === 'ACTIVE' || false, [ask])
+  const hasActivePrivateAsk = useMemo(
+    () => isActiveAsk && isPrivateAsk,
+    [isActiveAsk, isPrivateAsk]
+  )
+  const hasActiveV3Ask = useMemo(
+    () => isActiveAsk && !isPrivateAsk,
+    [isActiveAsk, isPrivateAsk]
+  )
+  const isCompletedAsk = useMemo(
+    () => ask?.status === MARKET_INFO_STATUSES.COMPLETE || false,
+    [ask]
+  )
+  const hasAsk = useMemo(() => askProperties !== undefined, [askProperties])
+  const hasRelevantAsk = useMemo(() => hasAsk && isActiveAsk, [hasAsk, isActiveAsk])
+
+  const rawAskAmount = useMemo(() => ask?.price?.nativePrice.raw, [ask])
+  const displayAskAmount = useMemo(() => ask?.price?.nativePrice.decimal, [ask])
+  const usdAskAmount = ask?.price?.usdcPrice?.decimal
+  const hasSufficientFunds = useMemo(
+    () => (rawAskAmount ? walletBalance?.value.gte(rawAskAmount) : false),
+    [rawAskAmount, walletBalance?.value]
+  )
+  const isValidPrivateAskBuyer = useMemo(
+    () =>
+      hasActivePrivateAsk && buyerAddress && isAddressMatch(userAddress, buyerAddress),
+    [buyerAddress, hasActivePrivateAsk, userAddress]
+  )
+
+  return {
+    offers,
+    ask,
+    auction,
+    auctions,
+    hasAsk,
+    hasRelevantAsk,
+    isPrivateAsk,
+    isActiveAsk,
+    hasActiveV3Ask,
+    hasActivePrivateAsk,
+    isCompletedAsk,
+    buyerAddress,
+    isValidPrivateAskBuyer,
+    rawAskAmount,
+    displayAskAmount,
+    usdAskAmount,
+    hasSufficientFunds,
+  }
 }
diff --git a/@market/modules/Seaport/SeaportFillOrder.tsx b/@market/modules/Seaport/SeaportFillOrder.tsx
index 1d38f861..79e882c4 100644
--- a/@market/modules/Seaport/SeaportFillOrder.tsx
+++ b/@market/modules/Seaport/SeaportFillOrder.tsx
@@ -7,6 +7,7 @@ import React, { Dispatch, SetStateAction, useEffect, useMemo } from 'react'
 import { MarketModalHeading } from '@market/components'
 import { useOffchainOrderAttribution } from '@market/hooks'
 import { useValidateSeaportContractCall } from '@market/modules/Seaport/hooks/useValidateSeaportContractCall'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { useModal } from '@modal'
 import { formatContractError, useAuth } from '@shared'
 import { PrintError } from '@shared/components/PrintError'
@@ -22,7 +23,6 @@ interface SeaportFillOrderProps extends CommonSeaportFillOrderProps {
 
 export function SeaportFillOrder({
   order,
-  nft,
   userAddress,
   setIsFilled,
   ...props
@@ -47,7 +47,6 @@ export function SeaportFillOrder({
     return (
       <SeaportFillOrderWithVerifiedContractCall
         order={order}
-        nft={nft}
         contractCall={contractCall}
         userAddress={userAddress}
         setIsFilled={setIsFilled}
@@ -61,13 +60,13 @@ export function SeaportFillOrder({
 
 function SeaportFillOrderWithVerifiedContractCall({
   order,
-  nft,
   userAddress,
   contractCall,
   setIsFilled,
   ...props
 }: SeaportFillOrderProps & { contractCall: SeaportContractCall }) {
   const { requestClose } = useModal()
+  const { collectionAddress, collectionName, tokenId } = useNftMarketContext()
 
   const { offchainOrder } = order
   const { price } = offchainOrder
@@ -91,11 +90,7 @@ function SeaportFillOrderWithVerifiedContractCall({
     loading: loadingValidation,
   } = useValidateSeaportContractCall(contractCall)
 
-  const {
-    attribution,
-    logo: PlatformLogo,
-    platformName,
-  } = useOffchainOrderAttribution(
+  const { logo: PlatformLogo, platformName } = useOffchainOrderAttribution(
     offchainOrder.calldata!,
     offchainOrder?.properties?.salt
   )
@@ -114,7 +109,12 @@ function SeaportFillOrderWithVerifiedContractCall({
   return (
     contractCall && (
       <Stack gap="x8" {...props}>
-        <MarketModalHeading nftObj={nft} action="Buy" />
+        <MarketModalHeading
+          collectionName={collectionName}
+          contractAddress={collectionAddress}
+          tokenId={tokenId}
+          action="Buy"
+        />
         <Stack gap="x3" {...props}>
           <Flex justify="space-between">
             <Paragraph size="lg" inline color="text2" className={[mediumFont]}>
diff --git a/@market/modules/Seaport/SeaportFillOrderFlow.tsx b/@market/modules/Seaport/SeaportFillOrderFlow.tsx
index 69f3c324..69e094f5 100644
--- a/@market/modules/Seaport/SeaportFillOrderFlow.tsx
+++ b/@market/modules/Seaport/SeaportFillOrderFlow.tsx
@@ -2,7 +2,6 @@ import { OffchainOrderWithToken } from 'types/zora.api.generated'
 
 import React, { useState } from 'react'
 
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { StackProps } from '@zoralabs/zord'
 
 import { SeaportFillOrder } from './SeaportFillOrder'
@@ -10,26 +9,18 @@ import { SeaportFillOrderSuccess } from './SeaportFillOrderSuccess'
 
 export interface CommonSeaportFillOrderProps extends StackProps {
   order: OffchainOrderWithToken
-  nft: NFTObject
   userAddress?: string
 }
 
 export function SeaportFillOrderFlow({
   order,
-  nft,
   userAddress,
-  ...props
 }: CommonSeaportFillOrderProps) {
   const [isFilled, setIsFilled] = useState<boolean>(false)
 
   return !isFilled ? (
-    <SeaportFillOrder
-      nft={nft}
-      order={order}
-      userAddress={userAddress}
-      setIsFilled={setIsFilled}
-    />
+    <SeaportFillOrder order={order} userAddress={userAddress} setIsFilled={setIsFilled} />
   ) : (
-    <SeaportFillOrderSuccess userAddress={userAddress} order={order} nft={nft} />
+    <SeaportFillOrderSuccess userAddress={userAddress} order={order} />
   )
 }
diff --git a/@market/modules/V3Ask/PrivateAskApproveModule.tsx b/@market/modules/V3Ask/PrivateAskApproveModule.tsx
index 4e5b26d0..6e817d86 100644
--- a/@market/modules/V3Ask/PrivateAskApproveModule.tsx
+++ b/@market/modules/V3Ask/PrivateAskApproveModule.tsx
@@ -33,7 +33,7 @@ export function PrivateAskApproveModule({
   return isAwaitingApprovalCheck ? (
     <V3AskCheckApprovalSpinner text="Checking Private Ask Module Approval..." />
   ) : (
-    <Stack gap="x8">
+    <Stack gap="x8" {...props}>
       <Stack gap="x8" align="center">
         <Zorb size={52} />
         <V3AskHeadingDescription
diff --git a/@market/modules/V3Ask/UniversalListAskFlow.tsx b/@market/modules/V3Ask/UniversalListAskFlow.tsx
index 3c4f06bc..8fe502b5 100644
--- a/@market/modules/V3Ask/UniversalListAskFlow.tsx
+++ b/@market/modules/V3Ask/UniversalListAskFlow.tsx
@@ -1,24 +1,11 @@
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { FlexProps, Stack } from '@zoralabs/zord'
 
 import { UniversalListAskModal } from './UniversalListAskModal'
 import { V3AskStateProvider } from './providers/V3AskStateProvider'
 
-export interface UniversalAskModalProps extends FlexProps {
-  nftObj: NFTObject
-}
-
-export function UniversalListAskFlow({
-  nftObj,
-  className,
-  ...props
-}: UniversalAskModalProps) {
-  const { nft } = nftObj
-
-  if (!nft) {
-    return null
-  }
+export interface UniversalAskModalProps extends FlexProps {}
 
+export function UniversalListAskFlow({ className, ...props }: UniversalAskModalProps) {
   return (
     <V3AskStateProvider>
       <Stack
@@ -27,7 +14,7 @@ export function UniversalListAskFlow({
         justify="flex-end"
         className={['zora-universal-list-ask-flow', className]}
       >
-        <UniversalListAskModal nftObj={nftObj} />
+        <UniversalListAskModal />
       </Stack>
     </V3AskStateProvider>
   )
diff --git a/@market/modules/V3Ask/UniversalListAskModal.tsx b/@market/modules/V3Ask/UniversalListAskModal.tsx
index 3b6a7cb8..86c606a1 100644
--- a/@market/modules/V3Ask/UniversalListAskModal.tsx
+++ b/@market/modules/V3Ask/UniversalListAskModal.tsx
@@ -3,36 +3,27 @@ import { Button } from 'components/Button'
 import { useCallback } from 'react'
 
 import { SelectListFlow } from '@market/components/SelectListFlow'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { ModalComposition, useModal } from '@modal'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { Box, FlexProps } from '@zoralabs/zord'
 
-import {
-  RESET_V3ASK, // V3AskStateProvider,
-  useV3AskStateContext,
-} from './providers/V3AskStateProvider'
+import { RESET_V3ASK, useV3AskStateContext } from './providers/V3AskStateProvider'
 
-export interface UniversalAskModalProps extends FlexProps {
-  nftObj: NFTObject
-}
+export interface UniversalAskModalProps extends FlexProps {}
 
-export function UniversalListAskModal({ nftObj, ...props }: UniversalAskModalProps) {
-  const { nft } = nftObj
+export function UniversalListAskModal({ ...props }: UniversalAskModalProps) {
+  const { tokenId, collectionAddress } = useNftMarketContext()
   const { requestClose } = useModal()
-  const { state, dispatch } = useV3AskStateContext()
+  const { dispatch } = useV3AskStateContext()
 
   const handleClose = useCallback(() => {
     requestClose()
     dispatch && dispatch({ type: RESET_V3ASK })
   }, [dispatch, requestClose])
 
-  if (!nft) {
-    return null
-  }
-
   return (
     <ModalComposition
-      modalName={`list-${nft.tokenId}${nft.contract.address}`}
+      modalName={`list-${tokenId}${collectionAddress}`}
       modalBehaviorRequiresAuth={true}
       onClose={handleClose}
       trigger={
@@ -41,8 +32,8 @@ export function UniversalListAskModal({ nftObj, ...props }: UniversalAskModalPro
         </Button>
       }
       content={
-        <Box p="x8">
-          <SelectListFlow nftObj={nftObj} closeModal={handleClose} />
+        <Box p="x8" {...props}>
+          <SelectListFlow closeModal={handleClose} />
         </Box>
       }
     />
diff --git a/@market/modules/V3Ask/V3AskApproveModule.tsx b/@market/modules/V3Ask/V3AskApproveModule.tsx
index c36c2721..2d78c77d 100644
--- a/@market/modules/V3Ask/V3AskApproveModule.tsx
+++ b/@market/modules/V3Ask/V3AskApproveModule.tsx
@@ -30,7 +30,7 @@ export function V3AskApproveModule({ onNext, ...props }: V3AskApproveModuleProps
   return isAwaitingApprovalCheck ? (
     <V3AskCheckApprovalSpinner text="Checking V3 Ask Module Approval..." />
   ) : (
-    <Stack gap="x8">
+    <Stack gap="x8" {...props}>
       <Stack gap="x8" align="center">
         <Zorb size={52} />
         <V3AskHeadingDescription
diff --git a/@market/modules/V3Ask/V3AskApproveTransferHelper.tsx b/@market/modules/V3Ask/V3AskApproveTransferHelper.tsx
index 69964a86..b46ca7e4 100644
--- a/@market/modules/V3Ask/V3AskApproveTransferHelper.tsx
+++ b/@market/modules/V3Ask/V3AskApproveTransferHelper.tsx
@@ -15,7 +15,7 @@ interface V3AskApproveTransferHelperProps extends CommonV3AskComponentProps {}
 
 export function V3AskApproveTransferHelper({
   onNext,
-  nft,
+  contractAddress,
   ...props
 }: V3AskApproveTransferHelperProps) {
   const {
@@ -25,7 +25,7 @@ export function V3AskApproveTransferHelper({
     isAwaitingApprovalCheck,
     error,
     handleApproveERC721ForSpender,
-  } = useV3AskTransferHelperApproval({ contractAddress: nft.nft?.contract.address })
+  } = useV3AskTransferHelperApproval({ contractAddress })
 
   useEffect(() => {
     isApproved && onNext && onNext()
@@ -34,7 +34,7 @@ export function V3AskApproveTransferHelper({
   return isAwaitingApprovalCheck ? (
     <V3AskCheckApprovalSpinner text="Checking Zora Transfer Helper Approval..." />
   ) : (
-    <Stack gap="x8">
+    <Stack gap="x8" {...props}>
       <Stack gap="x8" align="center">
         <Zorb size={52} />
         <V3AskHeadingDescription
diff --git a/@market/modules/V3Ask/V3AskBuyerTrigger.tsx b/@market/modules/V3Ask/V3AskBuyerTrigger.tsx
index 4c1146ad..cd80ad0a 100644
--- a/@market/modules/V3Ask/V3AskBuyerTrigger.tsx
+++ b/@market/modules/V3Ask/V3AskBuyerTrigger.tsx
@@ -1,8 +1,11 @@
 import { Button } from 'components/Button'
 
+import { useToken } from 'hooks/useToken'
+
 import React, { useCallback, useMemo, useState } from 'react'
+import { TypeSafeMarket } from 'validators/market'
 
-import { useAskHelper, useRelevantMarket } from '@market/hooks'
+import { useRelevantMarket } from '@market/hooks'
 import {
   APPROVE_MODULE_FOR_FILL_PRIVATEASK,
   APPROVE_MODULE_FOR_FILL_V3ASK,
@@ -10,19 +13,17 @@ import {
 } from '@market/modules/V3Ask/'
 import { useButtonRequiresAuth } from '@shared'
 import { PriceWithLabel } from '@shared/components/PriceWithLabel'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { Well } from '@zoralabs/zord'
 
 interface V3AskBuyerTriggerProps {
-  nft: NFTObject
+  markets: TypeSafeMarket[]
   openModal: () => void
 }
 
-export function V3AskBuyerTrigger({ nft, openModal }: V3AskBuyerTriggerProps) {
+export function V3AskBuyerTrigger({ markets, openModal }: V3AskBuyerTriggerProps) {
   const { dispatch } = useV3AskStateContext()
-  const { ask } = useRelevantMarket(nft.markets)
   const { displayAskAmount, usdAskAmount, hasActivePrivateAsk, isValidPrivateAskBuyer } =
-    useAskHelper({ ask })
+    useRelevantMarket(markets)
   const [disabled, setDisabled] = useState<boolean>(false)
   const label = useMemo(
     () => (hasActivePrivateAsk ? 'Private Listing' : 'Listing'),
diff --git a/@market/modules/V3Ask/V3AskFlow.tsx b/@market/modules/V3Ask/V3AskFlow.tsx
index 69c0ba15..dc3df133 100644
--- a/@market/modules/V3Ask/V3AskFlow.tsx
+++ b/@market/modules/V3Ask/V3AskFlow.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import { TypeSafeMarket } from 'validators/market'
 
 import {
   APPROVE_MODULE_FOR_CREATE_PRIVATEASK,
@@ -27,7 +28,7 @@ import {
   VIEW_V3ASK_LISTING,
   useV3AskStateContext,
 } from '@market/modules/V3Ask/providers/V3AskStateProvider'
-import { NFTObject } from '@zoralabs/nft-hooks'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { Stack, StackProps } from '@zoralabs/zord'
 
 import { PrivateAskApproveModule } from './PrivateAskApproveModule'
@@ -77,22 +78,29 @@ const componentMap = {
   [RESET_V3ASK]: () => null,
 }
 
-interface V3AskModalProps {
-  nft: NFTObject
-}
-
 export interface CommonV3AskComponentProps extends StackProps {
-  nft: NFTObject
   onNext?: () => void
+  tokenId: string
+  contractAddress: string
+  collectionName: string
+  markets: TypeSafeMarket[]
 }
 
-export function V3AskFlow({ nft }: V3AskModalProps) {
+export function V3AskFlow() {
+  const { markets, tokenId, collectionAddress, collectionName } = useNftMarketContext()
   const { state, handleNext } = useV3AskStateContext()
   const Component = componentMap[state.status]
 
   return (
     <Stack justify="center">
-      <Component key={state.status} nft={nft} onNext={handleNext} />
+      <Component
+        key={state.status}
+        onNext={handleNext}
+        tokenId={tokenId}
+        contractAddress={collectionAddress}
+        collectionName={collectionName}
+        markets={markets}
+      />
     </Stack>
   )
 }
diff --git a/@market/modules/V3Ask/V3AskModal.tsx b/@market/modules/V3Ask/V3AskModal.tsx
index 9fbbd098..8e2287bb 100644
--- a/@market/modules/V3Ask/V3AskModal.tsx
+++ b/@market/modules/V3Ask/V3AskModal.tsx
@@ -4,7 +4,6 @@ import React, { useCallback } from 'react'
 
 import { Modal, ModalContent, useModal } from '@modal'
 import { customBackground, customContent } from '@modal/Modal.css'
-import { NFTObject } from '@zoralabs/nft-hooks'
 
 import { V3AskFlow } from './V3AskFlow'
 import * as styles from './V3AskModal.css'
@@ -12,32 +11,36 @@ import { V3AskTrigger } from './V3AskTrigger'
 import { V3AskStateProvider } from './providers/V3AskStateProvider'
 
 interface V3AskModalProps {
-  nftObj: NFTObject
   modalName: string
   disableCloseOnClickOutside?: boolean
+  isOwner: boolean
+  showOnlyTrigger?: boolean
 }
 
 export function V3AskModal({
-  nftObj,
+  isOwner,
   modalName,
   disableCloseOnClickOutside = false,
+  showOnlyTrigger = false,
 }: V3AskModalProps) {
   const { modalType, requestClose, requestOpen } = useModal()
   const modalHandler = useCallback(() => {
     requestOpen(modalName)
   }, [modalName, requestOpen])
-  const { nft } = nftObj
-
-  if (!nft) {
-    return null
-  }
 
   return (
     <V3AskStateProvider>
       <Modal
         open={modalType === modalName}
         onOpenChange={requestClose}
-        trigger={<V3AskTrigger nft={nftObj} openModal={modalHandler} />}
+        trigger={
+          <V3AskTrigger
+            isOwner={isOwner}
+            modalName={modalName}
+            openModal={modalHandler}
+            showOnlyTrigger={showOnlyTrigger}
+          />
+        }
       >
         <ModalContent
           className={clsx(styles.content, styles.modalBackground)}
@@ -47,7 +50,7 @@ export function V3AskModal({
           showClose={false}
           padding="x8"
         >
-          <V3AskFlow nft={nftObj} />
+          <V3AskFlow />
         </ModalContent>
       </Modal>
     </V3AskStateProvider>
diff --git a/@market/modules/V3Ask/V3AskOwnerTrigger.tsx b/@market/modules/V3Ask/V3AskOwnerTrigger.tsx
index c9403aaa..5fad394a 100644
--- a/@market/modules/V3Ask/V3AskOwnerTrigger.tsx
+++ b/@market/modules/V3Ask/V3AskOwnerTrigger.tsx
@@ -3,19 +3,19 @@ import { Button } from 'components/Button'
 
 import React, { useCallback, useMemo, useState } from 'react'
 
-import { useAskHelper, useRelevantMarket } from '@market/hooks'
+import { useRelevantMarket } from '@market/hooks'
 import { PossibleV3AskState, useV3AskStateContext } from '@market/modules/V3Ask/'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { useKeyPress } from '@shared'
 import { PriceWithLabel } from '@shared/components/PriceWithLabel'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { PopUp, Stack, Text, Well } from '@zoralabs/zord'
 
 import { UniversalListAskFlow } from './UniversalListAskFlow'
 import * as styles from './V3AskFlow.css'
 
 interface V3AskOwnerTriggerProps {
-  nft: NFTObject
   openModal: () => void
+  showOnlyTrigger: boolean
 }
 
 const v3AskDropdownOptions = [
@@ -50,14 +50,14 @@ const privateAskDropdownOptions = [
   },
 ]
 
-export function V3AskOwnerTrigger({ nft, openModal }: V3AskOwnerTriggerProps) {
+export function V3AskOwnerTrigger({
+  openModal,
+  showOnlyTrigger,
+}: V3AskOwnerTriggerProps) {
+  const { markets } = useNftMarketContext()
   const { dispatch } = useV3AskStateContext()
-  const { ask } = useRelevantMarket(nft.markets)
-
   const { displayAskAmount, usdAskAmount, hasActivePrivateAsk, isActiveAsk } =
-    useAskHelper({
-      ask,
-    })
+    useRelevantMarket(markets)
 
   const dropdownOptions = useMemo(
     () => (hasActivePrivateAsk ? privateAskDropdownOptions : v3AskDropdownOptions),
@@ -81,6 +81,50 @@ export function V3AskOwnerTrigger({ nft, openModal }: V3AskOwnerTriggerProps) {
     [hasActivePrivateAsk]
   )
 
+  if (isActiveAsk && showOnlyTrigger) {
+    return (
+      <PopUp
+        open={open}
+        placement="bottom-end"
+        wrapperClassName={clsx('privateask-owner-popup-wrapper', styles.popupWrapper)}
+        triggerClassName={clsx('privateask-owner-popup-trigger', styles.popupTrigger)}
+        trigger={
+          <Button
+            w="100%"
+            variant="secondary"
+            onClick={() => setOpen(true)}
+            className={['manage-dropdown']}
+          >
+            Manage Listing...
+          </Button>
+        }
+      >
+        <Stack aria-label="Manage Dropdown" w="x64" borderRadius="curved">
+          {dropdownOptions.map((option) => (
+            <Button
+              variant="ghost"
+              w="100%"
+              justify="space-between"
+              style={{
+                whiteSpace: 'nowrap',
+              }}
+              key={option.label}
+              onClick={() => handleClick(option.action)}
+            >
+              <Text
+                as="span"
+                pr="x10"
+                color={option.destructive ? 'negative' : undefined}
+              >
+                {option.label}
+              </Text>
+            </Button>
+          ))}
+        </Stack>
+      </PopUp>
+    )
+  }
+
   if (isActiveAsk) {
     return (
       <Well gap="x6" borderRadius="phat">
@@ -89,7 +133,7 @@ export function V3AskOwnerTrigger({ nft, openModal }: V3AskOwnerTriggerProps) {
             label={label}
             symbol="ETH"
             cryptoAmount={displayAskAmount}
-            usdAmount={usdAskAmount}
+            usdAmount={usdAskAmount ?? 0}
           />
         )}
         <PopUp
@@ -135,5 +179,5 @@ export function V3AskOwnerTrigger({ nft, openModal }: V3AskOwnerTriggerProps) {
     )
   }
 
-  return <UniversalListAskFlow nftObj={nft} />
+  return <UniversalListAskFlow />
 }
diff --git a/@market/modules/V3Ask/V3AskSidebar.tsx b/@market/modules/V3Ask/V3AskSidebar.tsx
index b666ff64..acabb225 100644
--- a/@market/modules/V3Ask/V3AskSidebar.tsx
+++ b/@market/modules/V3Ask/V3AskSidebar.tsx
@@ -1,18 +1,17 @@
 import React from 'react'
 
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { Stack, StackProps } from '@zoralabs/zord'
 
 import { V3AskModal } from './V3AskModal'
 
 interface V3AskSidebarProps extends StackProps {
-  nftObj: NFTObject
+  isOwner: boolean
 }
 
-export function V3AskSidebar({ nftObj, className, ...props }: V3AskSidebarProps) {
+export function V3AskSidebar({ className, isOwner, ...props }: V3AskSidebarProps) {
   return (
     <Stack {...props} className={className}>
-      <V3AskModal modalName="V3AskV3" nftObj={nftObj} />
+      <V3AskModal isOwner={isOwner} modalName="V3AskV3" />
     </Stack>
   )
 }
diff --git a/@market/modules/V3Ask/V3AskTrigger.tsx b/@market/modules/V3Ask/V3AskTrigger.tsx
index 6bb5db6e..a04497a5 100644
--- a/@market/modules/V3Ask/V3AskTrigger.tsx
+++ b/@market/modules/V3Ask/V3AskTrigger.tsx
@@ -1,27 +1,28 @@
 import React from 'react'
 
 import { useRelevantMarket } from '@market/hooks'
-import { useIsOwner } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 
 import { V3AskBuyerTrigger } from './V3AskBuyerTrigger'
 import { V3AskOwnerTrigger } from './V3AskOwnerTrigger'
 
 interface V3AskTriggerProps {
-  nft: NFTObject
   openModal: () => void
+  modalName: string
+  isOwner: boolean
+  showOnlyTrigger: boolean
 }
 
-export function V3AskTrigger({ nft, openModal }: V3AskTriggerProps) {
-  const { isOwner } = useIsOwner(nft)
-  const { ask } = useRelevantMarket(nft.markets)
+export function V3AskTrigger({ isOwner, openModal, showOnlyTrigger }: V3AskTriggerProps) {
+  const { markets } = useNftMarketContext()
+  const { ask } = useRelevantMarket(markets)
 
   if (isOwner) {
-    return <V3AskOwnerTrigger nft={nft} openModal={openModal} />
+    return <V3AskOwnerTrigger showOnlyTrigger={showOnlyTrigger} openModal={openModal} />
   }
 
   if (ask) {
-    return <V3AskBuyerTrigger nft={nft} openModal={openModal} />
+    return <V3AskBuyerTrigger markets={markets} openModal={openModal} />
   }
 
   return null
diff --git a/@market/modules/V3Ask/cancel/V3AskCancel.tsx b/@market/modules/V3Ask/cancel/V3AskCancel.tsx
index f8285d24..27d20c8d 100644
--- a/@market/modules/V3Ask/cancel/V3AskCancel.tsx
+++ b/@market/modules/V3Ask/cancel/V3AskCancel.tsx
@@ -1,13 +1,13 @@
 import { Button } from 'components/Button'
 
 import React, { useEffect, useMemo } from 'react'
+import { TypeSafeMarket } from 'validators/market'
 
 import { MarketModalHeading } from '@market/components'
 import { TransactionSubmitButton } from '@market/components/TransactionSubmitButton'
 import { useListingDataTable } from '@market/hooks'
 import { useModal } from '@modal/useModal'
 import { DataTable, PrintError, formatContractError } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { Flex, Stack } from '@zoralabs/zord'
 
 import { CommonV3AskComponentProps } from '../V3AskFlow'
@@ -16,26 +16,42 @@ import { PRIVATE_ASK, V3_ASK, useV3AskTransaction } from '../hooks/useV3AskTrans
 import { useV3AskStateContext } from '../providers'
 
 interface V3AskCancelProps extends CommonV3AskComponentProps {
-  nft: NFTObject
+  tokenId: string
+  contractAddress: string
+  markets: TypeSafeMarket[]
+  collectionName: string
 }
 
-export function V3AskCancel({ onNext, nft, ...props }: V3AskCancelProps) {
+export function V3AskCancel({
+  onNext,
+  tokenId,
+  contractAddress,
+  markets,
+  collectionName,
+  ...props
+}: V3AskCancelProps) {
   const { state } = useV3AskStateContext()
   const { flow } = state
   const askType = useMemo(() => (flow === PRIVATE_ASK ? PRIVATE_ASK : V3_ASK), [flow])
 
   const { isSubmitting, cancelAsk, txStatus, txInProgress, txError, finalizedTx } =
-    useV3AskTransaction({ nft: nft, askType: askType })
+    useV3AskTransaction({ contractAddress, tokenId, askType: askType })
   useEffect(() => finalizedTx!! && onNext && onNext(), [finalizedTx, onNext])
   const { requestClose } = useModal()
+
   const { formattedListingDataTable } = useListingDataTable({
-    nft: nft,
+    markets,
   })
 
   return (
     <Stack gap="x3" {...props}>
       <Stack gap="x4">
-        <MarketModalHeading nftObj={nft} action="Delist" />
+        <MarketModalHeading
+          action="Delist"
+          tokenId={tokenId}
+          contractAddress={contractAddress}
+          collectionName={collectionName}
+        />
 
         <DataTable
           rowSize="lg"
diff --git a/@market/modules/V3Ask/create/PrivateAskCreate.tsx b/@market/modules/V3Ask/create/PrivateAskCreate.tsx
index 364eb4bc..7eac0b9b 100644
--- a/@market/modules/V3Ask/create/PrivateAskCreate.tsx
+++ b/@market/modules/V3Ask/create/PrivateAskCreate.tsx
@@ -5,6 +5,7 @@ import React, { useEffect } from 'react'
 import { BigNumber } from '@ethersproject/bignumber'
 import { parseUnits } from '@ethersproject/units'
 import { TransactionSubmitButton } from '@market/components/TransactionSubmitButton'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import {
   PrintError,
   formatContractError,
@@ -57,8 +58,9 @@ const validate = (values: Values) => {
 }
 
 export function PrivateAskCreate({ onNext, ...props }: PrivateAskCreateProps) {
+  const { tokenId, collectionAddress } = useNftMarketContext()
   const { txStatus, txInProgress, txError, createAsk, finalizedTx } = useV3AskTransaction(
-    { nft: props.nft, askType: PRIVATE_ASK }
+    { contractAddress: collectionAddress, tokenId, askType: PRIVATE_ASK }
   )
   useEffect(() => finalizedTx!! && onNext!(), [finalizedTx, onNext])
 
diff --git a/@market/modules/V3Ask/create/V3AskCreate.tsx b/@market/modules/V3Ask/create/V3AskCreate.tsx
index 875777b4..f43db67d 100644
--- a/@market/modules/V3Ask/create/V3AskCreate.tsx
+++ b/@market/modules/V3Ask/create/V3AskCreate.tsx
@@ -38,9 +38,17 @@ const validate = (values: Values) => {
   return errors
 }
 
-export function V3AskCreate({ onNext, ...props }: V3AskCreateProps) {
+export function V3AskCreate({
+  onNext,
+  contractAddress,
+  tokenId,
+  ...props
+}: V3AskCreateProps) {
   const { txStatus, txInProgress, txError, createAsk, finalizedTx } = useV3AskTransaction(
-    { nft: props.nft }
+    {
+      contractAddress,
+      tokenId,
+    }
   )
   useEffect(() => finalizedTx!! && onNext!(), [finalizedTx, onNext])
 
diff --git a/@market/modules/V3Ask/create/V3AskCreateSuccess.tsx b/@market/modules/V3Ask/create/V3AskCreateSuccess.tsx
index 3758f04e..c3099ced 100644
--- a/@market/modules/V3Ask/create/V3AskCreateSuccess.tsx
+++ b/@market/modules/V3Ask/create/V3AskCreateSuccess.tsx
@@ -25,12 +25,12 @@ const v3AskCopy = {
 }
 
 export function V3AskCreateSuccess({
-  nft: nftObj,
+  tokenId,
+  contractAddress,
   onNext,
   ...props
 }: V3AskCreateSuccessProps) {
-  const { nft } = nftObj
-  const askURL = `https://noun.market/collections/${nft?.contract.address}/${nft?.tokenId}`
+  const askURL = `https://noun.market/daos/${contractAddress}/${tokenId}`
   const [_, copied, copy] = useCopyToClipboard(askURL)
   const { toastDispatch } = useToast()
   const { state } = useV3AskStateContext()
diff --git a/@market/modules/V3Ask/fill/V3AskFillAsk.tsx b/@market/modules/V3Ask/fill/V3AskFillAsk.tsx
index 337d293a..3c947d04 100644
--- a/@market/modules/V3Ask/fill/V3AskFillAsk.tsx
+++ b/@market/modules/V3Ask/fill/V3AskFillAsk.tsx
@@ -5,7 +5,6 @@ import React, { useEffect, useMemo } from 'react'
 
 import { MarketModalHeading } from '@market/components'
 import { TransactionSubmitButton } from '@market/components/TransactionSubmitButton'
-import { useAskHelper } from '@market/hooks/useAskHelper'
 import { useRelevantMarket } from '@market/hooks/useRelevantMarket'
 import { useModal } from '@modal'
 import { formatContractError } from '@shared'
@@ -19,13 +18,16 @@ import { useV3AskTransaction } from '../hooks/useV3AskTransaction'
 
 interface V3AskFillAskProps extends CommonV3AskComponentProps {}
 
-export function V3AskFillAsk({ onNext, ...props }: V3AskFillAskProps) {
+export function V3AskFillAsk({
+  onNext,
+  tokenId,
+  contractAddress,
+  collectionName,
+  markets,
+  ...props
+}: V3AskFillAskProps) {
   const { requestClose } = useModal()
-  const { markets } = props.nft
-  const { ask } = useRelevantMarket(markets)
-  const { displayAskAmount, hasSufficientFunds } = useAskHelper({
-    ask,
-  })
+  const { displayAskAmount, hasSufficientFunds } = useRelevantMarket(markets)
 
   const askPriceSummary = useMemo(
     // todo: get this data from usePrimaryAuctionDataTable when we've switched from NFTObject to TypeSafeToken
@@ -40,12 +42,13 @@ export function V3AskFillAsk({ onNext, ...props }: V3AskFillAskProps) {
   )
 
   const savings = useMemo(
-    () => (displayAskAmount ? (parseFloat(displayAskAmount) * 0.025).toFixed(5) : '0'),
+    () => (displayAskAmount ? (displayAskAmount * 0.025).toFixed(5) : '0'),
     [displayAskAmount]
   )
 
   const { txStatus, txInProgress, txError, finalizedTx, fillAsk } = useV3AskTransaction({
-    nft: props.nft,
+    tokenId,
+    contractAddress,
   })
   const isDisabled = useMemo(
     () => txInProgress || !hasSufficientFunds || !displayAskAmount,
@@ -55,7 +58,12 @@ export function V3AskFillAsk({ onNext, ...props }: V3AskFillAskProps) {
 
   return (
     <Stack gap="x3" {...props}>
-      <MarketModalHeading nftObj={props.nft} action="Buy" />
+      <MarketModalHeading
+        tokenId={tokenId}
+        contractAddress={contractAddress}
+        collectionName={collectionName}
+        action="Buy"
+      />
 
       <Flex justify="space-between">
         <Paragraph size="lg" inline color="text3" className={[mediumFont]}>
@@ -89,7 +97,7 @@ export function V3AskFillAsk({ onNext, ...props }: V3AskFillAskProps) {
             type="submit"
             txStatus={txStatus}
             txInProgress={txInProgress}
-            onClick={() => fillAsk({ price: displayAskAmount })}
+            onClick={() => fillAsk({ price: displayAskAmount?.toString() })}
             disabled={isDisabled}
             w="auto"
             flex={1}
diff --git a/@market/modules/V3Ask/hooks/useFormattedV3AskInfo.ts b/@market/modules/V3Ask/hooks/useFormattedV3AskInfo.ts
index 13432142..1153f80c 100644
--- a/@market/modules/V3Ask/hooks/useFormattedV3AskInfo.ts
+++ b/@market/modules/V3Ask/hooks/useFormattedV3AskInfo.ts
@@ -1,26 +1,36 @@
-import { useMemo } from 'react'
+import { useToken } from 'hooks/useToken'
 
-import { useAskHelper, useRelevantMarket } from '@market/hooks'
+import { useEffect, useMemo, useState } from 'react'
+import { isV3Ask } from 'validators/isV3Ask'
+import { TypeSafeMarket } from 'validators/market'
+
+import { useRelevantMarket } from '@market/hooks'
 import { isAddress, shortenAddress } from '@shared'
 import { DataTableItemProps } from '@shared/components/DataTable/DataTableItem'
 import { resolvePossibleENSAddress } from '@shared/utils/resolvePossibleENSAddress'
-import { NFTObject } from '@zoralabs/nft-hooks'
 
 import { useV3AskContractContext } from '../providers/V3AskContractProvider'
 import { useV3AskStateContext } from '../providers/V3AskStateProvider'
 
 interface V3AskInfoProps {
-  nft: NFTObject
+  contractAddress: string
+  tokenId: string
+  markets: TypeSafeMarket[]
 }
 
-export const useFormattedV3AskInfo = ({ nft: nftObj }: V3AskInfoProps) => {
+export const useFormattedV3AskInfo = ({
+  contractAddress,
+  tokenId,
+  markets,
+}: V3AskInfoProps) => {
   const { V3Asks, PrivateAsks } = useV3AskContractContext()
   const { finalizedV3AskDetails } = useV3AskStateContext()
-  const { nft, markets } = nftObj
+  const [buyerAddressAsAddress, setBuyerAddressAsAddress] = useState<string | undefined>(
+    undefined
+  )
 
   // Prioritize data from a just-created ask, or fall back to the relevant ask in the NFT's market obj
-  const { ask } = useRelevantMarket(markets)
-  const { hasActiveV3Ask, hasActivePrivateAsk, isActiveAsk } = useAskHelper({ ask })
+  const { ask, hasActivePrivateAsk, isActiveAsk } = useRelevantMarket(markets)
   const hasRelevantV3Ask = useMemo(
     // () => finalizedV3AskDetails || hasActiveV3Ask,
     () => finalizedV3AskDetails || isActiveAsk,
@@ -29,25 +39,35 @@ export const useFormattedV3AskInfo = ({ nft: nftObj }: V3AskInfoProps) => {
 
   const askPrice = useMemo(() => {
     if (!hasRelevantV3Ask) return '...'
-    return finalizedV3AskDetails?.price ?? ask?.amount?.eth?.value
-  }, [ask?.amount?.eth?.value, finalizedV3AskDetails?.price, hasRelevantV3Ask])
+    return finalizedV3AskDetails?.price ?? ask?.price?.nativePrice?.decimal
+  }, [ask?.price?.nativePrice?.decimal, finalizedV3AskDetails?.price, hasRelevantV3Ask])
+
   const possibleENSBuyerAddress = useMemo(() => {
-    if (!hasRelevantV3Ask || !hasActivePrivateAsk) return null
-    return finalizedV3AskDetails?.rawBuyerAddress ?? ask?.raw.properties.buyer
+    if (!isV3Ask(ask?.properties) || !hasRelevantV3Ask || !hasActivePrivateAsk)
+      return undefined
+    return finalizedV3AskDetails?.rawBuyerAddress ?? ask?.properties?.buyer ?? undefined
   }, [
-    ask?.raw.properties.buyer,
+    ask?.properties,
     finalizedV3AskDetails?.rawBuyerAddress,
     hasRelevantV3Ask,
     hasActivePrivateAsk,
   ])
-  // Format data for use as an address + for clean output
-  const buyerAddressAsAddress = useMemo(() => {
-    if (!possibleENSBuyerAddress) return undefined
 
-    return isAddress(possibleENSBuyerAddress)
-      ? possibleENSBuyerAddress
-      : resolvePossibleENSAddress(possibleENSBuyerAddress)
+  useEffect(() => {
+    ;(async () => {
+      if (!possibleENSBuyerAddress) return undefined
+      if (isAddress(possibleENSBuyerAddress))
+        setBuyerAddressAsAddress(possibleENSBuyerAddress)
+
+      if (possibleENSBuyerAddress) {
+        const buyerAddressAsAddress = await resolvePossibleENSAddress(
+          possibleENSBuyerAddress
+        )
+        buyerAddressAsAddress && setBuyerAddressAsAddress(buyerAddressAsAddress)
+      }
+    })()
   }, [possibleENSBuyerAddress])
+
   const buyerAsENSorShortenedAddress = useMemo(() => {
     if (!possibleENSBuyerAddress) return undefined
 
@@ -82,20 +102,20 @@ export const useFormattedV3AskInfo = ({ nft: nftObj }: V3AskInfoProps) => {
       },
       {
         label: 'Token contract',
-        value: shortenAddress(nft?.contract.address),
-        copyValue: nft?.contract.address!,
+        value: shortenAddress(contractAddress),
+        copyValue: contractAddress,
         url: {
-          href: `https://etherscan.io/address/${nft?.contract.address}`,
+          href: `https://etherscan.io/address/${contractAddress}`,
           target: '_blank',
           rel: 'noreferrer',
         },
       },
       {
         label: 'Token ID',
-        value: nft?.tokenId!,
-        copyValue: nft?.tokenId!,
+        value: tokenId,
+        copyValue: tokenId,
         url: {
-          href: `https://zora.co/collections/${nft?.contract.address}/${nft?.tokenId}`,
+          href: `https://zora.co/collections/${contractAddress}/${tokenId}`,
           target: '_blank',
           rel: 'noreferrer',
         },
@@ -115,7 +135,7 @@ export const useFormattedV3AskInfo = ({ nft: nftObj }: V3AskInfoProps) => {
     const askBuyer = {
       label: 'Buyer',
       value: buyerAsENSorShortenedAddress!,
-      copyValue: possibleENSBuyerAddress,
+      copyValue: possibleENSBuyerAddress!,
       url: {
         href: `https://zora.co/${possibleENSBuyerAddress}`,
         target: '_blank',
@@ -124,15 +144,18 @@ export const useFormattedV3AskInfo = ({ nft: nftObj }: V3AskInfoProps) => {
       address: finalizedV3AskDetails?.buyerAddress,
     }
 
-    hasActivePrivateAsk && askDetails.push(askBuyer)
+    possibleENSBuyerAddress &&
+      buyerAsENSorShortenedAddress &&
+      hasActivePrivateAsk &&
+      askDetails.push(askBuyer)
 
     return askDetails
   }, [
     hasRelevantV3Ask,
     asksContractAddressLabel,
     asksContractAddress,
-    nft?.contract.address,
-    nft?.tokenId,
+    contractAddress,
+    tokenId,
     askPrice,
     buyerAsENSorShortenedAddress,
     possibleENSBuyerAddress,
diff --git a/@market/modules/V3Ask/hooks/usePrimaryAuctionDataTable.ts b/@market/modules/V3Ask/hooks/usePrimaryAuctionDataTable.ts
index da803e0a..66000f45 100644
--- a/@market/modules/V3Ask/hooks/usePrimaryAuctionDataTable.ts
+++ b/@market/modules/V3Ask/hooks/usePrimaryAuctionDataTable.ts
@@ -1,11 +1,11 @@
+import { useToken } from 'hooks/useToken'
+
 import { useMemo } from 'react'
 import { TypeSafeToken } from 'validators/token'
 
 import { useRelevantMarket } from '@market/hooks'
-import { useNounishAuctionQuery } from '@noun-auction'
 import { shortenAddress } from '@shared'
 import { DataTableItemProps } from '@shared/components/DataTable/DataTableItem'
-import { useNFT } from '@zoralabs/nft-hooks'
 
 interface NounishAuctionInfoProps {
   token: TypeSafeToken
@@ -13,19 +13,31 @@ interface NounishAuctionInfoProps {
 }
 
 export const usePrimaryAuctionDataTable = ({
-  token,
+  token: t,
   primarySalePrice,
 }: NounishAuctionInfoProps) => {
-  const { data: nftObj } = useNFT(token.collectionAddress, token.tokenId)
+  const { collectionAddress, tokenId } = t
+  const { markets } = useToken({
+    collectionAddress: collectionAddress,
+    tokenId: tokenId,
+  })
 
-  const nft = nftObj?.nft
-  const markets = nftObj?.markets
+  // const nft = nftObj?.nft
+  // const markets = nftObj?.markets
   const { ask } = useRelevantMarket(markets)
 
-  const { auctionContractAddress } = useNounishAuctionQuery({
-    collectionAddress: token.collectionAddress,
-  })
-  const askPrice = useMemo(() => ask?.amount?.eth?.value, [ask?.amount?.eth?.value])
+  const askPrice = useMemo(
+    () => ask?.price?.nativePrice.decimal,
+    [ask?.price?.nativePrice.decimal]
+  )
+
+  const auctionContractAddress = useMemo(
+    () => () => t?.collectionAddress,
+    [t?.collectionAddress]
+  )
+  //   () => (nft ? returnDaoAuctionContract(nft?.contract.address) : null),
+  //   [nft]
+  // )
 
   const askPriceSummary = useMemo(
     () =>
@@ -42,18 +54,18 @@ export const usePrimaryAuctionDataTable = ({
     const summary = [
       {
         label: 'Owned by',
-        value: shortenAddress(nft?.owner?.address),
+        value: shortenAddress(t?.owner),
         url: {
-          href: `https://market.zora.co/${nft?.owner?.address}`,
+          href: `https://market.zora.co/${t?.owner}`,
           target: '_blank',
           rel: 'noreferrer',
         },
       },
       {
         label: 'Minted by',
-        value: shortenAddress(nft?.minted.address),
+        value: shortenAddress(t?.mintInfo?.toAddress),
         url: {
-          href: `https://market.zora.co/${nft?.minted?.address}`,
+          href: `https://market.zora.co/${t?.mintInfo?.toAddress}`,
           target: '_blank',
           rel: 'noreferrer',
         },
@@ -74,7 +86,7 @@ export const usePrimaryAuctionDataTable = ({
     }
 
     return summary
-  }, [nft?.owner?.address, nft?.minted.address, primarySalePrice, auctionContractAddress])
+  }, [t?.owner, t?.mintInfo?.toAddress, primarySalePrice, auctionContractAddress])
 
   const copyableValue = useMemo(() => {
     if (!formattedAuctionDataTable) return ''
diff --git a/@market/modules/V3Ask/hooks/useV3AskTransaction.ts b/@market/modules/V3Ask/hooks/useV3AskTransaction.ts
index c6d9f3fb..34c265b8 100644
--- a/@market/modules/V3Ask/hooks/useV3AskTransaction.ts
+++ b/@market/modules/V3Ask/hooks/useV3AskTransaction.ts
@@ -6,7 +6,6 @@ import { parseUnits } from '@ethersproject/units'
 import { useV3AskContractContext, useV3AskStateContext } from '@market/modules/V3Ask'
 import * as Sentry from '@sentry/react'
 import { useContractTransaction } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
 
 // Define Ask Types
 export const V3_ASK: string = 'V3Ask'
@@ -35,13 +34,15 @@ interface WriteAskTxValues extends AskTxValues {
 }
 
 interface useV3AskTransactionProps {
-  nft: NFTObject
   askType?: AskType
+  tokenId: string
+  contractAddress: string
 }
 
 export const useV3AskTransaction = ({
-  nft: nftObj,
   askType = V3_ASK,
+  tokenId,
+  contractAddress,
 }: useV3AskTransactionProps) => {
   const { V3Asks, PrivateAsks } = useV3AskContractContext()
   const { txStatus, handleTx, txInProgress } = useContractTransaction()
@@ -49,7 +50,6 @@ export const useV3AskTransaction = ({
   const { setFinalizedV3AskDetails } = useV3AskStateContext()
   const [finalizedTx, setFinalizedTx] = useState<ContractTransaction | null>()
   const [txError, setTxError] = useState<Error>()
-  const { nft } = nftObj
 
   const isPrivate: boolean = askType === PRIVATE_ASK
   const ActiveAskModule = isPrivate ? PrivateAsks : V3Asks
@@ -73,7 +73,7 @@ export const useV3AskTransaction = ({
     const isValidWrite = isValidV3Write || isValidPrivateWrite
 
     try {
-      if (!nft || !contractInitialized) {
+      if (!contractInitialized) {
         throw new Error('V3AskContract is not ready, please try again.')
       }
       if (missingPrice) {
@@ -86,8 +86,8 @@ export const useV3AskTransaction = ({
       const priceAsBigNumber = parseUnits(price?.toString() || '0', 'ether') // Convert from human-readable number to WEI
 
       const createParams: [string, string, BigNumber] = [
-        nft.contract.address,
-        nft.tokenId,
+        contractAddress,
+        tokenId,
         priceAsBigNumber,
       ]
 
@@ -99,20 +99,20 @@ export const useV3AskTransaction = ({
         case CREATE_V3_ASK:
           promise = isPrivate
             ? PrivateAsks.createAsk(...createParams, buyerAddress!)
-            : V3Asks.createAsk(nft.contract.address, nft.tokenId, priceAsBigNumber)
+            : V3Asks.createAsk(contractAddress, tokenId, priceAsBigNumber)
           break
         case UPDATE_V3_ASK:
           promise = ActiveAskModule.setAskPrice(
-            nft.contract.address,
-            nft.tokenId,
+            contractAddress,
+            tokenId,
             priceAsBigNumber
           )
           break
         case CANCEL_V3_ASK:
-          promise = ActiveAskModule.cancelAsk(nft.contract.address, nft.tokenId)
+          promise = ActiveAskModule.cancelAsk(contractAddress, tokenId)
           break
         case FILL_V3_ASK:
-          promise = ActiveAskModule.fillAsk(nft.contract.address, nft.tokenId, {
+          promise = ActiveAskModule.fillAsk(contractAddress, tokenId, {
             value: priceAsBigNumber, // optional override param actually required :)
           })
           break
diff --git a/@market/modules/V3Ask/update/PrivateAskUpdate.tsx b/@market/modules/V3Ask/update/PrivateAskUpdate.tsx
index 768769d6..277d7951 100644
--- a/@market/modules/V3Ask/update/PrivateAskUpdate.tsx
+++ b/@market/modules/V3Ask/update/PrivateAskUpdate.tsx
@@ -5,7 +5,6 @@ import React, { useEffect } from 'react'
 import { BigNumber } from '@ethersproject/bignumber'
 import { parseUnits } from '@ethersproject/units'
 import { TransactionSubmitButton } from '@market/components/TransactionSubmitButton'
-import { useAskHelper } from '@market/hooks/useAskHelper'
 import { useRelevantMarket } from '@market/hooks/useRelevantMarket'
 import { PrintError } from '@shared/components/PrintError'
 import { formatContractError } from '@shared/utils'
@@ -42,17 +41,22 @@ const validate = (values: Values) => {
   return errors
 }
 
-export function PrivateAskUpdate({ onNext, ...props }: PrivateAskUpdateProps) {
-  const { nft } = props
-  const { markets } = nft
-  const { ask } = useRelevantMarket(markets)
-  const { buyerAddress } = useAskHelper({ ask })
+export function PrivateAskUpdate({
+  onNext,
+  tokenId,
+  contractAddress,
+  markets,
+  ...props
+}: PrivateAskUpdateProps) {
+  const { ask, buyerAddress } = useRelevantMarket(markets)
   const { txStatus, txInProgress, txError, finalizedTx, updateAsk } = useV3AskTransaction(
-    { nft: nft, askType: PRIVATE_ASK }
+    { contractAddress, tokenId, askType: PRIVATE_ASK }
   )
 
   useEffect(() => finalizedTx!! && onNext && onNext(), [finalizedTx, onNext])
 
+  if (!buyerAddress) return null
+
   return (
     <Formik
       initialValues={{ amount: '' }}
diff --git a/@market/modules/V3Ask/update/V3AskUpdate.tsx b/@market/modules/V3Ask/update/V3AskUpdate.tsx
index a27fae4c..c1e37d0d 100644
--- a/@market/modules/V3Ask/update/V3AskUpdate.tsx
+++ b/@market/modules/V3Ask/update/V3AskUpdate.tsx
@@ -40,9 +40,9 @@ const validate = (values: Values) => {
 }
 
 export function V3AskUpdate({ onNext, ...props }: V3AskUpdateProps) {
-  const { nft } = props
+  const { contractAddress, tokenId } = props
   const { txStatus, txInProgress, txError, finalizedTx, updateAsk } = useV3AskTransaction(
-    { nft: nft }
+    { contractAddress, tokenId }
   )
 
   useEffect(() => finalizedTx!! && onNext && onNext(), [finalizedTx, onNext])
diff --git a/@market/modules/V3Ask/update/V3AskUpdateSuccess.tsx b/@market/modules/V3Ask/update/V3AskUpdateSuccess.tsx
index c49b05ef..e85409de 100644
--- a/@market/modules/V3Ask/update/V3AskUpdateSuccess.tsx
+++ b/@market/modules/V3Ask/update/V3AskUpdateSuccess.tsx
@@ -12,7 +12,7 @@ import { useV3AskStateContext } from '../providers'
 
 interface V3AskCreateSuccessProps extends CommonV3AskComponentProps {}
 
-export function V3AskUpdateSuccess({ nft, onNext, ...props }: V3AskCreateSuccessProps) {
+export function V3AskUpdateSuccess({ onNext, ...props }: V3AskCreateSuccessProps) {
   const { state } = useV3AskStateContext()
   const heading = useMemo(
     () => (state.flow === PRIVATE_ASK ? 'Private Listing Updated' : 'Listing Updated'),
diff --git a/@market/modules/V3Ask/view/V3AskViewListing.tsx b/@market/modules/V3Ask/view/V3AskViewListing.tsx
index 788773c0..7493ad87 100644
--- a/@market/modules/V3Ask/view/V3AskViewListing.tsx
+++ b/@market/modules/V3Ask/view/V3AskViewListing.tsx
@@ -14,9 +14,18 @@ import { useFormattedV3AskInfo } from '../hooks'
 
 interface V3AskFillAskSuccessProps extends CommonV3AskComponentProps {}
 
-export function V3AskViewListing({ nft, ...props }: V3AskFillAskSuccessProps) {
+export function V3AskViewListing({
+  contractAddress,
+  tokenId,
+  markets,
+  ...props
+}: V3AskFillAskSuccessProps) {
   const { requestClose } = useModal()
-  const { formattedAskDetails, copyableValue } = useFormattedV3AskInfo({ nft })
+  const { formattedAskDetails, copyableValue } = useFormattedV3AskInfo({
+    markets,
+    contractAddress,
+    tokenId,
+  })
 
   const [_, copied, copy] = useCopyToClipboard(copyableValue)
   const { toastDispatch } = useToast()
@@ -36,7 +45,7 @@ export function V3AskViewListing({ nft, ...props }: V3AskFillAskSuccessProps) {
 
   return (
     <>
-      <Stack gap="x8">
+      <Stack gap="x8" {...props}>
         <Heading as="h2">Private Listing Data</Heading>
 
         {formattedAskDetails && <DataTable items={formattedAskDetails} />}
diff --git a/@market/providers/NftMarketContextProvider.tsx b/@market/providers/NftMarketContextProvider.tsx
new file mode 100644
index 00000000..fa6378d6
--- /dev/null
+++ b/@market/providers/NftMarketContextProvider.tsx
@@ -0,0 +1,14 @@
+import { createContext, useContext } from 'react'
+import { TypeSafeMarket } from 'validators/market'
+
+type NftMarketContextType = {
+  tokenId: string
+  collectionAddress: string
+  collectionName: string
+  markets: TypeSafeMarket[]
+}
+
+export const NftMarketContext = createContext<NftMarketContextType>(
+  {} as NftMarketContextType
+)
+export const useNftMarketContext = () => useContext(NftMarketContext)
diff --git a/@media/ImageWithNounFallback.tsx b/@media/ImageWithNounFallback.tsx
new file mode 100644
index 00000000..2e93e56b
--- /dev/null
+++ b/@media/ImageWithNounFallback.tsx
@@ -0,0 +1,52 @@
+import { ImageElement } from 'components'
+
+import { useMemo } from 'react'
+
+import { useRawImageTransform } from '@media/hooks/useRawImageTransform'
+import { FallbackThumbnail } from '@noun-auction'
+
+type ImageWithFallbackProps = {
+  collectionAddress: string
+  tokenId: string
+  image: any // very bad type from api, FIXME later
+}
+
+export function ImageWithNounFallback({
+  collectionAddress,
+  tokenId,
+  image,
+}: ImageWithFallbackProps) {
+  const { image: rawImageFallback } = useRawImageTransform(image?.url ?? undefined)
+
+  const decodedImgSrc = useMemo(() => {
+    const imageUrl = image?.url
+    if (image?.mimeType === 'image/svg+xml') {
+      return imageUrl?.includes('data:image/svg+xml') ||
+        imageUrl?.includes('https://api.zora.co')
+        ? imageUrl
+        : `data:image/svg+xml,${imageUrl}` // proper handling of URI-encoded SVG
+    } else {
+      return image?.mediaEncoding?.poster ?? imageUrl
+    }
+  }, [image])
+
+  const srcImg = useMemo(
+    () => decodedImgSrc ?? rawImageFallback,
+    [decodedImgSrc, rawImageFallback]
+  )
+
+  if (srcImg) {
+    return (
+      <ImageElement
+        src={srcImg}
+        w="100%"
+        h="100%"
+        position="absolute"
+        inset="x0"
+        objectFit="cover"
+      />
+    )
+  }
+
+  return <FallbackThumbnail tokenContract={collectionAddress} tokenId={tokenId} />
+}
diff --git a/@media/NFTCard/NFTCard.tsx b/@media/NFTCard/NFTCard.tsx
index dc7a7b68..b325a72c 100644
--- a/@media/NFTCard/NFTCard.tsx
+++ b/@media/NFTCard/NFTCard.tsx
@@ -4,9 +4,11 @@ import { Link } from 'components/Link'
 import { useToken } from 'hooks/useToken'
 
 import { useMemo } from 'react'
+import { TypeSafeMarket } from 'validators/market'
 import { TypeSafeToken } from 'validators/token'
 
 import { NFTCardMarket } from '@market'
+import { NftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { CollectionThumbnail } from '@media/CollectionThumbnail'
 import {
   cardImageWrapper,
@@ -15,7 +17,8 @@ import {
   titleScroll,
   titleWrapper,
 } from '@media/NftMedia.css'
-import { useNFTProvider } from '@shared'
+import { useIsOwner, useNFTProvider } from '@shared'
+import { NFTObject } from '@zoralabs/nft-hooks'
 import { Box, Flex, Heading, Label, Separator, Stack } from '@zoralabs/zord'
 
 type Props = {
@@ -28,24 +31,42 @@ export function NFTCard({ collectionAddress }: Props) {
 
   if (!tokenId || !collectionAddress) return null
 
-  return <NFTCardOuterComponent tokenId={tokenId} collectionAddress={collectionAddress} />
+  return (
+    <NFTCardOuterComponent
+      nft={nft}
+      tokenId={tokenId}
+      collectionAddress={collectionAddress}
+    />
+  )
 }
 
 export function NFTCardOuterComponent({
   collectionAddress,
   tokenId,
-}: Props & { tokenId: string }) {
-  const { token } = useToken({ collectionAddress, tokenId })
+  nft,
+}: Props & { tokenId: string; nft: NFTObject }) {
+  const { token, markets } = useToken({ collectionAddress, tokenId })
 
   if (!token || !collectionAddress) return null
 
-  return <NFTCardComponent token={token} collectionAddress={collectionAddress} />
+  return (
+    <NFTCardComponent
+      markets={markets}
+      token={token}
+      collectionAddress={collectionAddress}
+    />
+  )
 }
 
 export function NFTCardComponent({
   collectionAddress,
   token,
-}: Props & { token: TypeSafeToken }) {
+  markets,
+}: Props & {
+  token: TypeSafeToken
+  markets: TypeSafeMarket[]
+}) {
+  const { isOwner } = useIsOwner(token)
   const fallbackTitle = token.collectionName ?? '..'
   const tokenId = token.tokenId
 
@@ -57,7 +78,7 @@ export function NFTCardComponent({
 
   return (
     <Stack w="100%" position="relative" overflow="hidden" className={cardWrapper}>
-      <Link href={`/collections/${collectionAddress}/${tokenId}`}>
+      <Link href={`/daos/${collectionAddress}/${tokenId}`}>
         <Box w="100%" className={cardImageWrapper} backgroundColor="background2">
           {collectionAddress && tokenId && <ImageWithNounFallback token={token} />}
         </Box>
@@ -75,7 +96,7 @@ export function NFTCardComponent({
           </Heading>
         </Flex>
         <Flex align="center" gap="x2" justify="space-between">
-          <Link href={`/collections/${collectionAddress}`}>
+          <Link href={`/daos/${collectionAddress}`}>
             <Flex align="center" gap="x2">
               <CollectionThumbnail
                 collectionAddress={collectionAddress}
@@ -89,7 +110,16 @@ export function NFTCardComponent({
           </Link>
         </Flex>
         <Separator mt="x1" />
-        <NFTCardMarket />
+        <NftMarketContext.Provider
+          value={{
+            tokenId: tokenId,
+            collectionAddress: token.collectionAddress,
+            collectionName: token.collectionName ?? '..',
+            markets: markets,
+          }}
+        >
+          <NFTCardMarket ownerAddress={token.owner} isOwner={isOwner} />
+        </NftMarketContext.Provider>
       </Stack>
     </Stack>
   )
diff --git a/@media/NFTCard2/NFTCard2.tsx b/@media/NFTCard2/NFTCard2.tsx
new file mode 100644
index 00000000..d60dcce6
--- /dev/null
+++ b/@media/NFTCard2/NFTCard2.tsx
@@ -0,0 +1,101 @@
+import { Link } from 'components/Link'
+import { NounsTokensByOwnerAddressQuery } from 'types/zora.api.generated'
+
+import { useMemo } from 'react'
+import { TypeSafeMarket } from 'validators/market'
+
+import { NFTCardMarket } from '@market'
+import { NftMarketContext } from '@market/providers/NftMarketContextProvider'
+import { CollectionThumbnail } from '@media/CollectionThumbnail'
+import {
+  cardImageWrapper,
+  cardWrapper,
+  titleHeading,
+  titleScroll,
+  titleWrapper,
+} from '@media/NftMedia.css'
+import { Box, Flex, Heading, Separator, Stack } from '@zoralabs/zord'
+
+import { ImageWithNounFallback } from '../ImageWithNounFallback'
+
+type ImageType = NounsTokensByOwnerAddressQuery['tokens']['nodes'][0]['token']['image']
+type Props = {
+  collectionAddress: string
+  tokenId: string
+  collectionName?: string
+  tokenName?: string
+  // optionally set this as flag for /manage page (where we know for sure that user is owner)
+  isOwner?: boolean
+  image: ImageType
+  ownerAddress?: string
+  markets: TypeSafeMarket[]
+}
+
+export function NFTCard2({
+  collectionAddress,
+  collectionName,
+  tokenId,
+  isOwner,
+  tokenName,
+  image,
+  ownerAddress,
+  markets,
+}: Props) {
+  const fallbackTitle = `${collectionName} #${tokenId}` ?? '..'
+
+  const useTitleScroll = useMemo(() => {
+    if (tokenName) {
+      return tokenName.split('').length > 25
+    }
+  }, [tokenName])
+
+  return (
+    <Stack w="100%" position="relative" overflow="hidden" className={cardWrapper}>
+      <Link href={`/collections/${collectionAddress}/${tokenId}`}>
+        <Box w="100%" className={cardImageWrapper} backgroundColor="background2">
+          <ImageWithNounFallback
+            collectionAddress={collectionAddress}
+            tokenId={tokenId}
+            image={image}
+          />
+        </Box>
+      </Link>
+      <Stack gap="x2" px="x4" py="x4" flex={1}>
+        <Flex
+          className={[titleWrapper, useTitleScroll && titleScroll]}
+          style={{
+            /* @ts-ignore-next-line */
+            '--titlePad': titleScroll ? '40px' : '0px',
+          }}
+        >
+          <Heading as="h4" size="sm" className={titleHeading}>
+            {fallbackTitle}
+          </Heading>
+        </Flex>
+        <Flex align="center" gap="x2" justify="space-between">
+          <Link href={`/collections/${collectionAddress}`}>
+            <Flex align="center" gap="x2">
+              <CollectionThumbnail
+                collectionAddress={collectionAddress}
+                radius="round"
+                size="xs"
+              />
+              <Heading size="xs">{collectionName}</Heading>
+            </Flex>
+          </Link>
+        </Flex>
+        <Separator mt="x1" />
+        <NftMarketContext.Provider
+          value={{
+            tokenId,
+            collectionAddress,
+            markets,
+            collectionName: collectionName ?? '..',
+          }}
+        >
+          <NFTCardMarket ownerAddress={ownerAddress} isOwner={isOwner} />
+        </NftMarketContext.Provider>
+      </Stack>
+    </Stack>
+  )
+}
diff --git a/@media/NFTCard2/index.ts b/@media/NFTCard2/index.ts
new file mode 100644
index 00000000..2ed71bb7
--- /dev/null
+++ b/@media/NFTCard2/index.ts
@@ -0,0 +1 @@
+export * from './NFTCard2'
diff --git a/@media/NFTGrid2/NFTGrid2.css.ts b/@media/NFTGrid2/NFTGrid2.css.ts
new file mode 100644
index 00000000..9931e3b4
--- /dev/null
+++ b/@media/NFTGrid2/NFTGrid2.css.ts
@@ -0,0 +1,11 @@
+import { MAX_WIDTH } from 'styles/style-constants'
+
+import { style } from '@vanilla-extract/css'
+
+export const nftPageWrapper = style([
+  {
+    width: '100%',
+    maxWidth: MAX_WIDTH.XL,
+    margin: '0 auto',
+  },
+])
diff --git a/@media/NFTGrid2/NFTGrid2.tsx b/@media/NFTGrid2/NFTGrid2.tsx
new file mode 100644
index 00000000..bdec1aba
--- /dev/null
+++ b/@media/NFTGrid2/NFTGrid2.tsx
@@ -0,0 +1,42 @@
+import { TokenWithMarketsSummary } from 'types/zora.api.generated'
+
+import { NFTCard2 } from '@media/NFTCard2'
+import { Grid, GridProps, Stack } from '@zoralabs/zord'
+
+import { nftPageWrapper } from './NFTGrid2.css'
+
+export interface NFTGridProps extends GridProps {
+  items: TokenWithMarketsSummary[]
+  // allows skip computation of isOwner, when we know for sure
+  isOwner?: boolean
+  handleLoadMore?: () => void
+  isReachingEnd?: boolean
+  isValidating?: boolean
+}
+
+export function NFTGrid2({ items, ...props }: NFTGridProps) {
+  return (
+    <Stack className={nftPageWrapper} gap="x14" pb="x10">
+      <Grid {...props} p="x0">
+        {(items ?? []).map((nft) => {
+          const { collectionAddress, tokenId, collectionName, name, owner, image } =
+            nft.token
+
+          return (
+            <NFTCard2
+              isOwner={props.isOwner}
+              ownerAddress={owner ?? undefined}
+              key={`${collectionAddress}-${tokenId}`}
+              tokenId={tokenId}
+              collectionAddress={collectionAddress}
+              collectionName={collectionName ?? '..'}
+              tokenName={name ?? '..'}
+              image={image ?? null}
+              markets={nft.marketsSummary}
+            />
+          )
+        })}
+      </Grid>
+    </Stack>
+  )
+}
diff --git a/@media/NFTGrid2/index.ts b/@media/NFTGrid2/index.ts
new file mode 100644
index 00000000..090a09a8
--- /dev/null
+++ b/@media/NFTGrid2/index.ts
@@ -0,0 +1 @@
+export * from './NFTGrid2'
diff --git a/@noun-auction/components/ActiveAuction/RPCTokenInfo.tsx b/@noun-auction/components/ActiveAuction/RPCTokenInfo.tsx
index d6e1dba2..3b12fe8d 100644
--- a/@noun-auction/components/ActiveAuction/RPCTokenInfo.tsx
+++ b/@noun-auction/components/ActiveAuction/RPCTokenInfo.tsx
@@ -26,7 +26,7 @@ export function RPCTokenInfo({
 }: RPCTokenInfoProps) {
   return (
     <Flex className={['nounish-auction__token-info', styles.tokenInfoWrapper]} {...props}>
-      <NextLink href={`/collections/${collectionAddress}/${tokenId}`} passHref>
+      <NextLink href={`/daos/${collectionAddress}/${tokenId}`} passHref>
         <Button as="a" variant="unset" className={styles.thumbnailLink}>
           {!!tokenId && !!collectionAddress && (
             <NounishThumbnail
@@ -40,13 +40,13 @@ export function RPCTokenInfo({
       <Stack justify="space-around">
         <Box>
           <Box className={styles.rowCollectionName}>
-            <Link href={`/collections/${collectionAddress}`} passHref>
+            <Link href={`/daos/${collectionAddress}`} passHref>
               {tokenName ?? '...'}
             </Link>
           </Box>
           <Box mt="x1">
             <Label as="a" color="tertiary" className={[lightFont]}>
-              <Link href={`/collections/${collectionAddress}`} passHref>
+              <Link href={`/daos/${collectionAddress}`} passHref>
                 {collectionName ?? '...'}
               </Link>
             </Label>
diff --git a/@noun-auction/components/ActiveAuctionCard.tsx b/@noun-auction/components/ActiveAuctionCard.tsx
index 2d75cab7..dd68d417 100644
--- a/@noun-auction/components/ActiveAuctionCard.tsx
+++ b/@noun-auction/components/ActiveAuctionCard.tsx
@@ -83,7 +83,7 @@ export function ActiveAuctionCardComponent({
       className={cardWrapper}
       style={{ maxWidth: '500px' }}
     >
-      <Link href={`/collections/${collectionAddress}/${tokenId}`}>
+      <Link href={`/daos/${collectionAddress}/${tokenId}`}>
         <Box w="100%" className={cardImageWrapper} backgroundColor="tertiary">
           <ImageWithNounFallback token={token} />
         </Box>
diff --git a/@shared/components/CollectionLink.tsx b/@shared/components/CollectionLink.tsx
index 7a2dc9ce..30683926 100644
--- a/@shared/components/CollectionLink.tsx
+++ b/@shared/components/CollectionLink.tsx
@@ -16,7 +16,7 @@ export function CollectionLink({
   ...props
 }: CollectionLinkProps) {
   return (
-    <NextLink passHref href={`/collections/${contractAddress}`}>
+    <NextLink passHref href={`/daos/${contractAddress}`}>
       <Button as="a" {...props}>
         {children}
       </Button>
diff --git a/@shared/components/PriceWithLabel/PriceWithLabel.tsx b/@shared/components/PriceWithLabel/PriceWithLabel.tsx
index e6d9ad9d..6c3ba93f 100644
--- a/@shared/components/PriceWithLabel/PriceWithLabel.tsx
+++ b/@shared/components/PriceWithLabel/PriceWithLabel.tsx
@@ -2,13 +2,13 @@ import { mediumFont } from 'styles/styles.css'
 
 import React from 'react'
 
-import { Eyebrow, Heading, Label, Stack } from '@zoralabs/zord'
+import { Eyebrow, Heading, Stack } from '@zoralabs/zord'
 
 export interface PriceWithLabelProps {
-  cryptoAmount: string
+  cryptoAmount: string | number
+  usdAmount?: string | number
   symbol: string
   label?: string
-  usdAmount?: string
   invertColor?: boolean
 }
 
diff --git a/@shared/hooks/useTokenHelper.ts b/@shared/hooks/useTokenHelper.ts
index 3414eb84..a3206f0d 100644
--- a/@shared/hooks/useTokenHelper.ts
+++ b/@shared/hooks/useTokenHelper.ts
@@ -33,12 +33,12 @@ export function useTokenHelper(nftObj: NFTObject) {
   }, [nftCount, tokenID, isFirstTokenIDZero])
 
   const handlePrev = useCallback(() => {
-    tokenID && router.push(`/collections/${nft?.contract.address}/${tokenID - 1}`)
+    tokenID && router.push(`/daos/${nft?.contract.address}/${tokenID - 1}`)
   }, [nft?.contract.address, tokenID, router])
 
   const handleNext = useCallback(() => {
     if (hasNextNFT) {
-      tokenID && router.push(`/collections/${nft?.contract.address}/${tokenID + 1}`)
+      tokenID && router.push(`/daos/${nft?.contract.address}/${tokenID + 1}`)
     }
   }, [hasNextNFT, tokenID, router, nft?.contract.address])
 
diff --git a/@shared/utils/zoraApiFetcher.ts b/@shared/utils/zoraApiFetcher.ts
index 38a0441f..3c4d9642 100644
--- a/@shared/utils/zoraApiFetcher.ts
+++ b/@shared/utils/zoraApiFetcher.ts
@@ -4,14 +4,13 @@ import * as Sentry from '@sentry/react'
 
 import { client } from './gqlClient'
 
-export async function zoraApiFetcher(query: DocumentNode, providedVariables?: any) {
+export async function zoraApiFetcher<T>(query: DocumentNode, providedVariables?: any) {
   let variables = {
     network: { chain: 'MAINNET', network: 'ETHEREUM' },
     ...providedVariables,
   }
 
   try {
-    // FIXME @oleg: type
     const response = await client.request(query, variables)
     return response
   } catch (err) {
diff --git a/components/HomepageExplore.tsx b/components/HomepageExplore.tsx
index 7e704f57..527bfbe7 100644
--- a/components/HomepageExplore.tsx
+++ b/components/HomepageExplore.tsx
@@ -5,7 +5,7 @@ import { Link } from './Link'
 export function HomepageExplore() {
   return (
     <Flex w="100%" justify="center">
-      <Link href="/collections">
+      <Link href="/daos">
         <Flex
           align="center"
           borderRadius="curved"
diff --git a/components/utils/CollectionsTest.tsx b/components/utils/CollectionsTest.tsx
deleted file mode 100644
index d2fbdfc9..00000000
--- a/components/utils/CollectionsTest.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useEffect } from 'react'
-
-import { Filter, useCollectionFilters } from '@filter'
-
-import { NFTGridTestData } from './NFTGridTestData'
-
-export function CollectionsTest({ collectionAddress }: { collectionAddress?: string }) {
-  const {
-    filterStore: { clearFilters },
-    items,
-    isValidating,
-    isReachingEnd,
-    handleLoadMore,
-  } = useCollectionFilters()
-
-  useEffect(() => {
-    clearFilters()
-  }, [collectionAddress, clearFilters])
-
-  return (
-    <Filter>
-      <NFTGridTestData
-        items={items}
-        handleLoadMore={handleLoadMore}
-        isReachingEnd={isReachingEnd}
-        isValidating={isValidating}
-      />
-    </Filter>
-  )
-}
diff --git a/components/utils/NFTGridTestData.tsx b/components/utils/NFTGridTestData.tsx
deleted file mode 100644
index f62d0131..00000000
--- a/components/utils/NFTGridTestData.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Link } from 'components/Link'
-
-import { NFTGridLoadMore } from '@media/NFTGrid/NFTGridLoadMore'
-import { nftGridWrapper } from '@media/NftMedia.css'
-import { NFTObject } from '@zoralabs/nft-hooks/dist/types/NFTInterface'
-import { Flex, Grid, Heading, Icon, Label, Stack } from '@zoralabs/zord'
-
-import { RawDisplayer } from './RawDisplayer'
-
-export type NFTGridProps = {
-  items: NFTObject[]
-  isValidating: boolean
-  isReachingEnd: boolean | undefined
-  handleLoadMore?: () => void
-}
-
-export function NFTGridTestData({
-  items,
-  isValidating,
-  isReachingEnd,
-  handleLoadMore,
-}: NFTGridProps) {
-  return (
-    <>
-      <Stack gap="x14" pb="x10">
-        <Grid gap="x4" className={nftGridWrapper}>
-          {items.map((nft) => (
-            <Stack
-              w="100%"
-              overflowX="scroll"
-              key={`${nft?.nft?.contract.address}-${nft?.nft?.tokenId}`}
-            >
-              <Stack>
-                <Link
-                  href={`/test/collections/${nft?.nft?.contract.address}/${nft?.nft?.tokenId}`}
-                >
-                  <Label>
-                    {nft.nft?.contract.name}: {nft.nft?.tokenId}
-                  </Label>
-                  <Flex align="center" justify="space-between">
-                    <Heading size="xs">
-                      NAME: {nft.metadata?.name ? nft.metadata?.name : 'undefined'}
-                    </Heading>
-                    <Icon size="md" id="ArrowRight" />
-                  </Flex>
-                </Link>
-              </Stack>
-              <RawDisplayer data={nft} />
-            </Stack>
-          ))}
-        </Grid>
-      </Stack>
-      {!isReachingEnd && (
-        <NFTGridLoadMore
-          showObserver={true}
-          isValidating={isValidating}
-          handleLoadMore={handleLoadMore}
-        />
-      )}
-    </>
-  )
-}
diff --git a/components/utils/index.ts b/components/utils/index.ts
index facb5666..f1643ba4 100644
--- a/components/utils/index.ts
+++ b/components/utils/index.ts
@@ -1,6 +1,4 @@
 export * from './RawDisplayer'
-export * from './CollectionsTest'
-export * from './NFTGridTestData'
 export * from './MDXComponents'
 export * from './DocsPageWrapper'
 export * from './UtilStyles.css'
diff --git a/compositions/CollectionMenu/CollectionLink.tsx b/compositions/CollectionMenu/CollectionLink.tsx
index a201c9a5..5a0032a6 100644
--- a/compositions/CollectionMenu/CollectionLink.tsx
+++ b/compositions/CollectionMenu/CollectionLink.tsx
@@ -18,7 +18,7 @@ export function CollectionLink({ collection }: { collection: TypeSafeDao }) {
   const { isSmall } = useWindowWidth()
 
   return (
-    <Link href={`/collections/${collection.collectionAddress}`} passHref>
+    <Link href={`/daos/${collection.collectionAddress}`} passHref>
       <Flex align="center" justify="space-between" gap="x4" onClick={requestClose}>
         <Flex align="center" gap="x4">
           <CollectionThumbnail
diff --git a/compositions/CollectionRanking/CollectionRanking.tsx b/compositions/CollectionRanking/CollectionRanking.tsx
index 84a41be5..a4cb8f74 100644
--- a/compositions/CollectionRanking/CollectionRanking.tsx
+++ b/compositions/CollectionRanking/CollectionRanking.tsx
@@ -1,5 +1,6 @@
 import { CollectionDescriptionModal } from 'modals'
 import { CollectionParsed } from 'pages'
+import { Collection } from 'types/zora.api.generated'
 
 import { useMemo } from 'react'
 
@@ -39,9 +40,15 @@ export function CollectionRanking({
             '@1024': 'x6',
           }}
         >
-          {(collections ?? []).map((collection) => (
-            <RankingRow key={collection.address} collection={collection} />
-          ))}
+          {(collections ?? []).map(
+            (collection) =>
+              collection && (
+                <RankingRow
+                  key={collection.address}
+                  collection={collection as Collection}
+                />
+              )
+          )}
         </Stack>
       )}
     </Stack>
diff --git a/compositions/CollectionRanking/RankingRow.tsx b/compositions/CollectionRanking/RankingRow.tsx
index 40d7bce2..5ed27b95 100644
--- a/compositions/CollectionRanking/RankingRow.tsx
+++ b/compositions/CollectionRanking/RankingRow.tsx
@@ -1,4 +1,5 @@
 import { Link } from 'components/Link'
+import { Collection } from 'types/zora.api.generated'
 
 import { useAggregate } from 'hooks'
 
@@ -6,7 +7,6 @@ import { useMemo } from 'react'
 
 import { CollectionThumbnail } from '@media/CollectionThumbnail'
 import { CollectionLink, numberFormatter, roundTwoDecimals } from '@shared'
-import { Collection } from '@zoralabs/zdk/dist/queries/queries-sdk'
 import { Flex, Grid, Label, Stack, StackProps } from '@zoralabs/zord'
 
 import {
@@ -34,7 +34,7 @@ export function RankingRow({ collection, ...props }: RankingRowProps) {
 
   return (
     <Stack {...props}>
-      <Link href={`/collections/${collection.address}`} passHref>
+      <Link href={`/daos/${collection.address}`} passHref>
         <Grid className={[rankingRow]}>
           <Flex className={[rankingRowInfo, 'collection-row__collection-info']}>
             <CollectionThumbnail
diff --git a/compositions/Collections/CollectionNFTs.tsx b/compositions/Collections/CollectionNFTs.tsx
index 5e389b79..dab00c11 100644
--- a/compositions/Collections/CollectionNFTs.tsx
+++ b/compositions/Collections/CollectionNFTs.tsx
@@ -1,11 +1,10 @@
 import { Collections } from 'compositions/Collections'
-import { CollectionServiceProps } from 'services/collectionService'
+import { Collection } from 'types/zora.api.generated'
 
 import React from 'react'
 
 import { CollectionFilterProvider } from '@filter'
 import { useWindowWidth } from '@shared'
-import { Collection } from '@zoralabs/zdk/dist/queries/queries-sdk'
 import { GridProps } from '@zoralabs/zord'
 
 export interface CollectionAboutProps extends GridProps {
@@ -14,7 +13,7 @@ export interface CollectionAboutProps extends GridProps {
   currentAuction?: JSX.Element | null
 }
 
-export const CollectionNFTs = ({ fallback }: { fallback: CollectionServiceProps }) => {
+export const CollectionNFTs = ({ fallback }: { fallback: any }) => {
   const { contractAddress: collectionAddress, collection, initialPage } = fallback
   const { isLarge } = useWindowWidth()
 
diff --git a/compositions/Collections/Collections.tsx b/compositions/Collections/Collections.tsx
index 7390d8a1..0895a5eb 100644
--- a/compositions/Collections/Collections.tsx
+++ b/compositions/Collections/Collections.tsx
@@ -17,6 +17,8 @@ export function Collections({
 }: CollectionsProps) {
   const { items, isValidating, isReachingEnd, handleLoadMore } = useCollectionFilters()
 
+  console.log('items', items)
+
   const gridProps = useMemo(() => {
     return {
       items,
diff --git a/compositions/Collections/DaoGrid.tsx b/compositions/Collections/DaoGrid.tsx
index 1b1dbd6f..8e55e655 100644
--- a/compositions/Collections/DaoGrid.tsx
+++ b/compositions/Collections/DaoGrid.tsx
@@ -1,13 +1,15 @@
+import { TokenWithMarketsSummary } from 'types/zora.api.generated'
+
 import { useMemo } from 'react'
 
 import { Filter } from '@filter'
-import { NFTCard, NFTGrid } from '@media'
+import { NFTCard } from '@media'
+import { NFTGrid2 } from '@media/NFTGrid2'
 import { nftGridWrapper } from '@media/NftMedia.css'
-import { NFTObject } from '@zoralabs/nft-hooks'
 
 type DaoGridProps = {
   collectionAddress: string
-  items: NFTObject[]
+  items: TokenWithMarketsSummary[]
   isValidating: boolean
   isReachingEnd?: boolean
   handleLoadMore?: () => void
@@ -22,37 +24,18 @@ export function DaoGrid({
   handleLoadMore,
   collectionAddress,
 }: DaoGridProps) {
-  // const { activeAuction } = useNounishAuctionQuery({
-  //   collectionAddress,
-  // })
-
   const renderer = useMemo(() => {
-    // if (!activeAuction?.tokenId) return <></>
-
-    // return view === 'nfts' || !activeAuction?.tokenId ? (
     return <NFTCard collectionAddress={collectionAddress} />
-    // ) : (
-    //   <NounishActivityRow
-    //     collectionAddress={collectionAddress}
-    //     tokenId={activeAuction?.tokenId}
-    //   />
-    // )
-  }, [
-    collectionAddress,
-    // activeAuction?.tokenId,
-    //  view
-  ])
+  }, [collectionAddress])
 
   return (
     <Filter className="dao-filter">
-      <NFTGrid
+      <NFTGrid2
         items={items}
         handleLoadMore={handleLoadMore}
         isReachingEnd={isReachingEnd}
         isValidating={isValidating}
-        nftRenderer={renderer}
         className={nftGridWrapper({
-          // layout: view === 'nfts' ? 'grid' : 'activityRows',
           layout: 'grid',
         })}
       />
diff --git a/compositions/Daos/DaoRow.tsx b/compositions/Daos/DaoRow.tsx
index 518e739e..3415a026 100644
--- a/compositions/Daos/DaoRow.tsx
+++ b/compositions/Daos/DaoRow.tsx
@@ -29,7 +29,6 @@ export const DaoRow = ({ dao, index }: { dao: TypeSafeDao; index: number }) => {
 
   const { token } = useToken({
     collectionAddress: dao.collectionAddress,
-    // FIXME: @oleg
     tokenId: activeAuction?.tokenId ?? '',
   })
 
@@ -48,6 +47,7 @@ export const DaoRow = ({ dao, index }: { dao: TypeSafeDao; index: number }) => {
       tokenId={tokenId}
       tokenName={token.name}
       collectionAddress={collectionAddress}
+      contractAddress={dao.contractAddress}
       collectionName={dao.name ?? token.collectionName ?? '...'}
       highestBid={highestBid}
       treasuryAddress={dao.treasuryAddress}
@@ -67,11 +67,13 @@ type DaoRowProps = {
   highestBid: string
   treasuryAddress: string
   auctionStatus: string
+  contractAddress: string
 }
 
 export const DaoRowComponent = ({
   index,
   collectionAddress,
+  contractAddress,
   tokenId,
   tokenImage,
   tokenName,
@@ -99,7 +101,7 @@ export const DaoRowComponent = ({
             cursor="pointer"
           />
           <Box>
-            <Link href={`/collections/${collectionAddress}`} passHref>
+            <Link href={`/daos/${collectionAddress}`} passHref>
               <Button variant="secondary" as="a">
                 View
               </Button>
@@ -158,7 +160,7 @@ export const DaoRowComponent = ({
           <EthAmount ethAmount={highestBid} />
         </Box>
       </Box>
-      <Link href={`/collections/${collectionAddress}`} passHref>
+      <Link href={`/daos/${collectionAddress}`} passHref>
         <Button variant="secondary" as="a">
           View
         </Button>
diff --git a/compositions/Daos/Daos.tsx b/compositions/Daos/Daos.tsx
index a839c563..40da8f9a 100644
--- a/compositions/Daos/Daos.tsx
+++ b/compositions/Daos/Daos.tsx
@@ -26,6 +26,9 @@ interface DaoTableProps extends StackProps {
 
 export function DaoTable({ routePrefix, className, daos, ...props }: DaoTableProps) {
   const { isLarge } = useWindowWidth()
+
+  console.log(daos)
+
   return (
     <Stack className={[daosWrapper, className]} {...props}>
       <Flex gap="x2" align="center">
diff --git a/compositions/NFTPage/NFTMarket.tsx b/compositions/NFTPage/NFTMarket.tsx
index e0b92bda..83407896 100644
--- a/compositions/NFTPage/NFTMarket.tsx
+++ b/compositions/NFTPage/NFTMarket.tsx
@@ -1,84 +1,87 @@
 import { OffchainOrderWithToken } from 'types/zora.api.generated'
 
-import { useMemo } from 'react'
 import { TypeSafeNounsAuction } from 'validators/auction'
+import { TypeSafeMarket } from 'validators/market'
 
-import { NFTPrimaryAuction } from '@market'
+import { NFTPrimaryAuction, NFTPrimaryAuctionActive } from '@market'
 import { NFTAsks } from '@market/components/NFTAsks'
 import { useNounishAuctionHelper } from '@market/hooks/useNounishAuctionHelper'
-import { useNounishAuctionQuery } from '@noun-auction'
-import { useNFTProvider } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
+import { useNftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { BoxProps } from '@zoralabs/zord'
 
 import { nftMarketWrapper } from './NFTPage.css'
 
 interface NFTMarketProps extends BoxProps {
-  collectionAddress: string
   offchainOrders?: OffchainOrderWithToken[]
+  isOwner: boolean
+  isActiveAuctionToken: boolean
+  activeAuction?: TypeSafeNounsAuction
 }
 
 export function NFTMarket({
   offchainOrders,
   className,
-  collectionAddress,
+  isOwner,
+  isActiveAuctionToken,
+  activeAuction,
 }: NFTMarketProps) {
-  const { nft: nftObj } = useNFTProvider()
-  const { activeAuction } = useNounishAuctionQuery({
-    collectionAddress,
-  })
-  if (nftObj && activeAuction) {
+  const { tokenId, collectionAddress } = useNftMarketContext()
+
+  if (activeAuction) {
     return (
-      <NFTMarketComponent
-        className={className}
-        nftObj={nftObj}
+      <NFTAuctionMarket
         activeAuction={activeAuction}
-        offchainOrders={offchainOrders}
+        isActiveAuctionToken={isActiveAuctionToken}
+        tokenId={tokenId}
         collectionAddress={collectionAddress}
       />
     )
   }
 
-  return null
+  return (
+    <NFTAsks
+      isOwner={isOwner}
+      offchainOrders={offchainOrders}
+      className={[nftMarketWrapper, className]}
+      p="x4"
+      align="flex-start"
+      direction="column"
+    />
+  )
 }
 
-export function NFTMarketComponent({
-  offchainOrders,
-  className,
-  nftObj,
+const NFTAuctionMarket = ({
   activeAuction,
-}: NFTMarketProps & {
-  nftObj: NFTObject
+  isActiveAuctionToken,
+  tokenId,
+  collectionAddress,
+}: {
   activeAuction: TypeSafeNounsAuction
-}) {
-  const isActiveAuctionToken = useMemo(
-    () => activeAuction?.tokenId === nftObj?.nft?.tokenId,
-    [nftObj?.nft?.tokenId, activeAuction?.tokenId]
-  )
-
+  isActiveAuctionToken: boolean
+  tokenId: string
+  collectionAddress: string
+}) => {
   const { isClaimable } = useNounishAuctionHelper({
     auction: activeAuction,
   })
 
-  if (isActiveAuctionToken || isClaimable) {
+  if (isClaimable) {
     return (
       <NFTPrimaryAuction
-        nftObj={nftObj}
-        primaryAuction={activeAuction}
         isActiveAuctionToken={isActiveAuctionToken}
+        collectionAddress={collectionAddress}
+        tokenId={tokenId}
+        primaryAuction={activeAuction!}
       />
     )
   }
 
-  if (nftObj) {
+  if (isActiveAuctionToken) {
     return (
-      <NFTAsks
-        offchainOrders={offchainOrders}
-        className={[nftMarketWrapper, className]}
-        nftObj={nftObj}
-        p="x4"
-        align="flex-start"
-        direction="column"
+      <NFTPrimaryAuctionActive
+        collectionAddress={collectionAddress}
+        tokenId={tokenId}
+        primaryAuction={activeAuction}
       />
     )
   }
diff --git a/compositions/NFTPage/NFTOffchainOrders.tsx b/compositions/NFTPage/NFTOffchainOrders.tsx
index 389ee0b0..0339e8c5 100644
--- a/compositions/NFTPage/NFTOffchainOrders.tsx
+++ b/compositions/NFTPage/NFTOffchainOrders.tsx
@@ -1,16 +1,15 @@
 import { OffchainOrderWithToken } from 'types/zora.api.generated'
 
+import { TypeSafeMarket } from 'validators/market'
+
 import { PriceCards } from '@market/components/PriceCards'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import { Stack, StackProps } from '@zoralabs/zord'
 
 export interface NFTOffchainOrdersProps extends StackProps {
-  nft: NFTObject
   offchainOrders: OffchainOrderWithToken[]
 }
 
 export function NFTOffchainOrders({
-  nft,
   offchainOrders,
   className,
   ...props
@@ -21,7 +20,7 @@ export function NFTOffchainOrders({
   // so we aren't displaying orders that cannot be filled.
   return (
     <Stack className={[className]} {...props}>
-      <PriceCards nft={nft} offchainOrders={offchainOrders} />
+      <PriceCards offchainOrders={offchainOrders} />
     </Stack>
   )
 }
diff --git a/compositions/NFTPage/NFTSidebar.tsx b/compositions/NFTPage/NFTSidebar.tsx
index 6b1cf8fe..92bd7c65 100644
--- a/compositions/NFTPage/NFTSidebar.tsx
+++ b/compositions/NFTPage/NFTSidebar.tsx
@@ -5,7 +5,14 @@ import { OffchainOrderWithToken } from 'types/zora.api.generated'
 import { usePrimarySalePrice } from 'hooks/usePrimarySalePrice'
 import { useToken } from 'hooks/useToken'
 
+import { useMemo } from 'react'
+import { TypeSafeMarket } from 'validators/market'
+import { TypeSafeToken } from 'validators/token'
+
+import { NftMarketContext } from '@market/providers/NftMarketContextProvider'
 import { CollectionThumbnail } from '@media'
+import { useNounishAuctionQuery } from '@noun-auction'
+import { useIsOwner } from '@shared'
 import { DescriptionWithMaxLines } from '@shared/components'
 import { Flex, Heading, Stack, StackProps } from '@zoralabs/zord'
 
@@ -17,6 +24,8 @@ export interface NFTSidebarProps extends StackProps {
   collectionAddress: string
   tokenId: string
   offchainOrders?: OffchainOrderWithToken[]
+  token: TypeSafeToken
+  markets: TypeSafeMarket[]
 }
 
 export function NFTSidebar({
@@ -24,14 +33,18 @@ export function NFTSidebar({
   tokenId,
   offchainOrders,
   ...props
-}: NFTSidebarProps) {
-  if (!collectionAddress || !tokenId) return null
+}: Omit<NFTSidebarProps, 'token' | 'markets'>) {
+  const { token, markets } = useToken({ collectionAddress, tokenId })
+
+  if (!token) return null
 
   return (
     <NFTSidebarComponent
+      markets={markets}
       collectionAddress={collectionAddress}
       tokenId={tokenId}
       offchainOrders={offchainOrders}
+      token={token}
       {...props}
     />
   )
@@ -42,14 +55,23 @@ export function NFTSidebarComponent({
   collectionAddress,
   tokenId,
   offchainOrders,
+  token,
+  markets,
   ...props
 }: NFTSidebarProps) {
   const { primarySalePrice, hasPrimarySalePrice } = usePrimarySalePrice({
     collectionAddress,
   })
-  const { token } = useToken({ collectionAddress, tokenId })
+  const { activeAuction } = useNounishAuctionQuery({
+    collectionAddress,
+  })
 
-  if (!token) return null
+  const isActiveAuctionToken = useMemo(
+    () => activeAuction?.tokenId === tokenId,
+    [activeAuction?.tokenId, tokenId]
+  )
+
+  const { isOwner } = useIsOwner(token)
 
   return (
     <Stack
@@ -58,7 +80,7 @@ export function NFTSidebarComponent({
       {...props}
     >
       <Flex>
-        <Link href={`/collections/${token.collectionAddress}`}>
+        <Link href={`/daos/${token.collectionAddress}`}>
           <CollectionThumbnail
             collectionAddress={token.collectionAddress}
             showTitle
@@ -88,10 +110,21 @@ export function NFTSidebarComponent({
         {hasPrimarySalePrice && (
           <NFTProvenance primarySalePrice={primarySalePrice} token={token} />
         )}
-        <NFTMarket
-          collectionAddress={collectionAddress}
-          offchainOrders={offchainOrders}
-        />
+        <NftMarketContext.Provider
+          value={{
+            tokenId,
+            collectionAddress,
+            markets,
+            collectionName: token.collectionName ?? '..',
+          }}
+        >
+          <NFTMarket
+            activeAuction={activeAuction}
+            isActiveAuctionToken={isActiveAuctionToken}
+            isOwner={isOwner}
+            offchainOrders={offchainOrders}
+          />
+        </NftMarketContext.Provider>
       </Stack>
     </Stack>
   )
diff --git a/compositions/NFTPage/index.ts b/compositions/NFTPage/index.ts
index 65a2ac75..ff371f2b 100644
--- a/compositions/NFTPage/index.ts
+++ b/compositions/NFTPage/index.ts
@@ -4,5 +4,4 @@ export * from './NFTMarket'
 export * from './NFTAttributes'
 export * from './NFTHistory'
 export * from './NFTProvenance'
-export * from './NFTPrevNext'
 export * from './NFTOffchainOrders'
diff --git a/data/filteredTokens.ts b/data/filteredTokens.ts
new file mode 100644
index 00000000..4abe6492
--- /dev/null
+++ b/data/filteredTokens.ts
@@ -0,0 +1,231 @@
+import gql from 'graphql-tag'
+
+export const FILTERED_TOKENS = gql`
+  query FilteredTokens(
+    $where: TokensQueryInput
+    $sort: TokenSortInput
+    $filter: TokensQueryFilter
+    $pagination: PaginationInput
+    $networks: [NetworkInput!]
+  ) {
+    tokens(
+      where: $where
+      sort: $sort
+      filter: $filter
+      pagination: $pagination
+      networks: $networks
+    ) {
+      pageInfo {
+        endCursor
+        hasNextPage
+        limit
+      }
+      nodes {
+        token {
+          collectionAddress
+          collectionName
+          description
+          image {
+            url
+            size
+            mimeType
+            mediaEncoding {
+              ... on ImageEncodingTypes {
+                large
+                poster
+              }
+            }
+          }
+          lastRefreshTime
+          metadata
+          name
+          tokenContract {
+            collectionAddress
+            symbol
+            totalSupply
+          }
+          tokenId
+          owner
+        }
+        marketsSummary {
+          collectionAddress
+          marketAddress
+          marketType
+          properties {
+            ... on V1Offer {
+              __typename
+              address
+              amount {
+                nativePrice {
+                  decimal
+                  raw
+                }
+                usdcPrice {
+                  decimal
+                  raw
+                }
+              }
+              bidder
+              collectionAddress
+              currency
+              recipient
+              sellOnShare
+              tokenId
+              v1OfferStatus
+            }
+            ... on V3Ask {
+              __typename
+              address
+              askCurrency
+              askPrice {
+                nativePrice {
+                  decimal
+                  raw
+                }
+                usdcPrice {
+                  decimal
+                  raw
+                }
+              }
+              buyer
+              collectionAddress
+              seller
+              tokenId
+              v3AskStatus
+            }
+            ... on V3ReserveAuction {
+              __typename
+              estimatedDurationTime
+              address
+              collectionAddress
+              currency
+              duration
+              extended
+              finder
+              findersFeeBps
+              firstBid
+              firstBidTime
+              highestBid
+              highestBidder
+              reserve
+              seller
+              sellerFundsRecipient
+              startTime
+              status
+              tokenId
+              price {
+                nativePrice {
+                  decimal
+                  raw
+                }
+                usdcPrice {
+                  decimal
+                  raw
+                }
+              }
+            }
+          }
+          price {
+            nativePrice {
+              decimal
+              raw
+            }
+            usdcPrice {
+              decimal
+              raw
+            }
+          }
+          status
+          tokenId
+        }
+
+        token {
+          collectionAddress
+          collectionName
+          networkInfo {
+            chain
+            network
+          }
+          attributes {
+            displayType
+            traitType
+            value
+          }
+          content {
+            mediaEncoding {
+              ... on ImageEncodingTypes {
+                large
+                poster
+                original
+                thumbnail
+              }
+              ... on UnsupportedEncodingTypes {
+                __typename
+                original
+              }
+              ... on AudioEncodingTypes {
+                large
+                original
+              }
+              ... on VideoEncodingTypes {
+                large
+                poster
+                original
+                preview
+                thumbnail
+              }
+            }
+            mimeType
+            size
+            url
+          }
+          tokenUrlMimeType
+          tokenUrl
+          tokenId
+          name
+          metadata
+          image {
+            mimeType
+            url
+            size
+            mediaEncoding {
+              ... on ImageEncodingTypes {
+                large
+                poster
+                original
+                thumbnail
+              }
+              ... on VideoEncodingTypes {
+                large
+                poster
+                original
+                preview
+                thumbnail
+              }
+              ... on AudioEncodingTypes {
+                large
+                original
+              }
+              ... on UnsupportedEncodingTypes {
+                __typename
+                original
+              }
+            }
+          }
+          description
+          lastRefreshTime
+          owner
+          tokenContract {
+            totalSupply
+            symbol
+            network
+            name
+            description
+            collectionAddress
+            chain
+          }
+        }
+      }
+    }
+  }
+`
diff --git a/data/token.ts b/data/token.ts
index a5c4d99b..287ab4b9 100644
--- a/data/token.ts
+++ b/data/token.ts
@@ -3,6 +3,98 @@ import gql from 'graphql-tag'
 export const TOKEN_QUERY = gql`
   query Token($collectionAddress: String!, $tokenId: String!, $network: NetworkInput) {
     token(token: { address: $collectionAddress, tokenId: $tokenId }, network: $network) {
+      markets(sort: { sortKey: CREATED, sortDirection: DESC }) {
+        collectionAddress
+        marketAddress
+        marketType
+        properties {
+          ... on V1Offer {
+            __typename
+            address
+            amount {
+              nativePrice {
+                decimal
+                raw
+              }
+              usdcPrice {
+                decimal
+                raw
+              }
+            }
+            bidder
+            collectionAddress
+            currency
+            recipient
+            sellOnShare
+            tokenId
+            v1OfferStatus
+          }
+          ... on V3Ask {
+            __typename
+            address
+            askCurrency
+            askPrice {
+              nativePrice {
+                decimal
+                raw
+              }
+              usdcPrice {
+                decimal
+                raw
+              }
+            }
+            buyer
+            collectionAddress
+            seller
+            tokenId
+            v3AskStatus
+          }
+          ... on V3ReserveAuction {
+            __typename
+            estimatedDurationTime
+            address
+            collectionAddress
+            currency
+            duration
+            extended
+            finder
+            findersFeeBps
+            firstBid
+            firstBidTime
+            highestBid
+            highestBidder
+            reserve
+            seller
+            sellerFundsRecipient
+            startTime
+            status
+            tokenId
+            price {
+              nativePrice {
+                decimal
+                raw
+              }
+              usdcPrice {
+                decimal
+                raw
+              }
+            }
+          }
+        }
+        price {
+          nativePrice {
+            decimal
+            raw
+          }
+          usdcPrice {
+            decimal
+            raw
+          }
+        }
+        status
+        tokenId
+      }
+
       token {
         collectionAddress
         collectionName
diff --git a/data/tokensByAddress.ts b/data/tokensByAddress.ts
new file mode 100644
index 00000000..74c11eca
--- /dev/null
+++ b/data/tokensByAddress.ts
@@ -0,0 +1,214 @@
+import gql from 'graphql-tag'
+
+export const TOKENS_BY_ADDRESS_QUERY = gql`
+  query NounsTokensByOwnerAddress($ownerAddress: String!) {
+    tokens(where: { ownerAddresses: [$ownerAddress] }) {
+      nodes {
+        token {
+          collectionAddress
+          collectionName
+          description
+          image {
+            url
+            size
+            mimeType
+            mediaEncoding {
+              ... on ImageEncodingTypes {
+                large
+                poster
+              }
+            }
+          }
+          lastRefreshTime
+          metadata
+          name
+          tokenContract {
+            collectionAddress
+            symbol
+            totalSupply
+          }
+          tokenId
+          owner
+        }
+        marketsSummary {
+          collectionAddress
+          marketAddress
+          marketType
+          properties {
+            ... on V1Offer {
+              __typename
+              address
+              amount {
+                nativePrice {
+                  decimal
+                  raw
+                }
+                usdcPrice {
+                  decimal
+                  raw
+                }
+              }
+              bidder
+              collectionAddress
+              currency
+              recipient
+              sellOnShare
+              tokenId
+              v1OfferStatus
+            }
+            ... on V3Ask {
+              __typename
+              address
+              askCurrency
+              askPrice {
+                nativePrice {
+                  decimal
+                  raw
+                }
+                usdcPrice {
+                  decimal
+                  raw
+                }
+              }
+              buyer
+              collectionAddress
+              seller
+              tokenId
+              v3AskStatus
+            }
+            ... on V3ReserveAuction {
+              __typename
+              estimatedDurationTime
+              address
+              collectionAddress
+              currency
+              duration
+              extended
+              finder
+              findersFeeBps
+              firstBid
+              firstBidTime
+              highestBid
+              highestBidder
+              reserve
+              seller
+              sellerFundsRecipient
+              startTime
+              status
+              tokenId
+              price {
+                nativePrice {
+                  decimal
+                  raw
+                }
+                usdcPrice {
+                  decimal
+                  raw
+                }
+              }
+            }
+          }
+          price {
+            nativePrice {
+              decimal
+              raw
+            }
+            usdcPrice {
+              decimal
+              raw
+            }
+          }
+          status
+          tokenId
+        }
+
+        token {
+          collectionAddress
+          collectionName
+          networkInfo {
+            chain
+            network
+          }
+          attributes {
+            displayType
+            traitType
+            value
+          }
+          content {
+            mediaEncoding {
+              ... on ImageEncodingTypes {
+                large
+                poster
+                original
+                thumbnail
+              }
+              ... on UnsupportedEncodingTypes {
+                __typename
+                original
+              }
+              ... on AudioEncodingTypes {
+                large
+                original
+              }
+              ... on VideoEncodingTypes {
+                large
+                poster
+                original
+                preview
+                thumbnail
+              }
+            }
+            mimeType
+            size
+            url
+          }
+          tokenUrlMimeType
+          tokenUrl
+          tokenId
+          name
+          metadata
+          image {
+            mimeType
+            url
+            size
+            mediaEncoding {
+              ... on ImageEncodingTypes {
+                large
+                poster
+                original
+                thumbnail
+              }
+              ... on VideoEncodingTypes {
+                large
+                poster
+                original
+                preview
+                thumbnail
+              }
+              ... on AudioEncodingTypes {
+                large
+                original
+              }
+              ... on UnsupportedEncodingTypes {
+                __typename
+                original
+              }
+            }
+          }
+          description
+          lastRefreshTime
+          owner
+          tokenContract {
+            totalSupply
+            symbol
+            network
+            name
+            description
+            collectionAddress
+            chain
+          }
+        }
+      }
+    }
+  }
+`
diff --git a/graphql.schema.json b/graphql.schema.json
index a433cd9a..1efa9397 100644
--- a/graphql.schema.json
+++ b/graphql.schema.json
@@ -9698,15 +9698,11 @@
                 "name": "sort",
                 "description": null,
                 "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "AggregateAttributeSortKeySortInput",
-                    "ofType": null
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "AggregateAttributeSortKeySortInput",
+                  "ofType": null
                 },
-                "defaultValue": null,
+                "defaultValue": "null",
                 "isDeprecated": false,
                 "deprecationReason": null
               },
diff --git a/hooks/useToken.ts b/hooks/useToken.ts
index e6cb33fc..afd0d479 100644
--- a/hooks/useToken.ts
+++ b/hooks/useToken.ts
@@ -55,6 +55,7 @@ export function useToken({
 
   return {
     token,
+    markets: data?.token?.markets ?? [],
     error,
   }
 }
diff --git a/hooks/useTokensByAddress.ts b/hooks/useTokensByAddress.ts
new file mode 100644
index 00000000..1b3c5989
--- /dev/null
+++ b/hooks/useTokensByAddress.ts
@@ -0,0 +1,35 @@
+import useSWR from 'swr'
+import { NounsTokensByOwnerAddressQuery } from 'types/zora.api.generated'
+
+import { TOKENS_BY_ADDRESS_QUERY } from 'data/tokensByAddress'
+
+import { zoraApiFetcher } from '@shared'
+
+type Params = {
+  ownerAddress: string
+}
+
+export function useTokensByAddress({ ownerAddress }: Params) {
+  const { data, error } = useSWR<NounsTokensByOwnerAddressQuery>(
+    [`${ownerAddress}`],
+    () =>
+      zoraApiFetcher(TOKENS_BY_ADDRESS_QUERY, {
+        ownerAddress,
+      }),
+    {
+      onErrorRetry: (_, _1, _2, revalidate, { retryCount }) => {
+        // Only retry up to 1 times.
+        if (retryCount >= 2) return
+        // Retry after 5 seconds.
+        setTimeout(() => revalidate({ retryCount }), 5000)
+      },
+      dedupingInterval: 10000,
+      refreshInterval: 5000,
+    }
+  )
+
+  return {
+    tokensByAddress: data?.tokens?.nodes ?? [],
+    error,
+  }
+}
diff --git a/next.config.js b/next.config.js
index 9e6e910a..851b4ac0 100644
--- a/next.config.js
+++ b/next.config.js
@@ -16,6 +16,21 @@ const nextConfig = {
   //   esmExternals: false,
   // },
 
+  async redirects() {
+    return [
+      {
+        source: '/collections',
+        destination: '/',
+        permanent: true,
+      },
+      {
+        source: '/collections/:address*',
+        destination: '/daos/:address*',
+        permanent: true,
+      },
+    ]
+  },
+
   images: {
     domains: [
       // For debugging images
diff --git a/pages/collections/index.tsx b/pages/collections/index.tsx
deleted file mode 100644
index def4214f..00000000
--- a/pages/collections/index.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { PageHeader, PageWrapper, Seo } from 'components'
-import { COLLECTIONS_INDEX_COPY, COLLECTIONS_INDEX_HEADLINE } from 'constants/copy'
-import { CollectionParsed } from 'pages'
-
-const Collections = ({}: { fallback: CollectionParsed }) => {
-  return (
-    <PageWrapper p="x4" direction="column" gap="x4">
-      <Seo title={COLLECTIONS_INDEX_HEADLINE} description={COLLECTIONS_INDEX_COPY} />
-      <PageHeader headline={COLLECTIONS_INDEX_HEADLINE} copy={COLLECTIONS_INDEX_COPY} />
-    </PageWrapper>
-  )
-}
-
-export default Collections
diff --git a/pages/collections/[address]/[tokenId].tsx b/pages/daos/[address]/[tokenId].tsx
similarity index 100%
rename from pages/collections/[address]/[tokenId].tsx
rename to pages/daos/[address]/[tokenId].tsx
diff --git a/pages/collections/[address]/index.tsx b/pages/daos/[address]/index.tsx
similarity index 97%
rename from pages/collections/[address]/index.tsx
rename to pages/daos/[address]/index.tsx
index d1488650..9a1751e5 100644
--- a/pages/collections/[address]/index.tsx
+++ b/pages/daos/[address]/index.tsx
@@ -30,7 +30,7 @@ const Collection = ({ fallback }: { fallback: CollectionServiceProps }) => {
     const isValidHash = ALL_COLLECTION_VIEWS && ALL_COLLECTION_VIEWS.includes(urlHash)
     const activeView = isValidHash ? urlHash : 'nfts'
     setActiveView(activeView)
-    router.push(`/collections/${collectionAddress}/#${activeView}`)
+    router.push(`/daos/${collectionAddress}/#${activeView}`)
     // No deps, should only run on first load:
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
diff --git a/pages/docs/index.tsx b/pages/docs/index.tsx
deleted file mode 100644
index a77e09da..00000000
--- a/pages/docs/index.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { DocsPageWrapper, HorizontalMenu, MDXComponents } from 'components'
-import Link from 'next/link'
-
-import { useState } from 'react'
-
-import { Button, Icon, Stack, color } from '@zoralabs/zord'
-
-import NFTFilterReadme from '../../@filter/README.md'
-import ZoraMarketReadme from '../../@market/README.md'
-import ZordReadme from '../../docs/zord.md'
-import Readme from './../../README.md'
-
-const pageLinks = [
-  {
-    name: 'Nounish Auction Component',
-    url: 'nounish-auction-component',
-  },
-  {
-    name: 'Zord Components',
-    url: 'zord-components',
-  },
-]
-
-enum tabs {
-  ABOUT = 'About',
-  ZORD = 'Zord',
-  NOUNISH_AUCTION = 'Nounish Auction',
-  // ZORA_COMMON = 'Zora Common',
-  NFT_FILTER = 'NFT Filter',
-  ZORA_MARKET = 'Zora Market',
-  EXAMPLES = 'Examples',
-}
-
-const menuItems = Object.values(tabs).map((item) => {
-  return {
-    id: item,
-    label: item,
-  }
-})
-
-export default function TestPages() {
-  const [tab, setTab] = useState<string>(menuItems[0].id)
-
-  return (
-    <DocsPageWrapper useBackButton={false}>
-      <HorizontalMenu
-        items={menuItems}
-        setId={setTab}
-        currentId={tab}
-        position="sticky"
-        pt="x2"
-        top="x0"
-        backgroundColor="background1"
-        justify="flex-start"
-        style={{
-          borderBottom: `1px solid ${color.background2}`,
-        }}
-      />
-      <Stack gap="x4">
-        {tab === tabs.ABOUT && <Readme components={{ ...MDXComponents }} />}
-        {/*tab === tabs.ZORA_COMMON && (
-          <ZoraCommonReadme components={{ ...MDXComponents }} />
-        )*/}
-        {tab === tabs.ZORA_MARKET && (
-          <ZoraMarketReadme components={{ ...MDXComponents }} />
-        )}
-        {tab === tabs.ZORD && <ZordReadme components={{ ...MDXComponents }} />}
-        {tab === tabs.NFT_FILTER && <NFTFilterReadme components={{ ...MDXComponents }} />}
-        {tab === tabs.EXAMPLES && (
-          <Stack w="100%" gap="x4">
-            {pageLinks.map((link) => (
-              <Link key={link.url} href={`/docs/${link.url}`} passHref>
-                <Button
-                  borderRadius="curved"
-                  as="a"
-                  align="center"
-                  gap="x3"
-                  display="flex"
-                >
-                  {link.name}
-                  <Icon id="ArrowRight" size="lg" />
-                </Button>
-              </Link>
-            ))}
-          </Stack>
-        )}
-      </Stack>
-    </DocsPageWrapper>
-  )
-}
diff --git a/pages/docs/nounish-auction-component.tsx b/pages/docs/nounish-auction-component.tsx
deleted file mode 100644
index a4e6f854..00000000
--- a/pages/docs/nounish-auction-component.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { DocsPageWrapper } from 'components'
-
-// import { NounishAuction } from '@noun-auction'
-import { Grid, Heading, Stack } from '@zoralabs/zord'
-
-export default function NounsAuctionHistory() {
-  return (
-    <DocsPageWrapper
-      title="Active Noun Auction"
-      width="100%"
-      maxWidth="960px"
-      useBackButton
-    >
-      <Grid style={{ gridTemplateColumns: '1fr' }} gap="x4">
-        {/* {daos.map((dao) => {
-          return (
-            <NounishAuction
-              key={dao.collectionAddress}
-              dao={dao}
-              debug
-              showBidHistory
-              showLabels
-              layout="withHistory"
-              borderColor="border"
-              borderStyle="solid"
-              borderWidth="normal"
-              borderRadius="phat"
-              backgroundColor="background1"
-              p="x4"
-            />
-          )
-        })} */}
-      </Grid>
-      <Grid style={{ gridTemplateColumns: '1fr 1fr' }} gap="x4">
-        <Stack>
-          <Heading mb="x4">Completed Nouns auction</Heading>
-          {/* <NounishAuction
-            dao={daos[0]}
-            tokenId="152"
-            debug
-            showBidHistory
-            showLabels
-            layout="withHistory"
-            borderColor="border"
-            borderStyle="solid"
-            borderWidth="normal"
-            borderRadius="phat"
-            backgroundColor="background1"
-            p="x4"
-          /> */}
-        </Stack>
-        <Stack>
-          <Heading mb="x4">Completed LilNouns auction</Heading>
-          {/* <NounishAuction
-            dao={daos[1]}
-            tokenId="3369"
-            debug
-            showBidHistory
-            showLabels
-            layout="withHistory"
-            borderColor="border"
-            borderStyle="solid"
-            borderWidth="normal"
-            borderRadius="phat"
-            backgroundColor="background1"
-            p="x4"
-          /> */}
-        </Stack>
-      </Grid>
-      <Grid style={{ gridTemplateColumns: '1fr 1fr' }} gap="x4">
-        <Stack>
-          <Heading mb="x4">Nouns No Auction: Winner nounders.eth</Heading>
-          {/* <NounishAuction
-            dao={daos[0]}
-            tokenId="300"
-            debug
-            showBidHistory
-            showLabels
-            layout="withHistory"
-            borderColor="border"
-            borderStyle="solid"
-            borderWidth="normal"
-            borderRadius="phat"
-            backgroundColor="background1"
-            p="x4"
-          /> */}
-        </Stack>
-        <Stack>
-          <Heading mb="x4">LilNouns No Auction: Winner lilnounders.eth</Heading>
-          {/* <NounishAuction
-            dao={daos[1]}
-            tokenId="3370"
-            debug
-            showBidHistory
-            showLabels
-            layout="withHistory"
-            borderColor="border"
-            borderStyle="solid"
-            borderWidth="normal"
-            borderRadius="phat"
-            backgroundColor="background1"
-            p="x4"
-          />
-          */}
-        </Stack>
-      </Grid>
-      <Stack>
-        <Heading mb="x4">Nouns Auction History</Heading>
-        {/* <NounishAuction
-          showAuctionRow={false}
-          dao={daos[0]}
-          tokenId="125"
-          debug
-          showBidHistory
-          showLabels
-          layout="historyOnly"
-          borderColor="border"
-          borderStyle="solid"
-          borderWidth="normal"
-          borderRadius="phat"
-          backgroundColor="background1"
-          p="x4"
-        /> */}
-      </Stack>
-    </DocsPageWrapper>
-  )
-}
diff --git a/pages/docs/zord-components.tsx b/pages/docs/zord-components.tsx
deleted file mode 100644
index 2ead2c7f..00000000
--- a/pages/docs/zord-components.tsx
+++ /dev/null
@@ -1,819 +0,0 @@
-import { DocsPageWrapper, HorizontalMenu, MDXComponents } from 'components'
-
-import { useState } from 'react'
-
-import {
-  Accordion,
-  Box,
-  Button,
-  Checkbox,
-  Display,
-  Eyebrow,
-  Flex,
-  Heading,
-  Icon,
-  Input,
-  InputField,
-  Label,
-  MenuText,
-  Modal,
-  ModalContent,
-  Paragraph,
-  PopUp,
-  RadioButtonGroup,
-  Select,
-  Slider,
-  Spinner,
-  SpinnerOG,
-  Stack,
-  Switch,
-  Tag,
-  Text,
-  TextArea,
-  Well,
-  color,
-} from '@zoralabs/zord'
-
-import ZordMarkup from '../../docs/zordMarkup.md'
-
-enum tabs {
-  COMPONENTS = 'Components',
-  MARKUP = 'Markup',
-}
-
-const menuItems = Object.values(tabs).map((item) => {
-  return {
-    id: item,
-    label: item,
-  }
-})
-
-export default function NounsAuctionHistory() {
-  const [tab, setTab] = useState<string>(menuItems[0].id)
-
-  return (
-    <DocsPageWrapper title="Zord" width="100%" maxWidth="960px" useBackButton>
-      <HorizontalMenu
-        items={menuItems}
-        setId={setTab}
-        currentId={tab}
-        position="sticky"
-        pt="x2"
-        top="x0"
-        backgroundColor="background1"
-        justify="flex-start"
-        style={{
-          borderBottom: `1px solid ${color.background2}`,
-        }}
-      />
-      {tab === tabs.MARKUP && <ZordMarkup components={{ ...MDXComponents }} />}
-      {tab === tabs.COMPONENTS && (
-        <Flex direction="column" gap="x3">
-          <Well style={{ gridColumn: '2/span 6' }} label="Colors">
-            <Flex gap="x4">
-              <Box w="x8" h="x8" backgroundColor="background1" />
-              <Box w="x8" h="x8" backgroundColor="background2" />
-              <Box w="x8" h="x8" backgroundColor="accent" />
-              <Box w="x8" h="x8" backgroundColor="negative" />
-              <Box w="x8" h="x8" backgroundColor="positive" />
-              <Box w="x8" h="x8" backgroundColor="warning" />
-            </Flex>
-            <Flex gap="x4">
-              <Box
-                w="x8"
-                h="x8"
-                borderWidth="normal"
-                borderStyle="solid"
-                borderColor="background1"
-              />
-              <Box
-                w="x8"
-                h="x8"
-                borderWidth="normal"
-                borderStyle="solid"
-                borderColor="border"
-              />
-              <Box
-                w="x8"
-                h="x8"
-                borderWidth="normal"
-                borderStyle="solid"
-                borderColor="accent"
-              />
-              <Box
-                w="x8"
-                h="x8"
-                borderWidth="normal"
-                borderStyle="solid"
-                borderColor="negative"
-              />
-              <Box
-                w="x8"
-                h="x8"
-                borderWidth="normal"
-                borderStyle="solid"
-                borderColor="positive"
-              />
-              <Box
-                w="x8"
-                h="x8"
-                borderWidth="normal"
-                borderStyle="solid"
-                borderColor="warning"
-              />
-            </Flex>
-            <Flex gap="x4">
-              <Box w="x8" h="x8" color="background1">
-                xox
-              </Box>
-              <Box w="x8" h="x8" color="text4">
-                xox
-              </Box>
-              <Box w="x8" h="x8" color="accent">
-                xox
-              </Box>
-              <Box w="x8" h="x8" color="negative">
-                xox
-              </Box>
-              <Box w="x8" h="x8" color="positive">
-                xox
-              </Box>
-              <Box w="x8" h="x8" color="warning">
-                xox
-              </Box>
-            </Flex>
-          </Well>
-          <Well style={{ gridColumn: '2/span 6' }} label="Typography">
-            <Flex direction="column">
-              <Eyebrow>Display</Eyebrow>
-              <Display size="lg">Display lg</Display>
-              <Display size="md">Display md</Display>
-              <Display size="sm">Display sm</Display>
-              <Display size="xs">Heading xs</Display>
-            </Flex>
-
-            <Flex direction="column">
-              <Eyebrow>Headings</Eyebrow>
-              <Heading size="xl">Heading xl</Heading>
-              <Heading size="lg">Heading lg</Heading>
-              <Heading size="md">Heading md</Heading>
-              <Heading size="sm">Heading sm</Heading>
-              <Heading size="xs">Heading xs</Heading>
-            </Flex>
-            <Flex direction="column">
-              <Eyebrow>Labels</Eyebrow>
-              <Label size="lg">Label lg</Label>
-              <Label size="md">Label md</Label>
-              <Label size="sm">Label sm</Label>
-              <Label size="xs">Label xs</Label>
-            </Flex>
-            <Flex direction="column">
-              <Eyebrow>Paragraphs</Eyebrow>
-              <Paragraph size="lg">Paragraph lg</Paragraph>
-              <Paragraph size="md">Paragraph md</Paragraph>
-              <Paragraph size="sm">Paragraph sm</Paragraph>
-              <Paragraph size="xs">Paragraph xs</Paragraph>
-            </Flex>
-            <Flex direction="column">
-              <Eyebrow>MenuText</Eyebrow>
-              <MenuText>MenuText</MenuText>
-            </Flex>
-            <Flex direction="column">
-              <Eyebrow>Eyebrow</Eyebrow>
-            </Flex>
-            <Flex direction="column">
-              <Eyebrow>Responsive Text</Eyebrow>
-              <Text fontWeight="display" fontSize={{ '@initial': 48, '@576': 65 }}>
-                Custom size which gets smaller at 576px breakpoint
-              </Text>
-            </Flex>
-          </Well>
-          <Well style={{ gridColumn: '2/span 10' }} label="Inputs">
-            <Flex align="end" gap="x2">
-              <Flex direction="column" align="end">
-                <InputField
-                  name="lowProfile"
-                  lowProfile
-                  placeholder="LowProfile + AutoFocus"
-                  className="inputLowProfile"
-                />
-              </Flex>
-            </Flex>
-          </Well>
-
-          <Well style={{ gridColumn: '8/span 4' }} label="Icons">
-            <Flex gap="x4">
-              <Box>
-                <Eyebrow>Small</Eyebrow>
-                <Icon size="sm" id="Bell" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Large</Eyebrow>
-                <Icon size="lg" id="Bell" p="x3" />
-              </Box>
-              {/*
-              <Box>
-                <Eyebrow>Flipped</Eyebrow>
-                <Icon size="lg" flip id="Bell" p="x3" />
-                    </Box>
-                    */}
-            </Flex>
-            <Flex gap="x4" wrap="wrap" w="100%">
-              <Box>
-                <Eyebrow>ArrowRight</Eyebrow>
-                <Icon size="lg" id="ArrowRight" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>ArrowRightAngle</Eyebrow>
-                <Icon size="lg" id="ArrowRightAngle" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Auction</Eyebrow>
-                <Icon size="lg" id="Auction" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Bell</Eyebrow>
-                <Icon size="lg" id="Bell" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Check</Eyebrow>
-                <Icon size="lg" id="Check" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>ChevronDown</Eyebrow>
-                <Icon size="lg" id="ChevronDown" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>ChevronLeft</Eyebrow>
-                <Icon size="lg" id="ChevronLeft" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>ChevronRight</Eyebrow>
-                <Icon size="lg" id="ChevronRight" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>ChevronUp</Eyebrow>
-                <Icon size="lg" id="ChevronUp" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Close</Eyebrow>
-                <Icon size="lg" id="Close" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Coinbase</Eyebrow>
-                <Icon size="lg" id="Coinbase" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Copy</Eyebrow>
-                <Icon size="lg" id="Copy" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Create</Eyebrow>
-                <Icon size="lg" id="Create" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Discord</Eyebrow>
-                <Icon size="lg" id="Discord" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Download</Eyebrow>
-                <Icon size="lg" id="Download" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Ellipsis</Eyebrow>
-                <Icon size="lg" id="Ellipsis" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Embed</Eyebrow>
-                <Icon size="lg" id="Embed" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Instagram</Eyebrow>
-                <Icon size="lg" id="Instagram" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Kebab</Eyebrow>
-                <Icon size="lg" id="Kebab" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Logout</Eyebrow>
-                <Icon size="lg" id="Logout" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Metamask</Eyebrow>
-                <Icon size="lg" id="Metamask" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Pencil</Eyebrow>
-                <Icon size="lg" id="Pencil" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Plus</Eyebrow>
-                <Icon size="lg" id="Plus" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Question</Eyebrow>
-                <Icon size="lg" id="Question" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Rainbow</Eyebrow>
-                <Icon size="lg" id="Rainbow" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Search</Eyebrow>
-                <Icon size="lg" id="Search" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Shield</Eyebrow>
-                <Icon size="lg" id="Shield" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Spinner</Eyebrow>
-                <Icon size="lg" id="Spinner" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Tag</Eyebrow>
-                <Icon size="lg" id="Tag" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Twitter</Eyebrow>
-                <Icon size="lg" id="Twitter" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>WalletConnect</Eyebrow>
-                <Icon size="lg" id="WalletConnect" p="x3" />
-              </Box>
-              <Box>
-                <Eyebrow>Warning</Eyebrow>
-                <Icon size="lg" id="Warning" p="x3" />
-              </Box>
-            </Flex>
-          </Well>
-
-          <Well style={{ gridColumn: '2/span 10' }} label="Buttons">
-            <Eyebrow>Primary</Eyebrow>
-            <Flex align="center" gap="x2">
-              <Button variant="primary" icon="Bell">
-                Button
-              </Button>
-              <Button variant="primary" size="md">
-                Button
-              </Button>
-              <Button variant="primary" size="sm">
-                Button
-              </Button>
-              <Button variant="primary" loading>
-                Button
-              </Button>
-              <Button variant="primary" disabled>
-                Button
-              </Button>
-            </Flex>
-            <Eyebrow>Secondary</Eyebrow>
-            <Flex align="center" gap="x2">
-              <Button variant="secondary" icon="Bell">
-                Button
-              </Button>
-              <Button variant="secondary" size="md">
-                Button
-              </Button>
-              <Button variant="secondary" size="sm">
-                Button
-              </Button>
-              <Button variant="secondary" loading>
-                Button
-              </Button>
-              <Button variant="secondary" disabled>
-                Button
-              </Button>
-            </Flex>
-            <Eyebrow>Outline</Eyebrow>
-            <Flex align="center" gap="x2">
-              <Button variant="outline" icon="Bell">
-                Button
-              </Button>
-              <Button variant="outline" size="md">
-                Button
-              </Button>
-              <Button variant="outline" size="sm">
-                Button
-              </Button>
-              <Button variant="outline" loading>
-                Button
-              </Button>
-              <Button variant="outline" disabled>
-                Button
-              </Button>
-            </Flex>
-
-            <Eyebrow>Circle</Eyebrow>
-            <Flex align="center" gap="x2">
-              <Button variant="circle" size="md">
-                +
-              </Button>
-              <Button variant="circle" size="sm">
-                +
-              </Button>
-              <Button variant="circle" loading>
-                +
-              </Button>
-              <Button variant="circle" disabled>
-                +
-              </Button>
-            </Flex>
-
-            <Eyebrow>Ghost</Eyebrow>
-            <Flex align="center" gap="x2">
-              <Button variant="ghost" size="md">
-                Button
-              </Button>
-              <Button variant="ghost" size="sm">
-                Button
-              </Button>
-              <Button variant="ghost" loading>
-                Button
-              </Button>
-              <Button variant="ghost" disabled>
-                Button
-              </Button>
-            </Flex>
-
-            <Eyebrow>Pill Primary</Eyebrow>
-            <Flex align="center" gap="x2">
-              <Button pill variant="primary" size="md">
-                Button
-              </Button>
-              <Button pill variant="primary" size="sm">
-                Button
-              </Button>
-              <Button pill variant="primary" loading>
-                Button
-              </Button>
-              <Button pill variant="primary" disabled>
-                Button
-              </Button>
-            </Flex>
-
-            <Eyebrow>Pill Outline</Eyebrow>
-            <Flex align="center" gap="x2">
-              <Button pill variant="outline" size="md">
-                Button
-              </Button>
-              <Button pill variant="outline" size="sm">
-                Button
-              </Button>
-              <Button pill variant="outline" loading>
-                Button
-              </Button>
-              <Button pill variant="outline" disabled>
-                Button
-              </Button>
-            </Flex>
-            <Eyebrow>Inherit currentColor</Eyebrow>
-            <Flex align="center">
-              <Button icon="Bell" style={{ color: '#9999ff' }}>
-                Button
-              </Button>
-            </Flex>
-          </Well>
-          <Well style={{ gridColumn: '2/span 10' }} label="Spinner">
-            <Spinner />
-            <Eyebrow>Size: md</Eyebrow>
-            <Spinner size="md" />
-            <Eyebrow>Size: lg</Eyebrow>
-            <Spinner size="lg" />
-          </Well>
-          <Well style={{ gridColumn: '2/span 10' }} label="SpinnerOG">
-            <SpinnerOG />
-            <Eyebrow>Size: 20</Eyebrow>
-            <SpinnerOG size={20} />
-            <Eyebrow>Size: 50</Eyebrow>
-            <SpinnerOG size={50} />
-          </Well>
-
-          <Well style={{ gridColumn: '2/span 10' }} label="Inputs">
-            <Flex align="end" gap="x2">
-              <Flex direction="column">
-                <Eyebrow>Base Input</Eyebrow>
-                <Input
-                  name="basic"
-                  size="lg"
-                  placeholder="Basic Input"
-                  className="basicinput"
-                />
-              </Flex>
-            </Flex>
-            <Flex align="end" gap="x2">
-              <Flex direction="column">
-                <InputField
-                  name="basic"
-                  placeholder="InputField + Label"
-                  label="Input w/ Label"
-                  className="basicinput"
-                />
-              </Flex>
-              <Flex direction="column" align="end">
-                <InputField
-                  name="nolabel"
-                  placeholder="No Label"
-                  className="inputnolabel"
-                />
-              </Flex>
-              <Flex direction="column">
-                <InputField
-                  name="basic"
-                  placeholder="Disabled"
-                  label="Disabled"
-                  className="disabledinput"
-                  disabled
-                />
-              </Flex>
-              <Flex direction="column">
-                <InputField
-                  name="icon"
-                  placeholder="With Icon"
-                  label="With Icon"
-                  className="iconinput"
-                  icon="Search"
-                />
-              </Flex>
-            </Flex>
-            <Flex gap="x2">
-              <Flex direction="column">
-                <InputField
-                  name="basic"
-                  placeholder="InputField + Error"
-                  label="Input w/ Error"
-                  className="basicinput"
-                  error="Oh no it's an error"
-                />
-              </Flex>
-              <Flex direction="column">
-                <InputField
-                  name="basic"
-                  placeholder="InputField + Desc"
-                  label="Input w/ Desc"
-                  className="basicinput"
-                  description="Oh wow it's a description"
-                />
-              </Flex>
-              <Flex direction="column">
-                <InputField
-                  name="affix"
-                  placeholder="With affix"
-                  label="With affix"
-                  className="iconaffix"
-                  affix=".eth"
-                />
-              </Flex>
-              <Flex direction="column">
-                <InputField
-                  name="number"
-                  placeholder="Number"
-                  label="Number"
-                  type="number"
-                  className="number"
-                  min={0}
-                  step={0.5}
-                  max={10}
-                />
-              </Flex>
-            </Flex>
-            <Flex gap="x2">
-              <Flex direction="column">
-                <TextArea
-                  name="basic"
-                  placeholder="TextArea"
-                  label="TextArea"
-                  className="basicinput"
-                  description="This is the textarea description"
-                />
-              </Flex>
-              <Flex direction="column">
-                <TextArea
-                  name="basic"
-                  placeholder="TextArea"
-                  label="TextArea w/ Error"
-                  className="basicinput"
-                  error="Oh no something bad happened"
-                  description="This is another textarea description"
-                />
-              </Flex>
-            </Flex>
-          </Well>
-
-          <Well style={{ gridColumn: '2/span 10' }} label="Select">
-            <Stack gap="x3">
-              <Flex direction="column">
-                <Eyebrow>Select</Eyebrow>
-                <Box p="x2">
-                  <Select defaultValue="2">
-                    <option value="1">Option 1</option>
-                    <option value="2">Option 2</option>
-                    <option value="3">Option 3</option>
-                  </Select>
-                </Box>
-              </Flex>
-              {/*
-                    <Flex direction="column">
-                <Eyebrow>Select: size md</Eyebrow>
-                <Box p="x2">
-                  <Select defaultValue="2" size="md">
-                    <option value="1">Option 1</option>
-                    <option value="2">Option 2</option>
-                    <option value="3">Option 3</option>
-                  </Select>
-                </Box>
-                    </Flex>
-                    */}
-              <Flex direction="column">
-                <Eyebrow>Select: size lg</Eyebrow>
-                <Box p="x2">
-                  <Select defaultValue="2" variant="lg">
-                    <option value="1">Option 1</option>
-                    <option value="2">Option 2</option>
-                    <option value="3">Option 3</option>
-                  </Select>
-                </Box>
-              </Flex>
-            </Stack>
-          </Well>
-          <Well style={{ gridColumn: '2/span 10' }} label="Switch">
-            <Stack gap="x3">
-              <Flex direction="column">
-                <Box p="x2">
-                  <Switch />
-                </Box>
-              </Flex>
-            </Stack>
-          </Well>
-          <Well style={{ gridColumn: '2/span 10' }} label="Collection Filters">
-            <Flex direction="row" gap="x3">
-              <Flex direction="column">
-                <Eyebrow>RadioButtonGroup (DS version)</Eyebrow>
-                <Box p="x2">
-                  <RadioButtonGroup
-                    items={[
-                      { label: 'Default', value: '1-default' },
-                      { label: 'Compact', value: '2-compact' },
-                      { label: 'Comfortable', value: '3-comfortable' },
-                      { value: '4-nolabel' },
-                      { label: 'Disabled', value: '5-disabled', disabled: true },
-                    ]}
-                    name="zord-test-checkbox"
-                  />
-                </Box>
-              </Flex>
-            </Flex>
-            <Flex direction="row" gap="x3">
-              <Flex direction="column">
-                <Eyebrow>Checkbox</Eyebrow>
-                <Box p="x2">
-                  <Checkbox
-                    defaultChecked
-                    id="zord-test-checkbox"
-                    name="zord-test-checkbox"
-                  />
-                </Box>
-              </Flex>
-              <Flex direction="column">
-                <Eyebrow>With Label</Eyebrow>
-                <Checkbox
-                  id="checkbox_label"
-                  label="Checkbox label"
-                  name="Base Checkbox"
-                />
-              </Flex>
-              <Flex direction="column">
-                <Eyebrow>Disabled Checked</Eyebrow>
-                <Checkbox
-                  id="checkbox_disabled"
-                  disabled
-                  checked
-                  name="Disabled Checkbox"
-                  label="Disabled Checkbox"
-                />
-              </Flex>
-              <Flex direction="column">
-                <Eyebrow>Disabled Unchecked</Eyebrow>
-                <Checkbox
-                  id="checkbox_disabledunchecked"
-                  disabled
-                  name="Disabled Unchecked"
-                  label="Disabled Unchecked"
-                />
-              </Flex>
-            </Flex>
-            <Flex direction="row">
-              <Flex direction="column">
-                <Eyebrow>Filter Accordion (Preview)</Eyebrow>
-                <Accordion
-                  label="This is the label"
-                  enableDeselectAll
-                  defaultState="open"
-                  onDeselectAll={(e) => {
-                    e.stopPropagation()
-                    alert('deselect all')
-                  }}
-                  style={{ width: '325px' }}
-                >
-                  <Flex direction="column" align="stretch" gap="x4" pt="x4">
-                    <InputField
-                      name="Search Input"
-                      placeholder="Search Collections..."
-                      className="searchinput"
-                      icon="Search"
-                    />
-                  </Flex>
-                </Accordion>
-              </Flex>
-            </Flex>
-          </Well>
-          <Well style={{ gridColumn: '2/span 6' }} label="Slider">
-            <Flex direction="column" gap="x4">
-              <Slider
-                defaultValue={[1]}
-                min={1}
-                max={10}
-                step={1}
-                unitName="day"
-                unitNamePlural="days"
-                showInlineUnits
-                showLabel
-              />
-            </Flex>
-          </Well>
-          <Well style={{ gridColumn: '2/span 6' }} label="Buttons in Forms">
-            <form
-              onSubmit={() => {
-                alert('submitted')
-                return false
-              }}
-            >
-              <Flex direction="column" gap="x4">
-                <Button type="button">This should not submit the form</Button>
-                <Button type="submit">This should submit the form</Button>
-              </Flex>
-            </form>
-          </Well>
-          <Well style={{ gridColumn: '2/span 10' }} label="Tag">
-            <Stack gap="x3">
-              <Flex direction="column">
-                <Eyebrow>Default tag</Eyebrow>
-                <Box p="x2">
-                  <Tag>Tag value</Tag>
-                </Box>
-              </Flex>
-              <Flex direction="column">
-                <Eyebrow>Active tag</Eyebrow>
-                <Box p="x2">
-                  <Tag active={true}>Tag value</Tag>
-                </Box>
-              </Flex>
-              <Flex direction="column">
-                <Eyebrow>Inactive tag</Eyebrow>
-                <Box p="x2">
-                  <Tag inactive={true}>Tag value</Tag>
-                </Box>
-              </Flex>
-              <Flex direction="column">
-                <Eyebrow>Tag w/ dot</Eyebrow>
-                <Box p="x2">
-                  <Tag showDot={true}>Tag value</Tag>
-                </Box>
-              </Flex>
-            </Stack>
-          </Well>
-          <Well style={{ gridColumn: '8/span 4' }} label="PopUps">
-            <Stack gap="x2">
-              <Eyebrow>PopUp</Eyebrow>
-              <PopUp>
-                <Box>
-                  <Label>PopUp Heading</Label>
-                  <Paragraph>PopUp Ipsum Dolor sit etc.</Paragraph>
-                </Box>
-              </PopUp>
-            </Stack>
-            <Stack gap="x2">
-              <Eyebrow>PopUp with Custom Trigger</Eyebrow>
-              <PopUp trigger={<Button>Open PopUp</Button>}>
-                <Box>
-                  <Label>PopUp Heading</Label>
-                  <Paragraph>PopUp Ipsum Dolor sit etc.</Paragraph>
-                </Box>
-              </PopUp>
-            </Stack>
-          </Well>
-          <Well style={{ gridColumn: '8/span 4' }} label="Example GridCol 8/span 4">
-            <Text>test 2</Text>
-            <Modal trigger={<Button>Open modal</Button>}>
-              <ModalContent title="This is a modal">
-                <Paragraph>This is a Modal</Paragraph>
-              </ModalContent>
-            </Modal>
-          </Well>
-        </Flex>
-      )}
-    </DocsPageWrapper>
-  )
-}
diff --git a/pages/manage/[address].tsx b/pages/manage/[address].tsx
index b723db79..1b5104e8 100644
--- a/pages/manage/[address].tsx
+++ b/pages/manage/[address].tsx
@@ -1,15 +1,15 @@
 import { ManageHeader, PageWrapper, Seo } from 'components'
-import { Collections } from 'compositions'
-// apparently 'constants' is reserved in Next.js (?)
 import { ManageNFTsServiceProps, manageNftsService } from 'services'
 
-// import { useBlocklist } from '@blocklist/src/blocklist'
-import { CollectionFilterProvider } from '@filter'
+import { useTokensByAddress } from 'hooks/useTokensByAddress'
+
+import { NFTGrid2 } from '@media/NFTGrid2'
+import { nftGridWrapper } from '@media/NftMedia.css'
 import { Separator } from '@zoralabs/zord'
 
-const Manage = ({ ownerAddress }: ManageNFTsServiceProps) => {
-  // FIXME
-  const collectionAddress = ''
+const Manage = ({ ownerAddress, initialPage }: ManageNFTsServiceProps) => {
+  const { tokensByAddress } = useTokensByAddress({ ownerAddress })
+
   return (
     <PageWrapper direction="column" gap="x4">
       <Seo title={`Manage | ${ownerAddress}`}></Seo>
@@ -24,16 +24,11 @@ const Manage = ({ ownerAddress }: ManageNFTsServiceProps) => {
           '@1024': 'x2',
         }}
       />
-      {ownerAddress && (
-        <CollectionFilterProvider
-          ownerAddress={ownerAddress}
-          // contractAllowList={allAddresses}
-          // useFilterOwnerCollections
-          enableSidebarFilter={false}
-        >
-          <Collections collectionAddress={collectionAddress} />
-        </CollectionFilterProvider>
-      )}
+      <NFTGrid2
+        items={tokensByAddress || initialPage}
+        className={nftGridWrapper()}
+        isOwner={true}
+      />
     </PageWrapper>
   )
 }
diff --git a/services/collectionService.ts b/services/collectionService.ts
index 1768e43b..304dcc47 100644
--- a/services/collectionService.ts
+++ b/services/collectionService.ts
@@ -5,7 +5,6 @@ import { GetServerSideProps } from 'next'
 
 import * as Sentry from '@sentry/react'
 import { GetNFTReturnType, zdk } from '@shared'
-import { NFTObject } from '@zoralabs/nft-hooks'
 import {
   Collection,
   CollectionStatsAggregateQuery,
diff --git a/services/index.ts b/services/index.ts
index 32612862..6cce4064 100644
--- a/services/index.ts
+++ b/services/index.ts
@@ -1,3 +1,2 @@
-export * from './collectionService'
 export * from './manageNftsService'
 export * from './nftService'
diff --git a/services/manageNftsService.ts b/services/manageNftsService.ts
index d9099b3d..ef915578 100644
--- a/services/manageNftsService.ts
+++ b/services/manageNftsService.ts
@@ -1,13 +1,16 @@
 import { GetServerSideProps } from 'next'
+import { NounsTokensByOwnerAddressQuery } from 'types/zora.api.generated'
 
 import assert from 'assert'
 
-import { isAddress } from '@shared'
+import { TOKENS_BY_ADDRESS_QUERY } from 'data/tokensByAddress'
+
+import { isAddress, zoraApiFetcher } from '@shared'
 import { resolvePossibleENSAddress } from '@shared/utils/resolvePossibleENSAddress'
-import { NFTObject } from '@zoralabs/nft-hooks'
 
 export type ManageNFTsServiceProps = {
   ownerAddress: string
+  initialPage: NounsTokensByOwnerAddressQuery['tokens']['nodes']
 }
 
 type ManageParams = {
@@ -20,11 +23,6 @@ interface ManageNftsProps extends GetServerSideProps {
 
 export async function manageNftsService({ params }: ManageNftsProps) {
   assert(params, 'User template must provide a params object with an address')
-  /**
-   * This would be a fun one: we need to fetch all user nfts and filter them
-   * agains nounish addresses.
-   */
-  let initialPage: NFTObject[] | [] = []
 
   const ownerAddress = await resolvePossibleENSAddress(params.address)
 
@@ -35,9 +33,16 @@ export async function manageNftsService({ params }: ManageNftsProps) {
     }
   }
 
+  /**
+   * Currently no way to query tokens based on their `nounishness`, we just get all tokens
+   */
+  const resp = await zoraApiFetcher(TOKENS_BY_ADDRESS_QUERY, {
+    ownerAddress,
+  })
+
   return {
     props: {
-      initialPage,
+      initialPage: resp.tokens.nodes,
       ownerAddress,
     },
   }
diff --git a/typegen.ts b/typegen.ts
index d23278e5..03e6002b 100644
--- a/typegen.ts
+++ b/typegen.ts
@@ -12,6 +12,9 @@ const config: CodegenConfig = {
       plugins: ['typescript', 'typescript-operations'],
       config: {
         skipTypename: false,
+        nonOptionalTypename: true,
+        flattenGeneratedTypes: true,
+        flattenGeneratedTypesIncludeFragments: true,
       },
     },
     './graphql.schema.json': {
diff --git a/types/zora.api.generated.ts b/types/zora.api.generated.ts
index 0b8f04c1..accfcab6 100644
--- a/types/zora.api.generated.ts
+++ b/types/zora.api.generated.ts
@@ -19,7 +19,7 @@ export type Scalars = {
 }
 
 export type ActiveMarket = {
-  __typename?: 'ActiveMarket'
+  __typename: 'ActiveMarket'
   collectionAddress?: Maybe<Scalars['String']>
   marketAddress: Scalars['String']
   marketType: ActiveMarketType
@@ -53,7 +53,7 @@ export enum ActiveMarketType {
 }
 
 export type AggregateAttribute = {
-  __typename?: 'AggregateAttribute'
+  __typename: 'AggregateAttribute'
   traitType: Scalars['String']
   valueMetrics: Array<AggregateAttributeValue>
 }
@@ -70,7 +70,7 @@ export type AggregateAttributeSortKeySortInput = {
 }
 
 export type AggregateAttributeValue = {
-  __typename?: 'AggregateAttributeValue'
+  __typename: 'AggregateAttributeValue'
   count: Scalars['Int']
   percent: Scalars['Float']
   value: Scalars['String']
@@ -83,7 +83,7 @@ export type AggregateAttributesQueryInput = {
 }
 
 export type AggregateStat = {
-  __typename?: 'AggregateStat'
+  __typename: 'AggregateStat'
   floorPrice?: Maybe<Scalars['Float']>
   nftCount: Scalars['Int']
   ownerCount: Scalars['Int']
@@ -119,7 +119,7 @@ export type AggregateStatSalesVolumeArgs = {
 }
 
 export type ApprovalEvent = {
-  __typename?: 'ApprovalEvent'
+  __typename: 'ApprovalEvent'
   approvalEventType: ApprovalEventType
   approved?: Maybe<Scalars['Boolean']>
   approvedAddress: Scalars['String']
@@ -139,7 +139,7 @@ export type AttributeFilter = {
 }
 
 export type AudioEncodingTypes = {
-  __typename?: 'AudioEncodingTypes'
+  __typename: 'AudioEncodingTypes'
   large?: Maybe<Scalars['String']>
   original: Scalars['String']
 }
@@ -151,7 +151,7 @@ export enum Chain {
 }
 
 export type Collection = {
-  __typename?: 'Collection'
+  __typename: 'Collection'
   address: Scalars['String']
   attributes?: Maybe<Array<CollectionAttribute>>
   description: Scalars['String']
@@ -174,20 +174,20 @@ export type CollectionAddressOwnerAddressAttributesInput = {
 }
 
 export type CollectionAttribute = {
-  __typename?: 'CollectionAttribute'
+  __typename: 'CollectionAttribute'
   traitType?: Maybe<Scalars['String']>
   valueMetrics: Array<CollectionAttributeValue>
 }
 
 export type CollectionAttributeValue = {
-  __typename?: 'CollectionAttributeValue'
+  __typename: 'CollectionAttributeValue'
   count: Scalars['Int']
   percent: Scalars['Float']
   value: Scalars['String']
 }
 
 export type CollectionConnection = {
-  __typename?: 'CollectionConnection'
+  __typename: 'CollectionConnection'
   nodes: Array<Collection>
   pageInfo: PageInfo
 }
@@ -208,21 +208,21 @@ export type CollectionsQueryInput = {
 }
 
 export type Currency = {
-  __typename?: 'Currency'
+  __typename: 'Currency'
   address: Scalars['String']
   decimals: Scalars['Int']
   name: Scalars['String']
 }
 
 export type CurrencyAmount = {
-  __typename?: 'CurrencyAmount'
+  __typename: 'CurrencyAmount'
   currency: Currency
   decimal: Scalars['Float']
   raw: Scalars['String']
 }
 
 export type Event = {
-  __typename?: 'Event'
+  __typename: 'Event'
   collectionAddress?: Maybe<Scalars['String']>
   eventType: EventType
   networkInfo: NetworkInfo
@@ -232,7 +232,7 @@ export type Event = {
 }
 
 export type EventConnection = {
-  __typename?: 'EventConnection'
+  __typename: 'EventConnection'
   nodes: Array<Event>
   pageInfo: PageInfo
 }
@@ -292,7 +292,7 @@ export type EventsQueryInput = {
 }
 
 export type ImageEncodingTypes = {
-  __typename?: 'ImageEncodingTypes'
+  __typename: 'ImageEncodingTypes'
   large?: Maybe<Scalars['String']>
   original: Scalars['String']
   poster?: Maybe<Scalars['String']>
@@ -303,7 +303,7 @@ export type ImageEncodingTypesVideoEncodingTypesAudioEncodingTypesUnsupportedEnc
   AudioEncodingTypes | ImageEncodingTypes | UnsupportedEncodingTypes | VideoEncodingTypes
 
 export type LilNounsAuction = {
-  __typename?: 'LilNounsAuction'
+  __typename: 'LilNounsAuction'
   address: Scalars['String']
   amount?: Maybe<PriceAtTime>
   auctionCurrency: Scalars['String']
@@ -324,7 +324,7 @@ export type LilNounsAuction = {
 }
 
 export type LilNounsAuctionBidEventProperties = {
-  __typename?: 'LilNounsAuctionBidEventProperties'
+  __typename: 'LilNounsAuctionBidEventProperties'
   extended: Scalars['Boolean']
   lilNounId: Scalars['String']
   sender: Scalars['String']
@@ -332,14 +332,14 @@ export type LilNounsAuctionBidEventProperties = {
 }
 
 export type LilNounsAuctionCreatedEventProperties = {
-  __typename?: 'LilNounsAuctionCreatedEventProperties'
+  __typename: 'LilNounsAuctionCreatedEventProperties'
   endTime: Scalars['String']
   lilNounId: Scalars['String']
   startTime: Scalars['String']
 }
 
 export type LilNounsAuctionEvent = {
-  __typename?: 'LilNounsAuctionEvent'
+  __typename: 'LilNounsAuctionEvent'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   lilNounsAuctionEventType: LilNounsAuctionEventType
@@ -367,23 +367,23 @@ export enum LilNounsAuctionEventType {
 }
 
 export type LilNounsAuctionExtendedEventProperties = {
-  __typename?: 'LilNounsAuctionExtendedEventProperties'
+  __typename: 'LilNounsAuctionExtendedEventProperties'
   endTime: Scalars['String']
   lilNounId: Scalars['String']
 }
 
 export type LilNounsAuctionMinBidIncrementPercentageUpdatedEventProperties = {
-  __typename?: 'LilNounsAuctionMinBidIncrementPercentageUpdatedEventProperties'
+  __typename: 'LilNounsAuctionMinBidIncrementPercentageUpdatedEventProperties'
   minBidIncrementPercentage: Scalars['String']
 }
 
 export type LilNounsAuctionReservePriceUpdatedEventProperties = {
-  __typename?: 'LilNounsAuctionReservePriceUpdatedEventProperties'
+  __typename: 'LilNounsAuctionReservePriceUpdatedEventProperties'
   reservePrice: Scalars['String']
 }
 
 export type LilNounsAuctionSettledEventProperties = {
-  __typename?: 'LilNounsAuctionSettledEventProperties'
+  __typename: 'LilNounsAuctionSettledEventProperties'
   amount: Scalars['String']
   lilNounId: Scalars['String']
   price: PriceAtTime
@@ -391,12 +391,12 @@ export type LilNounsAuctionSettledEventProperties = {
 }
 
 export type LilNounsAuctionTimeBufferUpdatedEventProperties = {
-  __typename?: 'LilNounsAuctionTimeBufferUpdatedEventProperties'
+  __typename: 'LilNounsAuctionTimeBufferUpdatedEventProperties'
   timeBuffer: Scalars['String']
 }
 
 export type Market = {
-  __typename?: 'Market'
+  __typename: 'Market'
   collectionAddress?: Maybe<Scalars['String']>
   marketAddress: Scalars['String']
   marketType: MarketType
@@ -464,13 +464,13 @@ export type MarketTypeFilter = {
 }
 
 export type MarketWithToken = {
-  __typename?: 'MarketWithToken'
+  __typename: 'MarketWithToken'
   market: Market
   token?: Maybe<Token>
 }
 
 export type MarketWithTokenConnection = {
-  __typename?: 'MarketWithTokenConnection'
+  __typename: 'MarketWithTokenConnection'
   nodes: Array<MarketWithToken>
   pageInfo: PageInfo
 }
@@ -495,7 +495,7 @@ export enum MediaType {
 }
 
 export type Mint = {
-  __typename?: 'Mint'
+  __typename: 'Mint'
   collectionAddress: Scalars['String']
   networkInfo: NetworkInfo
   originatorAddress: Scalars['String']
@@ -506,7 +506,7 @@ export type Mint = {
 }
 
 export type MintEvent = {
-  __typename?: 'MintEvent'
+  __typename: 'MintEvent'
   collectionAddress: Scalars['String']
   originatorAddress: Scalars['String']
   price?: Maybe<PriceAtTime>
@@ -515,7 +515,7 @@ export type MintEvent = {
 }
 
 export type MintInfo = {
-  __typename?: 'MintInfo'
+  __typename: 'MintInfo'
   mintContext: TransactionInfo
   originatorAddress: Scalars['String']
   price?: Maybe<PriceAtTime>
@@ -535,7 +535,7 @@ export type MintSortKeySortInput = {
 }
 
 export type MintWithTokenAndMarkets = {
-  __typename?: 'MintWithTokenAndMarkets'
+  __typename: 'MintWithTokenAndMarkets'
   markets: Array<Market>
   mint: Mint
   token?: Maybe<Token>
@@ -548,7 +548,7 @@ export type MintWithTokenAndMarketsMarketsArgs = {
 }
 
 export type MintWithTokenAndMarketsConnection = {
-  __typename?: 'MintWithTokenAndMarketsConnection'
+  __typename: 'MintWithTokenAndMarketsConnection'
   nodes: Array<MintWithTokenAndMarkets>
   pageInfo: PageInfo
 }
@@ -570,7 +570,7 @@ export enum Network {
 }
 
 export type NetworkInfo = {
-  __typename?: 'NetworkInfo'
+  __typename: 'NetworkInfo'
   chain: Chain
   network: Network
 }
@@ -581,7 +581,7 @@ export type NetworkInput = {
 }
 
 export type Nouns = {
-  __typename?: 'Nouns'
+  __typename: 'Nouns'
   nounsActiveMarket?: Maybe<NounsBuilderAuction>
   nounsDaos: NounsDaoConnection
   nounsEvents: NounsEventConnection
@@ -621,7 +621,7 @@ export type NounsActiveMarketQueryInput = {
 }
 
 export type NounsAuction = {
-  __typename?: 'NounsAuction'
+  __typename: 'NounsAuction'
   address: Scalars['String']
   amount?: Maybe<PriceAtTime>
   auctionCurrency: Scalars['String']
@@ -642,7 +642,7 @@ export type NounsAuction = {
 }
 
 export type NounsAuctionBidEventProperties = {
-  __typename?: 'NounsAuctionBidEventProperties'
+  __typename: 'NounsAuctionBidEventProperties'
   extended: Scalars['Boolean']
   nounId: Scalars['String']
   sender: Scalars['String']
@@ -650,14 +650,14 @@ export type NounsAuctionBidEventProperties = {
 }
 
 export type NounsAuctionCreatedEventProperties = {
-  __typename?: 'NounsAuctionCreatedEventProperties'
+  __typename: 'NounsAuctionCreatedEventProperties'
   endTime: Scalars['String']
   nounId: Scalars['String']
   startTime: Scalars['String']
 }
 
 export type NounsAuctionEvent = {
-  __typename?: 'NounsAuctionEvent'
+  __typename: 'NounsAuctionEvent'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   nounsAuctionEventType: NounsAuctionEventType
@@ -685,23 +685,23 @@ export enum NounsAuctionEventType {
 }
 
 export type NounsAuctionExtendedEventProperties = {
-  __typename?: 'NounsAuctionExtendedEventProperties'
+  __typename: 'NounsAuctionExtendedEventProperties'
   endTime: Scalars['String']
   nounId: Scalars['String']
 }
 
 export type NounsAuctionMinBidIncrementPercentageUpdatedEventProperties = {
-  __typename?: 'NounsAuctionMinBidIncrementPercentageUpdatedEventProperties'
+  __typename: 'NounsAuctionMinBidIncrementPercentageUpdatedEventProperties'
   minBidIncrementPercentage: Scalars['String']
 }
 
 export type NounsAuctionReservePriceUpdatedEventProperties = {
-  __typename?: 'NounsAuctionReservePriceUpdatedEventProperties'
+  __typename: 'NounsAuctionReservePriceUpdatedEventProperties'
   reservePrice: Scalars['String']
 }
 
 export type NounsAuctionSettledEventProperties = {
-  __typename?: 'NounsAuctionSettledEventProperties'
+  __typename: 'NounsAuctionSettledEventProperties'
   amount: Scalars['String']
   nounId: Scalars['String']
   price: PriceAtTime
@@ -709,12 +709,12 @@ export type NounsAuctionSettledEventProperties = {
 }
 
 export type NounsAuctionTimeBufferUpdatedEventProperties = {
-  __typename?: 'NounsAuctionTimeBufferUpdatedEventProperties'
+  __typename: 'NounsAuctionTimeBufferUpdatedEventProperties'
   timeBuffer: Scalars['String']
 }
 
 export type NounsBuilderAuction = {
-  __typename?: 'NounsBuilderAuction'
+  __typename: 'NounsBuilderAuction'
   address: Scalars['String']
   amount?: Maybe<PriceAtTime>
   auction?: Maybe<Scalars['String']>
@@ -742,7 +742,7 @@ export type NounsBuilderAuction = {
 }
 
 export type NounsBuilderAuctionAuctionBidEventProperties = {
-  __typename?: 'NounsBuilderAuctionAuctionBidEventProperties'
+  __typename: 'NounsBuilderAuctionAuctionBidEventProperties'
   amount: Scalars['String']
   amountPrice: PriceAtTime
   bidder: Scalars['String']
@@ -752,14 +752,14 @@ export type NounsBuilderAuctionAuctionBidEventProperties = {
 }
 
 export type NounsBuilderAuctionAuctionCreatedEventProperties = {
-  __typename?: 'NounsBuilderAuctionAuctionCreatedEventProperties'
+  __typename: 'NounsBuilderAuctionAuctionCreatedEventProperties'
   endTime: Scalars['String']
   startTime: Scalars['String']
   tokenId: Scalars['String']
 }
 
 export type NounsBuilderAuctionAuctionSettledEventProperties = {
-  __typename?: 'NounsBuilderAuctionAuctionSettledEventProperties'
+  __typename: 'NounsBuilderAuctionAuctionSettledEventProperties'
   amount: Scalars['String']
   amountPrice: PriceAtTime
   tokenId: Scalars['String']
@@ -767,18 +767,18 @@ export type NounsBuilderAuctionAuctionSettledEventProperties = {
 }
 
 export type NounsBuilderAuctionConnection = {
-  __typename?: 'NounsBuilderAuctionConnection'
+  __typename: 'NounsBuilderAuctionConnection'
   nodes: Array<NounsBuilderAuction>
   pageInfo: PageInfo
 }
 
 export type NounsBuilderAuctionDurationUpdatedEventProperties = {
-  __typename?: 'NounsBuilderAuctionDurationUpdatedEventProperties'
+  __typename: 'NounsBuilderAuctionDurationUpdatedEventProperties'
   duration: Scalars['String']
 }
 
 export type NounsBuilderAuctionEvent = {
-  __typename?: 'NounsBuilderAuctionEvent'
+  __typename: 'NounsBuilderAuctionEvent'
   address: Scalars['String']
   auction: Scalars['String']
   collectionAddress: Scalars['String']
@@ -810,23 +810,23 @@ export enum NounsBuilderAuctionEventType {
 }
 
 export type NounsBuilderAuctionMinBidIncrementPercentageUpdatedEventProperties = {
-  __typename?: 'NounsBuilderAuctionMinBidIncrementPercentageUpdatedEventProperties'
+  __typename: 'NounsBuilderAuctionMinBidIncrementPercentageUpdatedEventProperties'
   minBidIncrementPercentage: Scalars['String']
 }
 
 export type NounsBuilderAuctionReservePriceUpdatedEventProperties = {
-  __typename?: 'NounsBuilderAuctionReservePriceUpdatedEventProperties'
+  __typename: 'NounsBuilderAuctionReservePriceUpdatedEventProperties'
   reserve: Scalars['String']
   reservePrice: PriceAtTime
 }
 
 export type NounsBuilderAuctionTimeBufferUpdatedEventProperties = {
-  __typename?: 'NounsBuilderAuctionTimeBufferUpdatedEventProperties'
+  __typename: 'NounsBuilderAuctionTimeBufferUpdatedEventProperties'
   timeBuffer: Scalars['String']
 }
 
 export type NounsBuilderGovernorEvent = {
-  __typename?: 'NounsBuilderGovernorEvent'
+  __typename: 'NounsBuilderGovernorEvent'
   address: Scalars['String']
   auction: Scalars['String']
   collectionAddress: Scalars['String']
@@ -866,12 +866,12 @@ export enum NounsBuilderGovernorEventType {
 }
 
 export type NounsBuilderGovernorProposalCanceledEventProperties = {
-  __typename?: 'NounsBuilderGovernorProposalCanceledEventProperties'
+  __typename: 'NounsBuilderGovernorProposalCanceledEventProperties'
   proposalId: Scalars['String']
 }
 
 export type NounsBuilderGovernorProposalCreatedEventProperties = {
-  __typename?: 'NounsBuilderGovernorProposalCreatedEventProperties'
+  __typename: 'NounsBuilderGovernorProposalCreatedEventProperties'
   abstainVotes: Scalars['String']
   againstVotes: Scalars['String']
   calldatas: Array<Scalars['String']>
@@ -893,41 +893,41 @@ export type NounsBuilderGovernorProposalCreatedEventProperties = {
 }
 
 export type NounsBuilderGovernorProposalExecutedEventProperties = {
-  __typename?: 'NounsBuilderGovernorProposalExecutedEventProperties'
+  __typename: 'NounsBuilderGovernorProposalExecutedEventProperties'
   proposalId: Scalars['String']
 }
 
 export type NounsBuilderGovernorProposalQueuedEventProperties = {
-  __typename?: 'NounsBuilderGovernorProposalQueuedEventProperties'
+  __typename: 'NounsBuilderGovernorProposalQueuedEventProperties'
   eta: Scalars['String']
   proposalId: Scalars['String']
 }
 
 export type NounsBuilderGovernorProposalThresholdBpsUpdatedEventProperties = {
-  __typename?: 'NounsBuilderGovernorProposalThresholdBpsUpdatedEventProperties'
+  __typename: 'NounsBuilderGovernorProposalThresholdBpsUpdatedEventProperties'
   newBps: Scalars['String']
   prevBps: Scalars['String']
 }
 
 export type NounsBuilderGovernorProposalVetoedEventProperties = {
-  __typename?: 'NounsBuilderGovernorProposalVetoedEventProperties'
+  __typename: 'NounsBuilderGovernorProposalVetoedEventProperties'
   proposalId: Scalars['String']
 }
 
 export type NounsBuilderGovernorQuorumVotesBpsUpdated = {
-  __typename?: 'NounsBuilderGovernorQuorumVotesBpsUpdated'
+  __typename: 'NounsBuilderGovernorQuorumVotesBpsUpdated'
   newBps: Scalars['String']
   prevBps: Scalars['String']
 }
 
 export type NounsBuilderGovernorVetoerUpdatedEventProperties = {
-  __typename?: 'NounsBuilderGovernorVetoerUpdatedEventProperties'
+  __typename: 'NounsBuilderGovernorVetoerUpdatedEventProperties'
   newVetoer: Scalars['String']
   prevVetoer: Scalars['String']
 }
 
 export type NounsBuilderGovernorVoteCastEventProperties = {
-  __typename?: 'NounsBuilderGovernorVoteCastEventProperties'
+  __typename: 'NounsBuilderGovernorVoteCastEventProperties'
   proposalId: Scalars['String']
   reason: Scalars['String']
   support: Scalars['String']
@@ -936,19 +936,19 @@ export type NounsBuilderGovernorVoteCastEventProperties = {
 }
 
 export type NounsBuilderGovernorVotingDelayUpdatedEventProperties = {
-  __typename?: 'NounsBuilderGovernorVotingDelayUpdatedEventProperties'
+  __typename: 'NounsBuilderGovernorVotingDelayUpdatedEventProperties'
   newVotingDelay: Scalars['String']
   prevVotingDelay: Scalars['String']
 }
 
 export type NounsBuilderGovernorVotingPeriodUpdatedEventProperties = {
-  __typename?: 'NounsBuilderGovernorVotingPeriodUpdatedEventProperties'
+  __typename: 'NounsBuilderGovernorVotingPeriodUpdatedEventProperties'
   newVotingPeriod: Scalars['String']
   prevVotingPeriod: Scalars['String']
 }
 
 export type NounsBuilderManagerDaoDeployedEventProperties = {
-  __typename?: 'NounsBuilderManagerDaoDeployedEventProperties'
+  __typename: 'NounsBuilderManagerDaoDeployedEventProperties'
   auction: Scalars['String']
   governor: Scalars['String']
   metadata: Scalars['String']
@@ -957,7 +957,7 @@ export type NounsBuilderManagerDaoDeployedEventProperties = {
 }
 
 export type NounsBuilderManagerEvent = {
-  __typename?: 'NounsBuilderManagerEvent'
+  __typename: 'NounsBuilderManagerEvent'
   address: Scalars['String']
   nounsBuilderManagerEventType: NounsBuilderManagerEventType
   properties: NounsBuilderManagerDaoDeployedEventProperties
@@ -968,7 +968,7 @@ export enum NounsBuilderManagerEventType {
 }
 
 export type NounsDao = {
-  __typename?: 'NounsDao'
+  __typename: 'NounsDao'
   auctionAddress?: Maybe<Scalars['String']>
   collectionAddress: Scalars['String']
   contractAddress?: Maybe<Scalars['String']>
@@ -983,13 +983,13 @@ export type NounsDao = {
 }
 
 export type NounsDaoConnection = {
-  __typename?: 'NounsDaoConnection'
+  __typename: 'NounsDaoConnection'
   nodes: Array<NounsDao>
   pageInfo: PageInfo
 }
 
 export type NounsEvent = {
-  __typename?: 'NounsEvent'
+  __typename: 'NounsEvent'
   collectionAddress: Scalars['String']
   eventType: NounsEventType
   networkInfo: NetworkInfo
@@ -998,7 +998,7 @@ export type NounsEvent = {
 }
 
 export type NounsEventConnection = {
-  __typename?: 'NounsEventConnection'
+  __typename: 'NounsEventConnection'
   nodes: Array<NounsEvent>
   pageInfo: PageInfo
 }
@@ -1064,7 +1064,7 @@ export type NounsSortKeySortInput = {
 }
 
 export type OffchainOrder = {
-  __typename?: 'OffchainOrder'
+  __typename: 'OffchainOrder'
   calldata?: Maybe<Scalars['String']>
   collectionAddress?: Maybe<Scalars['String']>
   contractAddress: Scalars['String']
@@ -1092,13 +1092,13 @@ export type OffchainOrderSortKeySortInput = {
 }
 
 export type OffchainOrderWithToken = {
-  __typename?: 'OffchainOrderWithToken'
+  __typename: 'OffchainOrderWithToken'
   offchainOrder: OffchainOrder
   token?: Maybe<Token>
 }
 
 export type OffchainOrderWithTokenConnection = {
-  __typename?: 'OffchainOrderWithTokenConnection'
+  __typename: 'OffchainOrderWithTokenConnection'
   nodes: Array<OffchainOrderWithToken>
   pageInfo: PageInfo
 }
@@ -1114,14 +1114,14 @@ export type OffchainOrdersQueryInput = {
 }
 
 export type OwnerCount = {
-  __typename?: 'OwnerCount'
+  __typename: 'OwnerCount'
   count: Scalars['Int']
   owner: Scalars['String']
   tokenIds: Array<Scalars['String']>
 }
 
 export type OwnerCountConnection = {
-  __typename?: 'OwnerCountConnection'
+  __typename: 'OwnerCountConnection'
   nodes: Array<OwnerCount>
   pageInfo: PageInfo
 }
@@ -1133,7 +1133,7 @@ export type OwnersByCountQueryInput = {
 }
 
 export type PageInfo = {
-  __typename?: 'PageInfo'
+  __typename: 'PageInfo'
   endCursor?: Maybe<Scalars['String']>
   hasNextPage: Scalars['Boolean']
   limit: Scalars['Int']
@@ -1145,7 +1145,7 @@ export type PaginationInput = {
 }
 
 export type PriceAtTime = {
-  __typename?: 'PriceAtTime'
+  __typename: 'PriceAtTime'
   blockNumber: Scalars['Int']
   chainTokenPrice?: Maybe<CurrencyAmount>
   nativePrice: CurrencyAmount
@@ -1161,7 +1161,7 @@ export type PriceFilter = {
 }
 
 export type ReceivedItem = {
-  __typename?: 'ReceivedItem'
+  __typename: 'ReceivedItem'
   address: Scalars['String']
   amount: Scalars['String']
   itemType: Scalars['String']
@@ -1171,7 +1171,7 @@ export type ReceivedItem = {
 }
 
 export type RootQuery = {
-  __typename?: 'RootQuery'
+  __typename: 'RootQuery'
   /** Gets the total set of NFT attributes */
   aggregateAttributes: Array<AggregateAttribute>
   /** Gets counts, sales volume, and other statistics */
@@ -1202,7 +1202,7 @@ export type RootQuery = {
 
 export type RootQueryAggregateAttributesArgs = {
   networks?: InputMaybe<Array<NetworkInput>>
-  sort: AggregateAttributeSortKeySortInput
+  sort?: InputMaybe<AggregateAttributeSortKeySortInput>
   where: AggregateAttributesQueryInput
 }
 
@@ -1278,7 +1278,7 @@ export type RootQueryTokensArgs = {
 }
 
 export type Sale = {
-  __typename?: 'Sale'
+  __typename: 'Sale'
   buyerAddress: Scalars['String']
   collectionAddress: Scalars['String']
   networkInfo: NetworkInfo
@@ -1321,13 +1321,13 @@ export enum SaleType {
 }
 
 export type SaleWithToken = {
-  __typename?: 'SaleWithToken'
+  __typename: 'SaleWithToken'
   sale: Sale
   token?: Maybe<Token>
 }
 
 export type SaleWithTokenConnection = {
-  __typename?: 'SaleWithTokenConnection'
+  __typename: 'SaleWithTokenConnection'
   nodes: Array<SaleWithToken>
   pageInfo: PageInfo
 }
@@ -1346,7 +1346,7 @@ export type SalesQueryInput = {
 }
 
 export type SalesVolume = {
-  __typename?: 'SalesVolume'
+  __typename: 'SalesVolume'
   chainTokenPrice: Scalars['Float']
   totalCount: Scalars['Int']
   usdcPrice: Scalars['Float']
@@ -1358,12 +1358,12 @@ export type SalesVolumeFilter = {
 }
 
 export type SeaportCounterIncrementedProperties = {
-  __typename?: 'SeaportCounterIncrementedProperties'
+  __typename: 'SeaportCounterIncrementedProperties'
   newCounter: Scalars['String']
 }
 
 export type SeaportEvent = {
-  __typename?: 'SeaportEvent'
+  __typename: 'SeaportEvent'
   address: Scalars['String']
   eventType: SeaportEventType
   offerer: Scalars['String']
@@ -1384,7 +1384,7 @@ export enum SeaportEventType {
 }
 
 export type SeaportOrder = {
-  __typename?: 'SeaportOrder'
+  __typename: 'SeaportOrder'
   conduitKey: Scalars['String']
   considerations: Array<SeaportOrderItem>
   counter: Scalars['String']
@@ -1403,14 +1403,14 @@ export type SeaportOrder = {
 }
 
 export type SeaportOrderFulfilledProperties = {
-  __typename?: 'SeaportOrderFulfilledProperties'
+  __typename: 'SeaportOrderFulfilledProperties'
   consideration: Array<ReceivedItem>
   offer: Array<SpentItem>
   recipient: Scalars['String']
 }
 
 export type SeaportOrderItem = {
-  __typename?: 'SeaportOrderItem'
+  __typename: 'SeaportOrderItem'
   address: Scalars['String']
   criteria?: Maybe<Scalars['String']>
   endAmount: Scalars['String']
@@ -1437,7 +1437,7 @@ export type SearchQueryInput = {
 }
 
 export type SearchResult = {
-  __typename?: 'SearchResult'
+  __typename: 'SearchResult'
   collectionAddress: Scalars['String']
   description?: Maybe<Scalars['String']>
   entity?: Maybe<TokenCollection>
@@ -1448,7 +1448,7 @@ export type SearchResult = {
 }
 
 export type SearchResultConnection = {
-  __typename?: 'SearchResultConnection'
+  __typename: 'SearchResultConnection'
   nodes: Array<SearchResult>
   pageInfo: PageInfo
 }
@@ -1464,7 +1464,7 @@ export enum SortDirection {
 }
 
 export type SpentItem = {
-  __typename?: 'SpentItem'
+  __typename: 'SpentItem'
   address: Scalars['String']
   amount: Scalars['String']
   itemType: Scalars['String']
@@ -1483,7 +1483,7 @@ export type TimeFilter = {
 }
 
 export type Token = {
-  __typename?: 'Token'
+  __typename: 'Token'
   attributes?: Maybe<Array<TokenAttribute>>
   collectionAddress: Scalars['String']
   collectionName?: Maybe<Scalars['String']>
@@ -1504,7 +1504,7 @@ export type Token = {
 }
 
 export type TokenAttribute = {
-  __typename?: 'TokenAttribute'
+  __typename: 'TokenAttribute'
   displayType?: Maybe<Scalars['String']>
   traitType?: Maybe<Scalars['String']>
   value?: Maybe<Scalars['String']>
@@ -1513,7 +1513,7 @@ export type TokenAttribute = {
 export type TokenCollection = Collection | Token
 
 export type TokenContentMedia = {
-  __typename?: 'TokenContentMedia'
+  __typename: 'TokenContentMedia'
   mediaEncoding?: Maybe<ImageEncodingTypesVideoEncodingTypesAudioEncodingTypesUnsupportedEncodingTypes>
   mimeType?: Maybe<Scalars['String']>
   size?: Maybe<Scalars['String']>
@@ -1521,7 +1521,7 @@ export type TokenContentMedia = {
 }
 
 export type TokenContract = {
-  __typename?: 'TokenContract'
+  __typename: 'TokenContract'
   chain: Scalars['Int']
   collectionAddress: Scalars['String']
   description?: Maybe<Scalars['String']>
@@ -1558,7 +1558,7 @@ export enum TokenStandard {
 }
 
 export type TokenWithFullMarketHistory = {
-  __typename?: 'TokenWithFullMarketHistory'
+  __typename: 'TokenWithFullMarketHistory'
   events: Array<Event>
   markets: Array<Market>
   sales: Array<Sale>
@@ -1584,7 +1584,7 @@ export type TokenWithFullMarketHistorySalesArgs = {
 }
 
 export type TokenWithMarketsSummary = {
-  __typename?: 'TokenWithMarketsSummary'
+  __typename: 'TokenWithMarketsSummary'
   events: Array<Event>
   marketsSummary: Array<Market>
   sales: Array<Sale>
@@ -1604,7 +1604,7 @@ export type TokenWithMarketsSummarySalesArgs = {
 }
 
 export type TokenWithMarketsSummaryConnection = {
-  __typename?: 'TokenWithMarketsSummaryConnection'
+  __typename: 'TokenWithMarketsSummaryConnection'
   nodes: Array<TokenWithMarketsSummary>
   pageInfo: PageInfo
 }
@@ -1624,7 +1624,7 @@ export type TokensQueryInput = {
 }
 
 export type TransactionInfo = {
-  __typename?: 'TransactionInfo'
+  __typename: 'TransactionInfo'
   blockNumber: Scalars['Int']
   blockTimestamp: Scalars['datetime']
   logIndex?: Maybe<Scalars['Int']>
@@ -1632,7 +1632,7 @@ export type TransactionInfo = {
 }
 
 export type TransferEvent = {
-  __typename?: 'TransferEvent'
+  __typename: 'TransferEvent'
   collectionAddress: Scalars['String']
   fromAddress: Scalars['String']
   toAddress: Scalars['String']
@@ -1640,12 +1640,12 @@ export type TransferEvent = {
 }
 
 export type UnsupportedEncodingTypes = {
-  __typename?: 'UnsupportedEncodingTypes'
+  __typename: 'UnsupportedEncodingTypes'
   original: Scalars['String']
 }
 
 export type V1Ask = {
-  __typename?: 'V1Ask'
+  __typename: 'V1Ask'
   address: Scalars['String']
   amount: PriceAtTime
   collectionAddress: Scalars['String']
@@ -1656,7 +1656,7 @@ export type V1Ask = {
 }
 
 export type V1BidShare = {
-  __typename?: 'V1BidShare'
+  __typename: 'V1BidShare'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   creator: Scalars['String']
@@ -1667,28 +1667,28 @@ export type V1BidShare = {
 }
 
 export type V1MarketAskCreatedEventProperties = {
-  __typename?: 'V1MarketAskCreatedEventProperties'
+  __typename: 'V1MarketAskCreatedEventProperties'
   amount: Scalars['String']
   currency: Scalars['String']
   price: PriceAtTime
 }
 
 export type V1MarketAskRemovedEventProperties = {
-  __typename?: 'V1MarketAskRemovedEventProperties'
+  __typename: 'V1MarketAskRemovedEventProperties'
   amount: Scalars['String']
   currency: Scalars['String']
   price: PriceAtTime
 }
 
 export type V1MarketBidShareUpdatedEventProperties = {
-  __typename?: 'V1MarketBidShareUpdatedEventProperties'
+  __typename: 'V1MarketBidShareUpdatedEventProperties'
   creator: Scalars['String']
   owner: Scalars['String']
   previousOwner: Scalars['String']
 }
 
 export type V1MarketEvent = {
-  __typename?: 'V1MarketEvent'
+  __typename: 'V1MarketEvent'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   properties: V1MarketEventProperties
@@ -1714,7 +1714,7 @@ export enum V1MarketEventType {
 }
 
 export type V1MarketOfferCreatedEventProperties = {
-  __typename?: 'V1MarketOfferCreatedEventProperties'
+  __typename: 'V1MarketOfferCreatedEventProperties'
   amount: Scalars['String']
   bidder: Scalars['String']
   currency: Scalars['String']
@@ -1724,7 +1724,7 @@ export type V1MarketOfferCreatedEventProperties = {
 }
 
 export type V1MarketOfferFinalizedEventProperties = {
-  __typename?: 'V1MarketOfferFinalizedEventProperties'
+  __typename: 'V1MarketOfferFinalizedEventProperties'
   amount: Scalars['String']
   bidder: Scalars['String']
   currency: Scalars['String']
@@ -1734,7 +1734,7 @@ export type V1MarketOfferFinalizedEventProperties = {
 }
 
 export type V1MarketOfferRemovedEventProperties = {
-  __typename?: 'V1MarketOfferRemovedEventProperties'
+  __typename: 'V1MarketOfferRemovedEventProperties'
   amount: Scalars['String']
   bidder: Scalars['String']
   currency: Scalars['String']
@@ -1744,7 +1744,7 @@ export type V1MarketOfferRemovedEventProperties = {
 }
 
 export type V1MediaEvent = {
-  __typename?: 'V1MediaEvent'
+  __typename: 'V1MediaEvent'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   eventType: V1MediaEventType
@@ -1759,7 +1759,7 @@ export enum V1MediaEventType {
 }
 
 export type V1Offer = {
-  __typename?: 'V1Offer'
+  __typename: 'V1Offer'
   address: Scalars['String']
   amount: PriceAtTime
   bidder: Scalars['String']
@@ -1772,7 +1772,7 @@ export type V1Offer = {
 }
 
 export type V2Auction = {
-  __typename?: 'V2Auction'
+  __typename: 'V2Auction'
   address: Scalars['String']
   amountCuratorReceived?: Maybe<PriceAtTime>
   amountTokenOwnerReceived?: Maybe<PriceAtTime>
@@ -1794,12 +1794,12 @@ export type V2Auction = {
 }
 
 export type V2AuctionApprovalUpdatedEventProperties = {
-  __typename?: 'V2AuctionApprovalUpdatedEventProperties'
+  __typename: 'V2AuctionApprovalUpdatedEventProperties'
   approved: Scalars['Boolean']
 }
 
 export type V2AuctionBidEventProperties = {
-  __typename?: 'V2AuctionBidEventProperties'
+  __typename: 'V2AuctionBidEventProperties'
   extended: Scalars['Boolean']
   firstBid: Scalars['Boolean']
   price: PriceAtTime
@@ -1808,12 +1808,12 @@ export type V2AuctionBidEventProperties = {
 }
 
 export type V2AuctionCanceledEventProperties = {
-  __typename?: 'V2AuctionCanceledEventProperties'
+  __typename: 'V2AuctionCanceledEventProperties'
   tokenOwner: Scalars['String']
 }
 
 export type V2AuctionCreatedEventProperties = {
-  __typename?: 'V2AuctionCreatedEventProperties'
+  __typename: 'V2AuctionCreatedEventProperties'
   auctionCurrency: Scalars['String']
   curator: Scalars['String']
   curatorFeePercentage: Scalars['Int']
@@ -1824,12 +1824,12 @@ export type V2AuctionCreatedEventProperties = {
 }
 
 export type V2AuctionDurationExtendedEventProperties = {
-  __typename?: 'V2AuctionDurationExtendedEventProperties'
+  __typename: 'V2AuctionDurationExtendedEventProperties'
   duration: Scalars['String']
 }
 
 export type V2AuctionEndedEventProperties = {
-  __typename?: 'V2AuctionEndedEventProperties'
+  __typename: 'V2AuctionEndedEventProperties'
   amount: Scalars['String']
   auctionCurrency: Scalars['String']
   curator: Scalars['String']
@@ -1839,7 +1839,7 @@ export type V2AuctionEndedEventProperties = {
 }
 
 export type V2AuctionEvent = {
-  __typename?: 'V2AuctionEvent'
+  __typename: 'V2AuctionEvent'
   address: Scalars['String']
   auctionId: Scalars['Int']
   collectionAddress: Scalars['String']
@@ -1868,13 +1868,13 @@ export enum V2AuctionEventType {
 }
 
 export type V2AuctionReservePriceUpdatedEventProperties = {
-  __typename?: 'V2AuctionReservePriceUpdatedEventProperties'
+  __typename: 'V2AuctionReservePriceUpdatedEventProperties'
   price: PriceAtTime
   reservePrice: Scalars['String']
 }
 
 export type V3Ask = {
-  __typename?: 'V3Ask'
+  __typename: 'V3Ask'
   address: Scalars['String']
   askCurrency: Scalars['String']
   askPrice: PriceAtTime
@@ -1889,7 +1889,7 @@ export type V3Ask = {
 }
 
 export type V3AskCanceledEventProperties = {
-  __typename?: 'V3AskCanceledEventProperties'
+  __typename: 'V3AskCanceledEventProperties'
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
   findersFeeBps: Scalars['Int']
@@ -1899,7 +1899,7 @@ export type V3AskCanceledEventProperties = {
 }
 
 export type V3AskCreatedEventProperties = {
-  __typename?: 'V3AskCreatedEventProperties'
+  __typename: 'V3AskCreatedEventProperties'
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
   findersFeeBps: Scalars['Int']
@@ -1909,7 +1909,7 @@ export type V3AskCreatedEventProperties = {
 }
 
 export type V3AskEvent = {
-  __typename?: 'V3AskEvent'
+  __typename: 'V3AskEvent'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   properties: V3AskEventProperties
@@ -1944,7 +1944,7 @@ export enum V3AskEventType {
 }
 
 export type V3AskFilledEventProperties = {
-  __typename?: 'V3AskFilledEventProperties'
+  __typename: 'V3AskFilledEventProperties'
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
   buyer: Scalars['String']
@@ -1956,7 +1956,7 @@ export type V3AskFilledEventProperties = {
 }
 
 export type V3AskPriceUpdatedEventProperties = {
-  __typename?: 'V3AskPriceUpdatedEventProperties'
+  __typename: 'V3AskPriceUpdatedEventProperties'
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
   findersFeeBps: Scalars['Int']
@@ -1966,7 +1966,7 @@ export type V3AskPriceUpdatedEventProperties = {
 }
 
 export type V3AsksCoreEthAskEventProperties = {
-  __typename?: 'V3AsksCoreEthAskEventProperties'
+  __typename: 'V3AsksCoreEthAskEventProperties'
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
   price: PriceAtTime
@@ -1976,7 +1976,7 @@ export type V3AsksCoreEthAskEventProperties = {
 }
 
 export type V3AsksCoreEthAskFilledEventProperties = {
-  __typename?: 'V3AsksCoreEthAskFilledEventProperties'
+  __typename: 'V3AsksCoreEthAskFilledEventProperties'
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
   buyer: Scalars['String']
@@ -1987,7 +1987,7 @@ export type V3AsksCoreEthAskFilledEventProperties = {
 }
 
 export type V3AsksCoreEthRoyaltyPayoutEventProperties = {
-  __typename?: 'V3AsksCoreEthRoyaltyPayoutEventProperties'
+  __typename: 'V3AsksCoreEthRoyaltyPayoutEventProperties'
   amount: PriceAtTime
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
@@ -1997,7 +1997,7 @@ export type V3AsksCoreEthRoyaltyPayoutEventProperties = {
 }
 
 export type V3ModuleManagerEvent = {
-  __typename?: 'V3ModuleManagerEvent'
+  __typename: 'V3ModuleManagerEvent'
   address: Scalars['String']
   approved: Scalars['Boolean']
   eventType: V3ModuleManagerEventType
@@ -2010,7 +2010,7 @@ export enum V3ModuleManagerEventType {
 }
 
 export type V3PrivateAskEventProperties = {
-  __typename?: 'V3PrivateAskEventProperties'
+  __typename: 'V3PrivateAskEventProperties'
   askCurrency: Scalars['String']
   askPrice: Scalars['String']
   buyer: Scalars['String']
@@ -2021,7 +2021,7 @@ export type V3PrivateAskEventProperties = {
 }
 
 export type V3ReserveAuction = {
-  __typename?: 'V3ReserveAuction'
+  __typename: 'V3ReserveAuction'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   currency: Scalars['String']
@@ -2046,7 +2046,7 @@ export type V3ReserveAuction = {
 }
 
 export type V3ReserveAuctionAuctionProperties = {
-  __typename?: 'V3ReserveAuctionAuctionProperties'
+  __typename: 'V3ReserveAuctionAuctionProperties'
   currency: Scalars['String']
   duration: Scalars['String']
   finder: Scalars['String']
@@ -2063,7 +2063,7 @@ export type V3ReserveAuctionAuctionProperties = {
 }
 
 export type V3ReserveAuctionEvent = {
-  __typename?: 'V3ReserveAuctionEvent'
+  __typename: 'V3ReserveAuctionEvent'
   address: Scalars['String']
   collectionAddress: Scalars['String']
   eventType: V3ReserveAuctionEventType
@@ -2087,7 +2087,7 @@ export enum V3ReserveAuctionEventType {
 }
 
 export type V3ReserveAuctionV1AuctionBidProperties = {
-  __typename?: 'V3ReserveAuctionV1AuctionBidProperties'
+  __typename: 'V3ReserveAuctionV1AuctionBidProperties'
   auction: V3ReserveAuctionAuctionProperties
   extended: Scalars['Boolean']
   firstBid: Scalars['Boolean']
@@ -2095,27 +2095,27 @@ export type V3ReserveAuctionV1AuctionBidProperties = {
 }
 
 export type V3ReserveAuctionV1AuctionCanceledProperties = {
-  __typename?: 'V3ReserveAuctionV1AuctionCanceledProperties'
+  __typename: 'V3ReserveAuctionV1AuctionCanceledProperties'
   auction: V3ReserveAuctionAuctionProperties
 }
 
 export type V3ReserveAuctionV1AuctionCreatedProperties = {
-  __typename?: 'V3ReserveAuctionV1AuctionCreatedProperties'
+  __typename: 'V3ReserveAuctionV1AuctionCreatedProperties'
   auction: V3ReserveAuctionAuctionProperties
 }
 
 export type V3ReserveAuctionV1AuctionEndedProperties = {
-  __typename?: 'V3ReserveAuctionV1AuctionEndedProperties'
+  __typename: 'V3ReserveAuctionV1AuctionEndedProperties'
   auction: V3ReserveAuctionAuctionProperties
 }
 
 export type V3ReserveAuctionV1AuctionReservePriceUpdatedProperties = {
-  __typename?: 'V3ReserveAuctionV1AuctionReservePriceUpdatedProperties'
+  __typename: 'V3ReserveAuctionV1AuctionReservePriceUpdatedProperties'
   auction: V3ReserveAuctionAuctionProperties
 }
 
 export type VideoEncodingTypes = {
-  __typename?: 'VideoEncodingTypes'
+  __typename: 'VideoEncodingTypes'
   large?: Maybe<Scalars['String']>
   original: Scalars['String']
   poster?: Maybe<Scalars['String']>
@@ -2129,12 +2129,12 @@ export type AttributesQueryVariables = Exact<{
 }>
 
 export type AttributesQuery = {
-  __typename?: 'RootQuery'
+  __typename: 'RootQuery'
   aggregateAttributes: Array<{
-    __typename?: 'AggregateAttribute'
+    __typename: 'AggregateAttribute'
     traitType: string
     valueMetrics: Array<{
-      __typename?: 'AggregateAttributeValue'
+      __typename: 'AggregateAttributeValue'
       count: number
       percent: number
       value: string
@@ -2142,17 +2142,235 @@ export type AttributesQuery = {
   }>
 }
 
+export type FilteredTokensQueryVariables = Exact<{
+  where?: InputMaybe<TokensQueryInput>
+  sort?: InputMaybe<TokenSortInput>
+  filter?: InputMaybe<TokensQueryFilter>
+  pagination?: InputMaybe<PaginationInput>
+  networks?: InputMaybe<Array<NetworkInput> | NetworkInput>
+}>
+
+export type FilteredTokensQuery = {
+  __typename: 'RootQuery'
+  tokens: {
+    __typename: 'TokenWithMarketsSummaryConnection'
+    pageInfo: {
+      __typename: 'PageInfo'
+      endCursor?: string | null
+      hasNextPage: boolean
+      limit: number
+    }
+    nodes: Array<{
+      __typename: 'TokenWithMarketsSummary'
+      token: {
+        __typename: 'Token'
+        collectionAddress: string
+        collectionName?: string | null
+        description?: string | null
+        lastRefreshTime?: any | null
+        metadata?: any | null
+        name?: string | null
+        tokenId: string
+        owner?: string | null
+        tokenUrlMimeType?: string | null
+        tokenUrl?: string | null
+        image?: {
+          __typename: 'TokenContentMedia'
+          url?: string | null
+          size?: string | null
+          mimeType?: string | null
+          mediaEncoding?:
+            | {
+                __typename: 'AudioEncodingTypes'
+                large?: string | null
+                original: string
+              }
+            | {
+                __typename: 'ImageEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                thumbnail?: string | null
+              }
+            | { __typename: 'UnsupportedEncodingTypes'; original: string }
+            | {
+                __typename: 'VideoEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                preview?: string | null
+                thumbnail?: string | null
+              }
+            | null
+        } | null
+        tokenContract?: {
+          __typename: 'TokenContract'
+          collectionAddress: string
+          symbol?: string | null
+          totalSupply?: number | null
+          network: string
+          name?: string | null
+          description?: string | null
+          chain: number
+        } | null
+        networkInfo: { __typename: 'NetworkInfo'; chain: Chain; network: Network }
+        attributes?: Array<{
+          __typename: 'TokenAttribute'
+          displayType?: string | null
+          traitType?: string | null
+          value?: string | null
+        }> | null
+        content?: {
+          __typename: 'TokenContentMedia'
+          mimeType?: string | null
+          size?: string | null
+          url?: string | null
+          mediaEncoding?:
+            | {
+                __typename: 'AudioEncodingTypes'
+                large?: string | null
+                original: string
+              }
+            | {
+                __typename: 'ImageEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                thumbnail?: string | null
+              }
+            | { __typename: 'UnsupportedEncodingTypes'; original: string }
+            | {
+                __typename: 'VideoEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                preview?: string | null
+                thumbnail?: string | null
+              }
+            | null
+        } | null
+      }
+      marketsSummary: Array<{
+        __typename: 'Market'
+        collectionAddress?: string | null
+        marketAddress: string
+        marketType: MarketType
+        status: string
+        tokenId?: string | null
+        properties?:
+          | { __typename: 'LilNounsAuction' }
+          | { __typename: 'NounsAuction' }
+          | { __typename: 'NounsBuilderAuction' }
+          | { __typename: 'V1Ask' }
+          | { __typename: 'V1BidShare' }
+          | {
+              __typename: 'V1Offer'
+              address: string
+              bidder: string
+              collectionAddress: string
+              currency: string
+              recipient: string
+              sellOnShare: string
+              tokenId: string
+              v1OfferStatus: string
+              amount: {
+                __typename: 'PriceAtTime'
+                nativePrice: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                }
+                usdcPrice?: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                } | null
+              }
+            }
+          | { __typename: 'V2Auction' }
+          | {
+              __typename: 'V3Ask'
+              address: string
+              askCurrency: string
+              buyer?: string | null
+              collectionAddress: string
+              seller: string
+              tokenId: string
+              v3AskStatus: string
+              askPrice: {
+                __typename: 'PriceAtTime'
+                nativePrice: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                }
+                usdcPrice?: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                } | null
+              }
+            }
+          | {
+              __typename: 'V3ReserveAuction'
+              estimatedDurationTime?: any | null
+              address: string
+              collectionAddress: string
+              currency: string
+              duration: string
+              extended: boolean
+              finder: string
+              findersFeeBps: string
+              firstBid: boolean
+              firstBidTime: string
+              highestBid: string
+              highestBidder: string
+              reserve: string
+              seller: string
+              sellerFundsRecipient: string
+              startTime: string
+              status: string
+              tokenId: string
+              price?: {
+                __typename: 'PriceAtTime'
+                nativePrice: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                }
+                usdcPrice?: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                } | null
+              } | null
+            }
+          | null
+        price?: {
+          __typename: 'PriceAtTime'
+          nativePrice: { __typename: 'CurrencyAmount'; decimal: number; raw: string }
+          usdcPrice?: {
+            __typename: 'CurrencyAmount'
+            decimal: number
+            raw: string
+          } | null
+        } | null
+      }>
+    }>
+  }
+}
+
 export type NounishAuctionsQueryVariables = Exact<{
   collectionAddress: Scalars['String']
   network?: InputMaybe<NetworkInput>
 }>
 
 export type NounishAuctionsQuery = {
-  __typename?: 'RootQuery'
+  __typename: 'RootQuery'
   nouns: {
-    __typename?: 'Nouns'
+    __typename: 'Nouns'
     nounsActiveMarket?: {
-      __typename?: 'NounsBuilderAuction'
+      __typename: 'NounsBuilderAuction'
       auction?: string | null
       collectionAddress: string
       duration: string
@@ -2173,36 +2391,36 @@ export type NounishAuctionsQuery = {
       address: string
       highestBidder?: string | null
       amount?: {
-        __typename?: 'PriceAtTime'
+        __typename: 'PriceAtTime'
         blockNumber: number
         chainTokenPrice?: {
-          __typename?: 'CurrencyAmount'
+          __typename: 'CurrencyAmount'
           decimal: number
           raw: string
           currency: {
-            __typename?: 'Currency'
+            __typename: 'Currency'
             address: string
             decimals: number
             name: string
           }
         } | null
         nativePrice: {
-          __typename?: 'CurrencyAmount'
+          __typename: 'CurrencyAmount'
           decimal: number
           raw: string
           currency: {
-            __typename?: 'Currency'
+            __typename: 'Currency'
             address: string
             decimals: number
             name: string
           }
         }
         usdcPrice?: {
-          __typename?: 'CurrencyAmount'
+          __typename: 'CurrencyAmount'
           decimal: number
           raw: string
           currency: {
-            __typename?: 'Currency'
+            __typename: 'Currency'
             address: string
             decimals: number
             name: string
@@ -2210,45 +2428,45 @@ export type NounishAuctionsQuery = {
         } | null
       } | null
       highestBidPrice?: {
-        __typename?: 'PriceAtTime'
+        __typename: 'PriceAtTime'
         blockNumber: number
         chainTokenPrice?: {
-          __typename?: 'CurrencyAmount'
+          __typename: 'CurrencyAmount'
           decimal: number
           raw: string
           currency: {
-            __typename?: 'Currency'
+            __typename: 'Currency'
             address: string
             decimals: number
             name: string
           }
         } | null
         nativePrice: {
-          __typename?: 'CurrencyAmount'
+          __typename: 'CurrencyAmount'
           decimal: number
           raw: string
           currency: {
-            __typename?: 'Currency'
+            __typename: 'Currency'
             address: string
             decimals: number
             name: string
           }
         }
         usdcPrice?: {
-          __typename?: 'CurrencyAmount'
+          __typename: 'CurrencyAmount'
           decimal: number
           raw: string
           currency: {
-            __typename?: 'Currency'
+            __typename: 'Currency'
             address: string
             decimals: number
             name: string
           }
         } | null
       } | null
-      networkInfo: { __typename?: 'NetworkInfo'; chain: Chain; network: Network }
+      networkInfo: { __typename: 'NetworkInfo'; chain: Chain; network: Network }
       transactionInfo: {
-        __typename?: 'TransactionInfo'
+        __typename: 'TransactionInfo'
         blockNumber: number
         blockTimestamp: any
         logIndex?: number | null
@@ -2264,13 +2482,13 @@ export type NounsDaosQueryVariables = Exact<{
 }>
 
 export type NounsDaosQuery = {
-  __typename?: 'RootQuery'
+  __typename: 'RootQuery'
   nouns: {
-    __typename?: 'Nouns'
+    __typename: 'Nouns'
     nounsDaos: {
-      __typename?: 'NounsDaoConnection'
+      __typename: 'NounsDaoConnection'
       nodes: Array<{
-        __typename?: 'NounsDao'
+        __typename: 'NounsDao'
         name?: string | null
         collectionAddress: string
         auctionAddress?: string | null
@@ -2281,7 +2499,7 @@ export type NounsDaosQuery = {
         totalSupply?: number | null
         treasuryAddress?: string | null
         contractAddress?: string | null
-        networkInfo: { __typename?: 'NetworkInfo'; chain: Chain; network: Network }
+        networkInfo: { __typename: 'NetworkInfo'; chain: Chain; network: Network }
       }>
     }
   }
@@ -2295,23 +2513,23 @@ export type OffchainOrderForTokenQueryVariables = Exact<{
 }>
 
 export type OffchainOrderForTokenQuery = {
-  __typename?: 'RootQuery'
+  __typename: 'RootQuery'
   offchainOrders: {
-    __typename?: 'OffchainOrderWithTokenConnection'
+    __typename: 'OffchainOrderWithTokenConnection'
     nodes: Array<{
-      __typename?: 'OffchainOrderWithToken'
+      __typename: 'OffchainOrderWithToken'
       offchainOrder: {
-        __typename?: 'OffchainOrder'
+        __typename: 'OffchainOrder'
         calldata?: string | null
         contractAddress: string
         price: {
-          __typename?: 'PriceAtTime'
-          chainTokenPrice?: { __typename?: 'CurrencyAmount'; decimal: number } | null
-          usdcPrice?: { __typename?: 'CurrencyAmount'; decimal: number } | null
+          __typename: 'PriceAtTime'
+          chainTokenPrice?: { __typename: 'CurrencyAmount'; decimal: number } | null
+          usdcPrice?: { __typename: 'CurrencyAmount'; decimal: number } | null
         }
       }
       token?: {
-        __typename?: 'Token'
+        __typename: 'Token'
         collectionName?: string | null
         tokenId: string
       } | null
@@ -2325,13 +2543,13 @@ export type OneNounsDaoQueryVariables = Exact<{
 }>
 
 export type OneNounsDaoQuery = {
-  __typename?: 'RootQuery'
+  __typename: 'RootQuery'
   nouns: {
-    __typename?: 'Nouns'
+    __typename: 'Nouns'
     nounsDaos: {
-      __typename?: 'NounsDaoConnection'
+      __typename: 'NounsDaoConnection'
       nodes: Array<{
-        __typename?: 'NounsDao'
+        __typename: 'NounsDao'
         name?: string | null
         collectionAddress: string
         auctionAddress?: string | null
@@ -2342,7 +2560,7 @@ export type OneNounsDaoQuery = {
         totalSupply?: number | null
         treasuryAddress?: string | null
         contractAddress?: string | null
-        networkInfo: { __typename?: 'NetworkInfo'; chain: Chain; network: Network }
+        networkInfo: { __typename: 'NetworkInfo'; chain: Chain; network: Network }
       }>
     }
   }
@@ -2355,11 +2573,101 @@ export type TokenQueryVariables = Exact<{
 }>
 
 export type TokenQuery = {
-  __typename?: 'RootQuery'
+  __typename: 'RootQuery'
   token?: {
-    __typename?: 'TokenWithFullMarketHistory'
+    __typename: 'TokenWithFullMarketHistory'
+    markets: Array<{
+      __typename: 'Market'
+      collectionAddress?: string | null
+      marketAddress: string
+      marketType: MarketType
+      status: string
+      tokenId?: string | null
+      properties?:
+        | { __typename: 'LilNounsAuction' }
+        | { __typename: 'NounsAuction' }
+        | { __typename: 'NounsBuilderAuction' }
+        | { __typename: 'V1Ask' }
+        | { __typename: 'V1BidShare' }
+        | {
+            __typename: 'V1Offer'
+            address: string
+            bidder: string
+            collectionAddress: string
+            currency: string
+            recipient: string
+            sellOnShare: string
+            tokenId: string
+            v1OfferStatus: string
+            amount: {
+              __typename: 'PriceAtTime'
+              nativePrice: { __typename: 'CurrencyAmount'; decimal: number; raw: string }
+              usdcPrice?: {
+                __typename: 'CurrencyAmount'
+                decimal: number
+                raw: string
+              } | null
+            }
+          }
+        | { __typename: 'V2Auction' }
+        | {
+            __typename: 'V3Ask'
+            address: string
+            askCurrency: string
+            buyer?: string | null
+            collectionAddress: string
+            seller: string
+            tokenId: string
+            v3AskStatus: string
+            askPrice: {
+              __typename: 'PriceAtTime'
+              nativePrice: { __typename: 'CurrencyAmount'; decimal: number; raw: string }
+              usdcPrice?: {
+                __typename: 'CurrencyAmount'
+                decimal: number
+                raw: string
+              } | null
+            }
+          }
+        | {
+            __typename: 'V3ReserveAuction'
+            estimatedDurationTime?: any | null
+            address: string
+            collectionAddress: string
+            currency: string
+            duration: string
+            extended: boolean
+            finder: string
+            findersFeeBps: string
+            firstBid: boolean
+            firstBidTime: string
+            highestBid: string
+            highestBidder: string
+            reserve: string
+            seller: string
+            sellerFundsRecipient: string
+            startTime: string
+            status: string
+            tokenId: string
+            price?: {
+              __typename: 'PriceAtTime'
+              nativePrice: { __typename: 'CurrencyAmount'; decimal: number; raw: string }
+              usdcPrice?: {
+                __typename: 'CurrencyAmount'
+                decimal: number
+                raw: string
+              } | null
+            } | null
+          }
+        | null
+      price?: {
+        __typename: 'PriceAtTime'
+        nativePrice: { __typename: 'CurrencyAmount'; decimal: number; raw: string }
+        usdcPrice?: { __typename: 'CurrencyAmount'; decimal: number; raw: string } | null
+      } | null
+    }>
     token: {
-      __typename?: 'Token'
+      __typename: 'Token'
       collectionAddress: string
       collectionName?: string | null
       tokenUrlMimeType?: string | null
@@ -2370,22 +2678,22 @@ export type TokenQuery = {
       description?: string | null
       lastRefreshTime?: any | null
       owner?: string | null
-      networkInfo: { __typename?: 'NetworkInfo'; chain: Chain; network: Network }
+      networkInfo: { __typename: 'NetworkInfo'; chain: Chain; network: Network }
       attributes?: Array<{
-        __typename?: 'TokenAttribute'
+        __typename: 'TokenAttribute'
         displayType?: string | null
         traitType?: string | null
         value?: string | null
       }> | null
       content?: {
-        __typename?: 'TokenContentMedia'
+        __typename: 'TokenContentMedia'
         mimeType?: string | null
         size?: string | null
         url?: string | null
         mediaEncoding?:
-          | { __typename?: 'AudioEncodingTypes'; large?: string | null; original: string }
+          | { __typename: 'AudioEncodingTypes'; large?: string | null; original: string }
           | {
-              __typename?: 'ImageEncodingTypes'
+              __typename: 'ImageEncodingTypes'
               large?: string | null
               poster?: string | null
               original: string
@@ -2393,7 +2701,7 @@ export type TokenQuery = {
             }
           | { __typename: 'UnsupportedEncodingTypes'; original: string }
           | {
-              __typename?: 'VideoEncodingTypes'
+              __typename: 'VideoEncodingTypes'
               large?: string | null
               poster?: string | null
               original: string
@@ -2403,40 +2711,40 @@ export type TokenQuery = {
           | null
       } | null
       mintInfo?: {
-        __typename?: 'MintInfo'
+        __typename: 'MintInfo'
         toAddress: string
         originatorAddress: string
         price?: {
-          __typename?: 'PriceAtTime'
+          __typename: 'PriceAtTime'
           blockNumber: number
           chainTokenPrice?: {
-            __typename?: 'CurrencyAmount'
+            __typename: 'CurrencyAmount'
             decimal: number
             raw: string
             currency: {
-              __typename?: 'Currency'
+              __typename: 'Currency'
               address: string
               decimals: number
               name: string
             }
           } | null
           nativePrice: {
-            __typename?: 'CurrencyAmount'
+            __typename: 'CurrencyAmount'
             decimal: number
             raw: string
             currency: {
-              __typename?: 'Currency'
+              __typename: 'Currency'
               address: string
               decimals: number
               name: string
             }
           }
           usdcPrice?: {
-            __typename?: 'CurrencyAmount'
+            __typename: 'CurrencyAmount'
             decimal: number
             raw: string
             currency: {
-              __typename?: 'Currency'
+              __typename: 'Currency'
               address: string
               decimals: number
               name: string
@@ -2444,20 +2752,20 @@ export type TokenQuery = {
           } | null
         } | null
         mintContext: {
-          __typename?: 'TransactionInfo'
+          __typename: 'TransactionInfo'
           blockTimestamp: any
           blockNumber: number
         }
       } | null
       image?: {
-        __typename?: 'TokenContentMedia'
+        __typename: 'TokenContentMedia'
         mimeType?: string | null
         url?: string | null
         size?: string | null
         mediaEncoding?:
-          | { __typename?: 'AudioEncodingTypes'; large?: string | null; original: string }
+          | { __typename: 'AudioEncodingTypes'; large?: string | null; original: string }
           | {
-              __typename?: 'ImageEncodingTypes'
+              __typename: 'ImageEncodingTypes'
               large?: string | null
               poster?: string | null
               original: string
@@ -2465,7 +2773,7 @@ export type TokenQuery = {
             }
           | { __typename: 'UnsupportedEncodingTypes'; original: string }
           | {
-              __typename?: 'VideoEncodingTypes'
+              __typename: 'VideoEncodingTypes'
               large?: string | null
               poster?: string | null
               original: string
@@ -2475,7 +2783,7 @@ export type TokenQuery = {
           | null
       } | null
       tokenContract?: {
-        __typename?: 'TokenContract'
+        __typename: 'TokenContract'
         totalSupply?: number | null
         symbol?: string | null
         network: string
@@ -2487,3 +2795,211 @@ export type TokenQuery = {
     }
   } | null
 }
+
+export type NounsTokensByOwnerAddressQueryVariables = Exact<{
+  ownerAddress: Scalars['String']
+}>
+
+export type NounsTokensByOwnerAddressQuery = {
+  __typename: 'RootQuery'
+  tokens: {
+    __typename: 'TokenWithMarketsSummaryConnection'
+    nodes: Array<{
+      __typename: 'TokenWithMarketsSummary'
+      token: {
+        __typename: 'Token'
+        collectionAddress: string
+        collectionName?: string | null
+        description?: string | null
+        lastRefreshTime?: any | null
+        metadata?: any | null
+        name?: string | null
+        tokenId: string
+        owner?: string | null
+        tokenUrlMimeType?: string | null
+        tokenUrl?: string | null
+        image?: {
+          __typename: 'TokenContentMedia'
+          url?: string | null
+          size?: string | null
+          mimeType?: string | null
+          mediaEncoding?:
+            | {
+                __typename: 'AudioEncodingTypes'
+                large?: string | null
+                original: string
+              }
+            | {
+                __typename: 'ImageEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                thumbnail?: string | null
+              }
+            | { __typename: 'UnsupportedEncodingTypes'; original: string }
+            | {
+                __typename: 'VideoEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                preview?: string | null
+                thumbnail?: string | null
+              }
+            | null
+        } | null
+        tokenContract?: {
+          __typename: 'TokenContract'
+          collectionAddress: string
+          symbol?: string | null
+          totalSupply?: number | null
+          network: string
+          name?: string | null
+          description?: string | null
+          chain: number
+        } | null
+        networkInfo: { __typename: 'NetworkInfo'; chain: Chain; network: Network }
+        attributes?: Array<{
+          __typename: 'TokenAttribute'
+          displayType?: string | null
+          traitType?: string | null
+          value?: string | null
+        }> | null
+        content?: {
+          __typename: 'TokenContentMedia'
+          mimeType?: string | null
+          size?: string | null
+          url?: string | null
+          mediaEncoding?:
+            | {
+                __typename: 'AudioEncodingTypes'
+                large?: string | null
+                original: string
+              }
+            | {
+                __typename: 'ImageEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                thumbnail?: string | null
+              }
+            | { __typename: 'UnsupportedEncodingTypes'; original: string }
+            | {
+                __typename: 'VideoEncodingTypes'
+                large?: string | null
+                poster?: string | null
+                original: string
+                preview?: string | null
+                thumbnail?: string | null
+              }
+            | null
+        } | null
+      }
+      marketsSummary: Array<{
+        __typename: 'Market'
+        collectionAddress?: string | null
+        marketAddress: string
+        marketType: MarketType
+        status: string
+        tokenId?: string | null
+        properties?:
+          | { __typename: 'LilNounsAuction' }
+          | { __typename: 'NounsAuction' }
+          | { __typename: 'NounsBuilderAuction' }
+          | { __typename: 'V1Ask' }
+          | { __typename: 'V1BidShare' }
+          | {
+              __typename: 'V1Offer'
+              address: string
+              bidder: string
+              collectionAddress: string
+              currency: string
+              recipient: string
+              sellOnShare: string
+              tokenId: string
+              v1OfferStatus: string
+              amount: {
+                __typename: 'PriceAtTime'
+                nativePrice: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                }
+                usdcPrice?: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                } | null
+              }
+            }
+          | { __typename: 'V2Auction' }
+          | {
+              __typename: 'V3Ask'
+              address: string
+              askCurrency: string
+              buyer?: string | null
+              collectionAddress: string
+              seller: string
+              tokenId: string
+              v3AskStatus: string
+              askPrice: {
+                __typename: 'PriceAtTime'
+                nativePrice: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                }
+                usdcPrice?: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                } | null
+              }
+            }
+          | {
+              __typename: 'V3ReserveAuction'
+              estimatedDurationTime?: any | null
+              address: string
+              collectionAddress: string
+              currency: string
+              duration: string
+              extended: boolean
+              finder: string
+              findersFeeBps: string
+              firstBid: boolean
+              firstBidTime: string
+              highestBid: string
+              highestBidder: string
+              reserve: string
+              seller: string
+              sellerFundsRecipient: string
+              startTime: string
+              status: string
+              tokenId: string
+              price?: {
+                __typename: 'PriceAtTime'
+                nativePrice: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                }
+                usdcPrice?: {
+                  __typename: 'CurrencyAmount'
+                  decimal: number
+                  raw: string
+                } | null
+              } | null
+            }
+          | null
+        price?: {
+          __typename: 'PriceAtTime'
+          nativePrice: { __typename: 'CurrencyAmount'; decimal: number; raw: string }
+          usdcPrice?: {
+            __typename: 'CurrencyAmount'
+            decimal: number
+            raw: string
+          } | null
+        } | null
+      }>
+    }>
+  }
+}
diff --git a/validators/isV3Ask.ts b/validators/isV3Ask.ts
new file mode 100644
index 00000000..5b7a8238
--- /dev/null
+++ b/validators/isV3Ask.ts
@@ -0,0 +1,7 @@
+import { V3Ask } from 'types/zora.api.generated'
+
+import { TypeSafeMarket } from './market'
+
+export const isV3Ask = (market: TypeSafeMarket['properties']): market is V3Ask => {
+  return market?.__typename === 'V3Ask'
+}
diff --git a/validators/market.ts b/validators/market.ts
new file mode 100644
index 00000000..f391b0ff
--- /dev/null
+++ b/validators/market.ts
@@ -0,0 +1,3 @@
+import { useToken } from 'hooks/useToken'
+
+export type TypeSafeMarket = ReturnType<typeof useToken>['markets'][0]