diff --git a/src/routes/(editor)/experimental/grid.tsx b/src/routes/(editor)/experimental/grid.tsx
index 037b8e1..8b13ada 100644
--- a/src/routes/(editor)/experimental/grid.tsx
+++ b/src/routes/(editor)/experimental/grid.tsx
@@ -3,7 +3,8 @@ import { CellEditor, Column, DataSetGroupNode, DataSetNode, DataSetRowNode, Grid
 import { people, Person } from './experimental.data';
 import { Component, createEffect, createMemo, createSignal, For, Match, Switch } from 'solid-js';
 import { MutarionKind, Mutation } from '~/utilities';
-import { createDataSet, Table } from '~/components/table';
+import { Table } from '~/components/table';
+import { createDataSet } from '~/features/dataset';
 import { debounce } from '@solid-primitives/scheduled';
 import css from './grid.module.css';
 
@@ -65,7 +66,7 @@ export default function GridExperiment() {
 
     const mutations = createMemo(() => api()?.mutations() ?? [])
 
-    const rows = createDataSet(people.slice(0, 20), {
+    const rows = createDataSet(() => people.slice(0, 20), {
         // group: { by: 'country' },
         sort: { by: 'name', reversed: false },
     });
diff --git a/src/routes/(editor)/experimental/table.tsx b/src/routes/(editor)/experimental/table.tsx
index 232617e..4523a17 100644
--- a/src/routes/(editor)/experimental/table.tsx
+++ b/src/routes/(editor)/experimental/table.tsx
@@ -1,5 +1,6 @@
 import { Sidebar } from '~/components/sidebar';
-import { Column, createDataSet, DataSetGroupNode, DataSetNode, DataSetRowNode, GroupOptions, SelectionMode, SortOptions, Table } from '~/components/table';
+import { Column, SelectionMode, Table } from '~/components/table';
+import { createDataSet, DataSetGroupNode, DataSetNode, DataSetRowNode, GroupOptions, SortOptions } from '~/features/dataset';
 import { createStore } from 'solid-js/store';
 import { Person, people } from './experimental.data';
 import { createEffect, createMemo, For } from 'solid-js';
@@ -57,7 +58,7 @@ export default function TableExperiment() {
         sorting: { by: 'country', reversed: false },
     });
 
-    const rows = createMemo(() => createDataSet(people, {
+    const rows = createMemo(() => createDataSet(() => people, {
         group: { by: 'country' },
         sort: { by: 'country', reversed: false },
     }));