diff --git a/.vscode/settings.json b/.vscode/settings.json
index c53688b..ed0cc91 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,15 @@
   "vue.complete.casing.tags": "pascal",
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "typescript.tsdk": "node_modules/typescript/lib",
-  "cSpell.words": ["composables", "Pinia", "Tinybase", "todos", "wildcarded"]
+  "cSpell.words": [
+    "composables",
+    "Moraru",
+    "Pinia",
+    "pkgroll",
+    "Tinybase",
+    "todos",
+    "vitepress",
+    "vueuse",
+    "wildcarded"
+  ]
 }
diff --git a/packages/private/docs/.vitepress/config.mts b/packages/private/docs/.vitepress/config.mts
index 83f4410..a541b4d 100644
--- a/packages/private/docs/.vitepress/config.mts
+++ b/packages/private/docs/.vitepress/config.mts
@@ -37,6 +37,13 @@ export default defineConfig({
             { text: 'Writable References', link: '/api/store/references' },
           ],
         },
+        {
+          text: 'Checkpoints',
+          items: [
+            { text: 'Composables', link: '/api/checkpoints/composables' },
+            { text: 'Context', link: '/api/checkpoints/context' },
+          ],
+        },
         {
           text: 'Common',
           items: [
diff --git a/packages/private/docs/.vitepress/theme/components/MyLayout.vue b/packages/private/docs/.vitepress/theme/components/MyLayout.vue
index 2b10b9f..6ab1bdb 100644
--- a/packages/private/docs/.vitepress/theme/components/MyLayout.vue
+++ b/packages/private/docs/.vitepress/theme/components/MyLayout.vue
@@ -3,19 +3,27 @@ import { useRoute } from 'vitepress'
 import DefaultTheme from 'vitepress/theme'
 import VPSwitchStoreStyle from './VPSwitchStoreStyle.vue'
 import { computed } from 'vue'
+import { useBodyClass } from '../composables/useBodyClass.mjs'
+import { useLocalStorage } from '@vueuse/core'
 
 const { Layout } = DefaultTheme
 
 const route = useRoute()
 
 const isApiPage = computed(() => route.path.startsWith('/api'))
+
+const isDefaultStore = useLocalStorage('isDefaultStoreSelected', true)
+useBodyClass(isDefaultStore, {
+  trueClass: 'default-store',
+  falseClass: 'custom-store',
+})
 </script>
 
 <template>
   <Layout>
     <template #sidebar-nav-before>
       <ClientOnly v-if="isApiPage">
-        <VPSwitchStoreStyle />
+        <VPSwitchStoreStyle v-model="isDefaultStore" />
       </ClientOnly>
     </template>
   </Layout>
diff --git a/packages/private/docs/.vitepress/theme/components/VPSwitchStoreStyle.vue b/packages/private/docs/.vitepress/theme/components/VPSwitchStoreStyle.vue
index 1144891..40860db 100644
--- a/packages/private/docs/.vitepress/theme/components/VPSwitchStoreStyle.vue
+++ b/packages/private/docs/.vitepress/theme/components/VPSwitchStoreStyle.vue
@@ -1,25 +1,12 @@
 <script lang="ts" setup>
 // copy/pasted from https://github.com/vuejs/vitepress/blob/8fef47848bd3418014b06eea1337b1e66e0473c6/src/client/theme-default/components/VPSwitchAppearance.vue
 // minor modifications
-import { watch, ref } from 'vue'
 import VPSwitch from './VPSwitch.vue'
 
-const isDefaultStoreSelected = ref(localStorage.getItem('isDefaultStoreSelected') !== 'false')
-
-watch(
-  isDefaultStoreSelected,
-  () => {
-    localStorage.setItem('isDefaultStoreSelected', isDefaultStoreSelected.value.toString())
-    if (isDefaultStoreSelected.value) {
-      document.body.classList.add('default-store')
-      document.body.classList.remove('custom-store')
-    } else {
-      document.body.classList.remove('default-store')
-      document.body.classList.add('custom-store')
-    }
-  },
-  { immediate: true },
-)
+const isDefaultStoreSelected = defineModel({
+  type: Boolean,
+  required: true,
+})
 </script>
 
 <template>
diff --git a/packages/private/docs/.vitepress/theme/composables/useBodyClass.mts b/packages/private/docs/.vitepress/theme/composables/useBodyClass.mts
new file mode 100644
index 0000000..ed31526
--- /dev/null
+++ b/packages/private/docs/.vitepress/theme/composables/useBodyClass.mts
@@ -0,0 +1,18 @@
+import { MaybeRefOrGetter, toRef, watch } from 'vue'
+
+interface UseBodyClassOptions {
+  trueClass: string
+  falseClass: string
+}
+
+export function useBodyClass(value: MaybeRefOrGetter<boolean>, options: UseBodyClassOptions): void {
+  const { trueClass } = options
+  const { falseClass } = options
+
+  const updateBodyClass = (newValue: boolean) => {
+    document.body.classList.remove(newValue ? falseClass : trueClass)
+    document.body.classList.add(newValue ? trueClass : falseClass)
+  }
+
+  watch(toRef(value), updateBodyClass, { immediate: true })
+}
diff --git a/packages/private/docs/api/checkpoints/composables.md b/packages/private/docs/api/checkpoints/composables.md
new file mode 100644
index 0000000..096e15c
--- /dev/null
+++ b/packages/private/docs/api/checkpoints/composables.md
@@ -0,0 +1,76 @@
+# Composables {#composables}
+
+Checkpoinnts composables.
+
+## useCheckpoint {#use-checkpoint}
+
+The `useCheckpoint` composable returns the label for a checkpoint, and registers a listener so that any changes to that result will cause a re-render.
+
+When first accessed, this composable will create a listener so that changes to the label will cause a re-render. When the component containing this composable is unmounted, the listener will be automatically removed.
+
+### Parameters
+
+<div class="hide-default-store">
+
+- `checkpoints` ([`Checkpoints`](https://tinybase.org/api/checkpoints/interfaces/checkpoints/checkpoints/)): The [`Checkpoints`](https://tinybase.org/api/checkpoints/interfaces/checkpoints/checkpoints/) object to be accessed.
+
+</div>
+
+- `checkpointId` ([`MaybeRefOrGetter`](https://vuejs.org/api/utility-types.html#maybereforgetter)`<string>`): The [Id](https://tinybase.org/api/common/type-aliases/identity/id/) of the checkpoint.
+
+### Returns
+
+- `ComputedRef<string | undefined>`: A **readonly** reference to the string label for the requested checkpoint, an empty string if it was never set, or `undefined` if the checkpoint does not exist..
+
+### Example
+
+<div class="hide-default-store">
+
+```vue
+<script setup lang="ts">
+import { useCell, injectStore, useCheckpoint } from 'vue-tinybase/custom-store'
+
+import { Store1Key, Checkpoints1Key } from './store'
+
+const store = injectStore(Store1Key)
+const checkpoints = injectCheckpoints(Checkpoints1Key)
+
+const checkpointLabel = useCheckpoint(checkpoints, '1')
+// UI will be empty
+
+store.setCell('pets', 'fido', 'sold', true)
+checkpoints.addCheckpoint('sale')
+// UI will show: 'sale'
+</script>
+
+<template>
+  <div>{{ checkpointLabel }}</div>
+</template>
+```
+
+</div>
+
+<div class="hide-custom-store">
+
+```vue
+<script setup lang="ts">
+import { useCell, injectStore, useCheckpoint, injectCheckpoints } from 'vue-tinybase'
+
+const store = injectStore()
+
+const checkpoints = injectCheckpoints()
+
+const checkpointLabel = useCheckpoint('1')
+// UI will be empty
+
+store.setCell('pets', 'fido', 'sold', true)
+checkpoints.addCheckpoint('sale')
+// UI will show: 'sale'
+</script>
+
+<template>
+  <div>{{ checkpointLabel }}</div>
+</template>
+```
+
+</div>
diff --git a/packages/private/docs/api/checkpoints/context.md b/packages/private/docs/api/checkpoints/context.md
new file mode 100644
index 0000000..a610770
--- /dev/null
+++ b/packages/private/docs/api/checkpoints/context.md
@@ -0,0 +1,122 @@
+# Context {#context}
+
+Context-related functions for providing and injecting checkpoints object into the app or part of the app.
+
+For all the examples assume the following `store.ts` file:
+
+<div class="hide-custom-store">
+
+```ts
+import { createStore, createCheckpoints } from 'tinybase'
+
+export const store = createStore()
+export const checkpoints = createCheckpoints(store)
+```
+
+</div>
+
+<div class="hide-default-store">
+
+```ts
+import { createStore, createCheckpoints } from 'tinybase'
+import type { InjectionKey } from 'vue'
+
+export const store1 = createStore()
+export const store2 = createStore()
+
+export const checkpoints1 = createCheckpoints(store1)
+export const checkpoints2 = createCheckpoints(store2)
+
+export const Store1Key = Symbol('Store1') as InjectionKey<typeof store1>
+export const Store2Key = Symbol('Store2') as InjectionKey<typeof store2>
+
+export const Checkpoints1Key = Symbol('Checkpoints1') as InjectionKey<typeof checkpoints1>
+export const Checkpoints2Key = Symbol('Checkpoints2') as InjectionKey<typeof checkpoints2>
+```
+
+</div>
+
+## provideCheckpoints {#provide-checkpoints}
+
+Provide a checkpoints object to all child components, enabling them to access the checkpoints object without having to pass it down as a prop.
+
+- **Parameters**
+
+  <div class="hide-default-store">
+
+  - `checkpointsKey` (`string | symbol`): Unique injection key.
+
+  </div>
+
+  - `checkpoints` ([`Checkpoints`](https://tinybase.org/api/checkpoints/interfaces/checkpoints/checkpoints/)): The checkpoints object to provide.
+
+- **Example**
+
+  <div class="hide-custom-store">
+
+  ```vue
+  <script setup lang="ts">
+  import { provideCheckpoints } from 'vue-tinybase'
+
+  import { checkpoints } from './store'
+
+  provideCheckpoints(checkpoints)
+  </script>
+  ```
+
+  </div>
+
+  <div class="hide-default-store">
+
+  ```vue
+  <script setup lang="ts">
+  import { provideCheckpoints } from 'vue-tinybase/custom-store'
+
+  import { checkpoints1, checkpoints2, Checkpoints1Key, Checkpoints2Key } from './store'
+
+  provideCheckpoints(Checkpoints1Key, checkpoints1)
+  provideCheckpoints(Checkpoints2Key, checkpoints2)
+  </script>
+  ```
+
+  </div>
+
+## injectCheckpoints {#inject-checkpoints}
+
+Inject a checkpoints object provided by [`provideCheckpoints`](/api/checkpoints/context#provide-checkpoints).
+
+<div class="hide-default-store">
+
+- **Parameters**
+
+  - `checkpointsKey` (`string | symbol`): Checkpoints object injection key.
+
+</div>
+
+- **Example**
+
+  <div class="hide-custom-store">
+
+  ```vue
+  <script setup lang="ts">
+  import { injectCheckpoints } from 'vue-tinybase'
+
+  const store = injectCheckpoints()
+  </script>
+  ```
+
+  </div>
+
+  <div class="hide-default-store">
+
+  ```vue
+  <script setup lang="ts">
+  import { injectCheckpoints } from 'vue-tinybase/custom-store'
+
+  import { Checkpoints1Key } from './store'
+
+  const checkpoints1 = injectCheckpoints(Checkpoints1Key)
+  </script>
+  ```
+
+  </div>
diff --git a/packages/private/docs/guide/getting-started/connect-to-vuejs-app.md b/packages/private/docs/guide/getting-started/connect-to-vuejs-app.md
index 0bb372c..a978309 100644
--- a/packages/private/docs/guide/getting-started/connect-to-vuejs-app.md
+++ b/packages/private/docs/guide/getting-started/connect-to-vuejs-app.md
@@ -40,3 +40,5 @@ app.mount('#app')
 In this example, we create a Vue app and use the provideStore function in the setup function to provide the TinyBase store. The render function is used to render the main App component.
 
 After providing the store, you can use `vue-tinybase` [event hooks](/api/store/events), [composables](/api/store/composables), and [writable references](/api/store/references) inside all components of your app. This integration enables you to interact with the store’s state and respond to changes efficiently.
+
+There are similar provide-related functions for [checkpoints](/api/checkpoints/context) that you can use to provide these objects to your app or part of the app.
diff --git a/packages/private/docs/guide/usage-with-typescript.md b/packages/private/docs/guide/usage-with-typescript.md
index 4bf8947..4a9d781 100644
--- a/packages/private/docs/guide/usage-with-typescript.md
+++ b/packages/private/docs/guide/usage-with-typescript.md
@@ -9,7 +9,7 @@ For more information on Schema-based typing, please refer to the [official TinyB
 The following code snippet demonstrates how to define a schema for your store and connect it to all composables imported from `vue-tinybase`:
 
 ```typescript
-import { createStore } from 'tinybase/with-schemas'
+import { createStore, createCheckpoints } from 'tinybase/with-schemas'
 
 // Create a store with schema-based typing
 export const store = createStore()
@@ -27,13 +27,18 @@ export const store = createStore()
     val3: { type: 'boolean', default: false },
   })
 
+// If you want - also create checkpoints
+const checkpoints = createCheckpoints(store)
+
 // Export the store type
 export type Store = typeof store
+export type Checkpoints = typeof checkpoints
 
 // Extend the Vue-Tinybase context with the store type
 declare module 'vue-tinybase' {
   export interface VueTinybaseContext {
     store: Store
+    checkpoints: Checkpoints
   }
 }
 ```
diff --git a/packages/private/docs/package.json b/packages/private/docs/package.json
index 5626117..4e9a11c 100644
--- a/packages/private/docs/package.json
+++ b/packages/private/docs/package.json
@@ -16,6 +16,7 @@
     "vitepress": "^1.2.3"
   },
   "dependencies": {
+    "@vueuse/core": "^10.11.0",
     "vue": "^3.4.31"
   }
 }
diff --git a/packages/public/vue-tinybase/src/@types/_internal/common.ts b/packages/public/vue-tinybase/src/@types/_internal/common.ts
index 8a19cb7..44a9868 100644
--- a/packages/public/vue-tinybase/src/@types/_internal/common.ts
+++ b/packages/public/vue-tinybase/src/@types/_internal/common.ts
@@ -1,8 +1,13 @@
 import type { Ref } from '@vue/reactivity'
-import type { Store as StoreWithoutSchemas, Id, IdOrNull } from 'tinybase'
-import type { OptionalSchemas, Store as StoreWithSchemas } from 'tinybase/with-schemas'
+import type { Store as StoreWithoutSchemas, Id, IdOrNull, Checkpoints as CheckpointsWithoutSchemas } from 'tinybase'
+import type {
+  OptionalSchemas,
+  Store as StoreWithSchemas,
+  Checkpoints as CheckpointsWithSchemas,
+} from 'tinybase/with-schemas'
 
 export type AnyStore = StoreWithoutSchemas | StoreWithSchemas<any>
+export type AnyCheckpoints = CheckpointsWithoutSchemas | CheckpointsWithSchemas<any>
 
 export type ExtractSchemasFromStore<Store extends AnyStore> =
   Store extends StoreWithSchemas<infer Schema> ? Schema : OptionalSchemas
diff --git a/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/composables.ts b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/composables.ts
new file mode 100644
index 0000000..576ecb8
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/composables.ts
@@ -0,0 +1,7 @@
+import type { UseCheckpointFunction as UseCheckpointFunctionWithSchemas } from './with-schemas/composables.js'
+import type { UseCheckpointFunction as UseCheckpointFunctionWithoutSchemas } from './without-schemas/composables.js'
+
+export type UseCheckpointFunction = UseCheckpointFunctionWithSchemas & UseCheckpointFunctionWithoutSchemas
+
+export type { UseCheckpointFunction as UseCheckpointFunctionWithSchemas } from './with-schemas/composables.js'
+export type { UseCheckpointFunction as UseCheckpointFunctionWithoutSchemas } from './without-schemas/composables.js'
diff --git a/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/index.ts b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/index.ts
new file mode 100644
index 0000000..4b74b9e
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/index.ts
@@ -0,0 +1 @@
+export * from './composables.js'
diff --git a/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/with-schemas/composables.ts b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/with-schemas/composables.ts
new file mode 100644
index 0000000..145e7e6
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/with-schemas/composables.ts
@@ -0,0 +1,7 @@
+import type { ComputedRef, MaybeRefOrGetter } from '@vue/reactivity'
+import type { Checkpoints, Id } from 'tinybase/with-schemas'
+
+export type UseCheckpointFunction = (
+  checkpoints: Checkpoints<any>,
+  checkpointId: MaybeRefOrGetter<Id>,
+) => ComputedRef<string | undefined>
diff --git a/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/without-schemas/composables.ts b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/without-schemas/composables.ts
new file mode 100644
index 0000000..a554c4d
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/custom-store/checkpoints/without-schemas/composables.ts
@@ -0,0 +1,7 @@
+import type { ComputedRef, MaybeRefOrGetter } from '@vue/reactivity'
+import type { Checkpoints, Id } from 'tinybase'
+
+export type UseCheckpointFunction = (
+  checkpoints: Checkpoints,
+  checkpointId: MaybeRefOrGetter<Id>,
+) => ComputedRef<string | undefined>
diff --git a/packages/public/vue-tinybase/src/@types/custom-store/index.ts b/packages/public/vue-tinybase/src/@types/custom-store/index.ts
index 46bacd5..1cb458b 100644
--- a/packages/public/vue-tinybase/src/@types/custom-store/index.ts
+++ b/packages/public/vue-tinybase/src/@types/custom-store/index.ts
@@ -1,2 +1,4 @@
 export * from './composables.js'
 export * from './events.js'
+export * from './references.js'
+export * from './checkpoints/index.js'
diff --git a/packages/public/vue-tinybase/src/@types/default-store/checkpoints/composables.ts b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/composables.ts
new file mode 100644
index 0000000..576ecb8
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/composables.ts
@@ -0,0 +1,7 @@
+import type { UseCheckpointFunction as UseCheckpointFunctionWithSchemas } from './with-schemas/composables.js'
+import type { UseCheckpointFunction as UseCheckpointFunctionWithoutSchemas } from './without-schemas/composables.js'
+
+export type UseCheckpointFunction = UseCheckpointFunctionWithSchemas & UseCheckpointFunctionWithoutSchemas
+
+export type { UseCheckpointFunction as UseCheckpointFunctionWithSchemas } from './with-schemas/composables.js'
+export type { UseCheckpointFunction as UseCheckpointFunctionWithoutSchemas } from './without-schemas/composables.js'
diff --git a/packages/public/vue-tinybase/src/@types/default-store/checkpoints/index.ts b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/index.ts
new file mode 100644
index 0000000..4b74b9e
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/index.ts
@@ -0,0 +1 @@
+export * from './composables.js'
diff --git a/packages/public/vue-tinybase/src/@types/default-store/checkpoints/with-schemas/composables.ts b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/with-schemas/composables.ts
new file mode 100644
index 0000000..b18b1ec
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/with-schemas/composables.ts
@@ -0,0 +1,4 @@
+import type { ComputedRef, MaybeRefOrGetter } from '@vue/reactivity'
+import type { Id } from 'tinybase/with-schemas'
+
+export type UseCheckpointFunction = (checkpointId: MaybeRefOrGetter<Id>) => ComputedRef<string | undefined>
diff --git a/packages/public/vue-tinybase/src/@types/default-store/checkpoints/without-schemas/composables.ts b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/without-schemas/composables.ts
new file mode 100644
index 0000000..3cd0024
--- /dev/null
+++ b/packages/public/vue-tinybase/src/@types/default-store/checkpoints/without-schemas/composables.ts
@@ -0,0 +1,4 @@
+import type { ComputedRef, MaybeRefOrGetter } from '@vue/reactivity'
+import type { Id } from 'tinybase'
+
+export type UseCheckpointFunction = (checkpointId: MaybeRefOrGetter<Id>) => ComputedRef<string | undefined>
diff --git a/packages/public/vue-tinybase/src/@types/default-store/context.ts b/packages/public/vue-tinybase/src/@types/default-store/context.ts
index 924775f..4a12a8f 100644
--- a/packages/public/vue-tinybase/src/@types/default-store/context.ts
+++ b/packages/public/vue-tinybase/src/@types/default-store/context.ts
@@ -3,12 +3,15 @@ import type {
   ExtractTablesSchemaFromSchema,
   ExtractValuesSchemaFromSchema,
 } from '../_internal/common.js'
-import type { OptionalSchemas, Store as TypedStore } from 'tinybase/with-schemas'
+import type { OptionalSchemas, Store as TypedStore, Checkpoints as TypedCheckpoints } from 'tinybase/with-schemas'
 
 // Extend this interface to type the default store
 export interface VueTinybaseContext {}
 
 export type DefaultStore = VueTinybaseContext extends { store: infer Store } ? Store : TypedStore<OptionalSchemas>
+export type DefaultCheckpoints = VueTinybaseContext extends { checkpoints: infer Checkpoints }
+  ? Checkpoints
+  : TypedCheckpoints<OptionalSchemas>
 
 export type DefaultStoreSchemas = ExtractSchemasFromStore<DefaultStore>
 export type DefaultStoreValuesSchema = ExtractValuesSchemaFromSchema<DefaultStoreSchemas>
diff --git a/packages/public/vue-tinybase/src/@types/default-store/index.ts b/packages/public/vue-tinybase/src/@types/default-store/index.ts
index 28286f9..9d0ec48 100644
--- a/packages/public/vue-tinybase/src/@types/default-store/index.ts
+++ b/packages/public/vue-tinybase/src/@types/default-store/index.ts
@@ -1,3 +1,5 @@
 export * from './composables.js'
 export * from './events.js'
+export * from './references.js'
 export * from './context.js'
+export * from './checkpoints/index.js'
diff --git a/packages/public/vue-tinybase/src/common/useListenable.ts b/packages/public/vue-tinybase/src/common/useListenable.ts
index 764ee4c..6b1d4b7 100644
--- a/packages/public/vue-tinybase/src/common/useListenable.ts
+++ b/packages/public/vue-tinybase/src/common/useListenable.ts
@@ -35,7 +35,7 @@ export const IS_EQUALS: ((thing1: any, thing2: any) => boolean)[] = [
 export const isEqual = (thing1: any, thing2: any) => thing1 === thing2
 
 export const useListenable = (
-  store: any,
+  eventBus: any,
   listenable: string,
   returnType: ReturnType,
   args: Readonly<MaybeRefOrGetter<ListenerArgument>[]> = EMPTY_ARRAY,
@@ -43,7 +43,7 @@ export const useListenable = (
   const lastResult = ref(DEFAULTS[returnType])
   const getResult = () => {
     const nextResult =
-      store?.[(returnType == ReturnType.Boolean ? _HAS : GET) + listenable]?.(...args.map(arg => toValue(arg))) ??
+      eventBus?.[(returnType == ReturnType.Boolean ? _HAS : GET) + listenable]?.(...args.map(arg => toValue(arg))) ??
       DEFAULTS[returnType]
     if (!(IS_EQUALS[returnType] ?? isEqual)(nextResult, lastResult.value)) {
       lastResult.value = nextResult
@@ -52,7 +52,7 @@ export const useListenable = (
   }
 
   const { startListening, isListening } = useListener(
-    store,
+    eventBus,
     (returnType == ReturnType.Boolean ? HAS : EMPTY_STRING) + listenable,
     args,
     getResult,
diff --git a/packages/public/vue-tinybase/src/common/useListener.ts b/packages/public/vue-tinybase/src/common/useListener.ts
index afd1cd5..f70996d 100644
--- a/packages/public/vue-tinybase/src/common/useListener.ts
+++ b/packages/public/vue-tinybase/src/common/useListener.ts
@@ -5,14 +5,13 @@ import { ADD, LISTENER } from './strings.js'
 
 import type { ListenerArgument, UseListenerOptions } from '../@types/_internal/common.js'
 import type { MaybeRefOrGetter } from '@vue/reactivity'
-import type { Store } from 'tinybase'
 
 const useListenerDefaultOptions = {
   immediate: true,
 }
 
 export function useListener(
-  store: Store,
+  eventBus: any,
   event: string,
   preArgs: Readonly<MaybeRefOrGetter<ListenerArgument>[]>,
   listener: (...args: any[]) => void,
@@ -45,7 +44,8 @@ export function useListener(
 
   function listenerCleanup() {
     if (listenerId.value) {
-      store.delListener(listenerId.value)
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+      eventBus.delListener(listenerId.value)
       listenerId.value = undefined
     }
   }
@@ -56,7 +56,7 @@ export function useListener(
     if (isListening.value) {
       const args = [...preArgs.map(arg => toValue(arg)), listener, ...postArgs.map(arg => toValue(arg))]
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-      listenerId.value = (store as any)[`${ADD}${event}${LISTENER}`](...args)
+      listenerId.value = eventBus[`${ADD}${event}${LISTENER}`](...args)
     }
   })
 
diff --git a/packages/public/vue-tinybase/src/custom-store/checkpoints/composables.test.ts b/packages/public/vue-tinybase/src/custom-store/checkpoints/composables.test.ts
new file mode 100644
index 0000000..9f796ae
--- /dev/null
+++ b/packages/public/vue-tinybase/src/custom-store/checkpoints/composables.test.ts
@@ -0,0 +1,29 @@
+import { mount } from '@vue/test-utils'
+import { createStore, createCheckpoints } from 'tinybase'
+import { expect, test } from 'vitest'
+import { defineComponent, h, nextTick } from 'vue'
+
+import { useCheckpoint } from './composables.js'
+
+test('[custom-store/checkpoints/composables] useCheckpoint', async () => {
+  const store = createStore()
+  const checkpoints = createCheckpoints(store)
+
+  const Component = defineComponent({
+    setup() {
+      const checkpoint = useCheckpoint(checkpoints, '1')
+
+      return () => h('div', [checkpoint.value])
+    },
+  })
+
+  const wrapper = mount(Component)
+  expect(wrapper.text()).toBe('')
+
+  store.setCell('pets', 'fido', 'sold', true)
+  checkpoints.addCheckpoint('sale')
+
+  await nextTick()
+
+  expect(wrapper.text()).toBe('sale')
+})
diff --git a/packages/public/vue-tinybase/src/custom-store/checkpoints/composables.ts b/packages/public/vue-tinybase/src/custom-store/checkpoints/composables.ts
new file mode 100644
index 0000000..fefd630
--- /dev/null
+++ b/packages/public/vue-tinybase/src/custom-store/checkpoints/composables.ts
@@ -0,0 +1,8 @@
+import { ReturnType, useListenable } from '../../common/useListenable.js'
+
+import type { UseCheckpointFunction } from '../../@types/custom-store/index.js'
+import type { MaybeRefOrGetter } from '@vue/reactivity'
+import type { Checkpoints, Id } from 'tinybase'
+
+export const useCheckpoint = ((checkpoints: Checkpoints, checkpointId: MaybeRefOrGetter<Id>) =>
+  useListenable(checkpoints, 'Checkpoint', ReturnType.CellOrValue, [checkpointId])) as UseCheckpointFunction
diff --git a/packages/public/vue-tinybase/src/custom-store/checkpoints/context.test.ts b/packages/public/vue-tinybase/src/custom-store/checkpoints/context.test.ts
new file mode 100644
index 0000000..a071935
--- /dev/null
+++ b/packages/public/vue-tinybase/src/custom-store/checkpoints/context.test.ts
@@ -0,0 +1,39 @@
+import { mount } from '@vue/test-utils'
+import { createCheckpoints } from 'tinybase/with-schemas'
+import { expect, test } from 'vitest'
+import { defineComponent, h } from 'vue'
+
+import { store, providerWrapper } from '../../test-utils/store.js'
+
+import { injectCheckpoints } from './context.js'
+
+import type { Checkpoints } from 'tinybase/with-schemas'
+import type { InjectionKey } from 'vue'
+
+test('[custom-store/checkpoints/context] inject', () => {
+  const checkpointsKey = Symbol('checkpoints') as InjectionKey<Checkpoints<any>>
+  const checkpoints = createCheckpoints(store)
+
+  const Component = defineComponent({
+    setup() {
+      const checkpoints = injectCheckpoints(checkpointsKey)
+
+      const value = checkpoints.getCheckpointIds()
+
+      return () => h('div', null, JSON.stringify(value))
+    },
+  })
+
+  expect(() => mount(Component)).toThrowError(
+    '[tinybase-vue] (injectCheckpoints): Could not find checkpoints object with key Symbol(checkpoints)',
+  )
+
+  const wrapper = mount(
+    providerWrapper(Component, undefined, {
+      checkpoints,
+      checkpointsKey,
+    }),
+  )
+
+  expect(wrapper.text()).toBe('[[],"0",[]]')
+})
diff --git a/packages/public/vue-tinybase/src/custom-store/checkpoints/context.ts b/packages/public/vue-tinybase/src/custom-store/checkpoints/context.ts
new file mode 100644
index 0000000..317ea37
--- /dev/null
+++ b/packages/public/vue-tinybase/src/custom-store/checkpoints/context.ts
@@ -0,0 +1,31 @@
+import { provide, inject } from '@vue/runtime-core'
+
+import type { AnyCheckpoints } from '../../@types/_internal/common.js'
+import type { InjectionKey } from '@vue/runtime-core'
+
+export function provideCheckpoints<T extends AnyCheckpoints>(checkpointsKey: InjectionKey<T>, checkpoints: T) {
+  return provide(checkpointsKey, checkpoints)
+}
+
+export function injectCheckpoints<T extends AnyCheckpoints>(
+  checkpointsKey: InjectionKey<T>,
+  shouldFailOnNotFound?: true,
+): T
+export function injectCheckpoints<T extends AnyCheckpoints>(
+  checkpointsKey: InjectionKey<T>,
+  shouldFailOnNotFound: false,
+): T | undefined
+export function injectCheckpoints<T extends AnyCheckpoints>(
+  checkpointsKey: InjectionKey<T>,
+  shouldFailOnNotFound = true,
+): T | undefined {
+  const checkpoints = inject(checkpointsKey)
+
+  if (shouldFailOnNotFound && !checkpoints) {
+    throw new Error(
+      `[tinybase-vue] (injectCheckpoints): Could not find checkpoints object with key ${String(checkpointsKey)}`,
+    )
+  }
+
+  return checkpoints
+}
diff --git a/packages/public/vue-tinybase/src/custom-store/checkpoints/index.ts b/packages/public/vue-tinybase/src/custom-store/checkpoints/index.ts
new file mode 100644
index 0000000..4b74b9e
--- /dev/null
+++ b/packages/public/vue-tinybase/src/custom-store/checkpoints/index.ts
@@ -0,0 +1 @@
+export * from './composables.js'
diff --git a/packages/public/vue-tinybase/src/custom-store/lib.ts b/packages/public/vue-tinybase/src/custom-store/lib.ts
index cb3705c..1919ec0 100644
--- a/packages/public/vue-tinybase/src/custom-store/lib.ts
+++ b/packages/public/vue-tinybase/src/custom-store/lib.ts
@@ -1,2 +1,3 @@
 export * from './store/index.js'
+export * from './checkpoints/index.js'
 export * from '../@types/custom-store/index.js'
diff --git a/packages/public/vue-tinybase/src/custom-store/store/references.ts b/packages/public/vue-tinybase/src/custom-store/store/references.ts
index ef7ebbe..f0c7270 100644
--- a/packages/public/vue-tinybase/src/custom-store/store/references.ts
+++ b/packages/public/vue-tinybase/src/custom-store/store/references.ts
@@ -9,7 +9,7 @@ import type {
   TablesReferenceFunction,
   ValueReferenceFunction,
   ValuesReferenceFunction,
-} from '../../@types/custom-store/references.js'
+} from '../../@types/custom-store/index.js'
 import type { MaybeRefOrGetter } from '@vue/reactivity'
 import type { Store, Id } from 'tinybase'
 
diff --git a/packages/public/vue-tinybase/src/default-store/checkpoints/composables.test.ts b/packages/public/vue-tinybase/src/default-store/checkpoints/composables.test.ts
new file mode 100644
index 0000000..ec0610e
--- /dev/null
+++ b/packages/public/vue-tinybase/src/default-store/checkpoints/composables.test.ts
@@ -0,0 +1,31 @@
+import { mount } from '@vue/test-utils'
+import { createStore, createCheckpoints } from 'tinybase'
+import { expect, test } from 'vitest'
+import { defineComponent, h, nextTick } from 'vue'
+
+import { providerWrapper } from '../../test-utils/store.js'
+
+import { useCheckpoint } from './composables.js'
+
+test('[default-store/checkpoints/composables] useCheckpoint', async () => {
+  const store = createStore()
+  const checkpoints = createCheckpoints(store)
+
+  const Component = defineComponent({
+    setup() {
+      const checkpoint = useCheckpoint('1')
+
+      return () => h('div', [checkpoint.value])
+    },
+  })
+
+  const wrapper = mount(providerWrapper(Component, undefined, { checkpoints }))
+  expect(wrapper.text()).toBe('')
+
+  store.setCell('pets', 'fido', 'sold', true)
+  checkpoints.addCheckpoint('sale')
+
+  await nextTick()
+
+  expect(wrapper.text()).toBe('sale')
+})
diff --git a/packages/public/vue-tinybase/src/default-store/checkpoints/composables.ts b/packages/public/vue-tinybase/src/default-store/checkpoints/composables.ts
new file mode 100644
index 0000000..e73e8f0
--- /dev/null
+++ b/packages/public/vue-tinybase/src/default-store/checkpoints/composables.ts
@@ -0,0 +1,10 @@
+import { ReturnType, useListenable } from '../../common/useListenable.js'
+
+import { injectCheckpoints } from './context.js'
+
+import type { UseCheckpointFunction } from '../../@types/default-store/index.js'
+import type { MaybeRefOrGetter } from '@vue/reactivity'
+import type { Id } from 'tinybase'
+
+export const useCheckpoint = ((checkpointId: MaybeRefOrGetter<Id>) =>
+  useListenable(injectCheckpoints(), 'Checkpoint', ReturnType.CellOrValue, [checkpointId])) as UseCheckpointFunction
diff --git a/packages/public/vue-tinybase/src/default-store/checkpoints/context.test.ts b/packages/public/vue-tinybase/src/default-store/checkpoints/context.test.ts
new file mode 100644
index 0000000..6c401cc
--- /dev/null
+++ b/packages/public/vue-tinybase/src/default-store/checkpoints/context.test.ts
@@ -0,0 +1,34 @@
+import { mount } from '@vue/test-utils'
+import { createCheckpoints } from 'tinybase/with-schemas'
+import { expect, test } from 'vitest'
+import { defineComponent, h } from 'vue'
+
+import { store, providerWrapper } from '../../test-utils/store.js'
+
+import { injectCheckpoints } from './context.js'
+
+test('[default-store/checkpoints/context] inject', () => {
+  const checkpoints = createCheckpoints(store)
+
+  const Component = defineComponent({
+    setup() {
+      const checkpoints = injectCheckpoints()
+
+      const value = checkpoints.getCheckpointIds()
+
+      return () => h('div', null, JSON.stringify(value))
+    },
+  })
+
+  expect(() => mount(Component)).toThrowError(
+    '[tinybase-vue] (injectCheckpoints): Could not find checkpoints object with key Symbol(DefaultCheckpointsKey)',
+  )
+
+  const wrapper = mount(
+    providerWrapper(Component, undefined, {
+      checkpoints,
+    }),
+  )
+
+  expect(wrapper.text()).toBe('[[],"0",[]]')
+})
diff --git a/packages/public/vue-tinybase/src/default-store/checkpoints/context.ts b/packages/public/vue-tinybase/src/default-store/checkpoints/context.ts
new file mode 100644
index 0000000..17803c1
--- /dev/null
+++ b/packages/public/vue-tinybase/src/default-store/checkpoints/context.ts
@@ -0,0 +1,19 @@
+import {
+  provideCheckpoints as provideCheckpointsCS,
+  injectCheckpoints as injectCheckpointsCS,
+} from '../../custom-store/checkpoints/context.js'
+
+import type { DefaultCheckpoints } from '../../@types/default-store/context.js'
+import type { InjectionKey } from '@vue/runtime-core'
+
+export const DefaultCheckpointsKey: InjectionKey<DefaultCheckpoints> = Symbol('DefaultCheckpointsKey')
+
+export function provideCheckpoints(checkpoints: DefaultCheckpoints) {
+  return provideCheckpointsCS(DefaultCheckpointsKey, checkpoints)
+}
+
+export function injectCheckpoints(shouldFailOnNotFound?: true): DefaultCheckpoints
+export function injectCheckpoints(shouldFailOnNotFound: false): DefaultCheckpoints | undefined
+export function injectCheckpoints(shouldFailOnNotFound = true): DefaultCheckpoints | undefined {
+  return injectCheckpointsCS(DefaultCheckpointsKey, shouldFailOnNotFound as false)
+}
diff --git a/packages/public/vue-tinybase/src/default-store/store/references.ts b/packages/public/vue-tinybase/src/default-store/store/references.ts
index f98d9ce..36d5cfe 100644
--- a/packages/public/vue-tinybase/src/default-store/store/references.ts
+++ b/packages/public/vue-tinybase/src/default-store/store/references.ts
@@ -11,7 +11,7 @@ import type {
   TablesReferenceFunction,
   ValueReferenceFunction,
   ValuesReferenceFunction,
-} from '../../@types/default-store/references.js'
+} from '../../@types/default-store/index.js'
 import type { MaybeRefOrGetter } from '@vue/reactivity'
 import type { Id } from 'tinybase'
 
diff --git a/packages/public/vue-tinybase/src/test-utils/store.ts b/packages/public/vue-tinybase/src/test-utils/store.ts
index 29afc64..b7529ac 100644
--- a/packages/public/vue-tinybase/src/test-utils/store.ts
+++ b/packages/public/vue-tinybase/src/test-utils/store.ts
@@ -1,10 +1,12 @@
 import { createStore } from 'tinybase/with-schemas'
 import { defineComponent, h } from 'vue'
 
+import { provideCheckpoints as provideCheckpointsCS } from '../custom-store/checkpoints/context.js'
 import { provideStore as provideStoreCS } from '../custom-store/store/context.js'
+import { provideCheckpoints as provideCheckpointsDS } from '../default-store/checkpoints/context.js'
 import { provideStore as provideStoreDS } from '../default-store/store/context.js'
 
-import type { AnyStore } from '../@types/_internal/common.js'
+import type { AnyCheckpoints, AnyStore } from '../@types/_internal/common.js'
 import type { InjectionKey } from 'vue'
 
 export const store = createStore()
@@ -173,9 +175,15 @@ export const store = createStore()
 
 export type Store = typeof store
 
+export type ProviderExtraOptions = {
+  checkpointsKey?: symbol | InjectionKey<AnyCheckpoints>
+  checkpoints?: AnyCheckpoints
+}
+
 export function providerWrapper(
   child: ReturnType<typeof defineComponent>,
   keyOrStore?: symbol | InjectionKey<Store> | AnyStore,
+  options?: ProviderExtraOptions,
 ) {
   return defineComponent({
     setup() {
@@ -188,6 +196,16 @@ export function providerWrapper(
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         provideStoreDS(store as any)
       }
+
+      if (options?.checkpoints) {
+        if (options.checkpointsKey) {
+          provideCheckpointsCS(options.checkpointsKey, options.checkpoints)
+        } else {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+          provideCheckpointsDS(options.checkpoints as any)
+        }
+      }
+
       return () => h(child)
     },
   })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7740525..60b38c9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -96,6 +96,9 @@ importers:
 
   packages/private/docs:
     dependencies:
+      '@vueuse/core':
+        specifier: ^10.11.0
+        version: 10.11.0(vue@3.4.31(typescript@5.5.3))
       vue:
         specifier: ^3.4.31
         version: 3.4.31(typescript@5.5.3)
@@ -2684,6 +2687,10 @@ packages:
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
 
+  eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
+
   eslint-scope@7.2.2:
     resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2722,6 +2729,10 @@ packages:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
 
+  estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
+
   estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
@@ -6413,7 +6424,7 @@ snapshots:
       globals: 13.24.0
       ignore: 5.3.1
       import-fresh: 3.3.0
-      js-yaml: 4.1.0
+      js-yaml: 3.14.1
       minimatch: 3.1.2
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
@@ -8252,6 +8263,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint-scope@5.1.1:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 4.3.0
+
   eslint-scope@7.2.2:
     dependencies:
       esrecurse: 4.3.0
@@ -8277,7 +8293,7 @@ snapshots:
       debug: 4.3.5
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
+      eslint-scope: 5.1.1
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
       esquery: 1.5.0
@@ -8292,7 +8308,7 @@ snapshots:
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
-      js-yaml: 4.1.0
+      js-yaml: 3.14.1
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
@@ -8326,6 +8342,8 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
+  estraverse@4.3.0: {}
+
   estraverse@5.3.0: {}
 
   estree-walker@2.0.2: {}