diff --git a/index.html b/index.html
index 4ba8121..32ec86a 100644
--- a/index.html
+++ b/index.html
@@ -3,8 +3,17 @@
 		<script type="module">
 			import {Cache, Database} from './dist/index.mjs';
 
-			const db = new Database('test', [123]);
-			window['table'] = db.table(123);
+			const db = new Database('test');
+			db.connection.then(() => {
+				console.log(db.tables);
+			});
+
+			const table = window.table = await db.createTable('test2');
+			table.add({ name: 'Alice', age: 30 });
+			table.add({ name: 'Bob', age: 24 });
+			table.add({ name: 'Carol', age: 30 });
+
+			console.log(db.tables);
 		</script>
 	</body>
 </html>
diff --git a/package.json b/package.json
index ca5be19..cb29e6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.25.8",
+	"version": "0.25.9",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
diff --git a/src/database.ts b/src/database.ts
index b2fe710..9734690 100644
--- a/src/database.ts
+++ b/src/database.ts
@@ -1,47 +1,85 @@
+import {findByProp} from './array.ts';
 import {ASet} from './aset.ts';
 
 export type TableOptions = {
 	name: string;
 	key?: string;
+	autoIncrement?: boolean;
 };
 
 export class Database {
 	connection!: Promise<IDBDatabase>;
+	ready = false;
 	tables!: TableOptions[];
 
-	constructor(public readonly database: string, tables: (string | TableOptions)[], public version?: number) {
+	constructor(public readonly database: string, tables?: (string | TableOptions)[], public version?: number) {
 		this.connection = new Promise((resolve, reject) => {
 			const req = indexedDB.open(this.database, this.version);
-			this.tables = tables.map(t => {
+			this.tables = !tables ? [] : tables.map(t => {
 				t = typeof t == 'object' ? t : {name: t};
 				return {...t, name: t.name.toString()};
 			});
-			const tableNames = new ASet(this.tables.map(t => t.name));
 
 			req.onerror = () => reject(req.error);
 
 			req.onsuccess = () => {
 				const db = req.result;
-				if(tableNames.symmetricDifference(new ASet(Array.from(db.objectStoreNames))).length) {
+				const existing = Array.from(db.objectStoreNames);
+				if(!tables) this.tables = existing.map(t => {
+					const tx = db.transaction(t, 'readonly', )
+					const store = tx.objectStore(t);
+					return {name: t, key: <string>store.keyPath};
+				});
+				const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
+				if(tables && desired.symmetricDifference(new ASet(existing)).length) {
 					db.close();
 					Object.assign(this, new Database(this.database, this.tables, db.version + 1));
+					this.connection.then(resolve);
 				} else {
 					this.version = db.version;
 					resolve(db);
 				}
+				this.ready = true;
 			};
 
 			req.onupgradeneeded = () => {
 				const db = req.result;
 				const existingTables = new ASet(Array.from(db.objectStoreNames));
-				existingTables.difference(tableNames).forEach(name => db.deleteObjectStore(name));
-				tableNames.difference(existingTables).forEach(name => db.createObjectStore(name));
+				if(tables) {
+					const desired = new ASet((tables || []).map(t => typeof t == 'string' ? t : t.name));
+					existingTables.difference(desired).forEach(name => db.deleteObjectStore(name));
+					desired.difference(existingTables).forEach(name => {
+						const t = this.tables.find(findByProp('name', name));
+						db.createObjectStore(name, {
+							keyPath: t?.key,
+							autoIncrement: t?.autoIncrement || !t?.key
+						});
+					});
+				}
 			};
 		});
 	}
 
+	async createTable<K extends IDBValidKey = any, T = any>(table: string | TableOptions): Promise<Table<K, T>> {
+		if(typeof table == 'string') table = {name: table};
+		const conn = await this.connection;
+		if(!this.includes(table.name)) {
+			conn.close();
+			Object.assign(this, new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1));
+		}
+		return this.table<K, T>(table.name);
+	}
+
+	async deleteTable(table: string | TableOptions): Promise<void> {
+		if(typeof table == 'string') table = {name: table};
+		if(!this.includes(table.name)) return;
+		const conn = await this.connection;
+		conn.close();
+		Object.assign(this, new Database(this.database, this.tables.filter(t => t.name != table.name), (this.version ?? 0) + 1));
+	}
+
 	includes(name: any): boolean {
-		return !!this.tables.find(t => t.name == name.toString());
+		return !!this.tables.find(t => t.name == (typeof name == 'object' ? name.name : name.toString()));
 	}
 
 	table<K extends IDBValidKey = any, T = any>(name: any): Table<K, T> {
@@ -50,7 +88,12 @@ export class Database {
 }
 
 export class Table<K extends IDBValidKey = any, T = any> {
-	constructor(private readonly database: Database, public readonly name: string) {}
+	constructor(private readonly database: Database, public readonly name: string, public readonly key: keyof T | string = 'id') {
+		this.database.connection.then(() => {
+			const exists = !!this.database.tables.find(findByProp('name', this.name));
+			if(!exists) this.database.createTable(this.name);
+		});
+	}
 
 	async tx<R>(table: string, fn: (store: IDBObjectStore) => IDBRequest, readonly = false): Promise<R> {
 		const db = await this.database.connection;
@@ -67,12 +110,24 @@ export class Table<K extends IDBValidKey = any, T = any> {
 		return this.tx(this.name, store => store.add(value, key));
 	}
 
+	all = this.getAll;
+
+	clear(): Promise<void> {
+		return this.tx(this.name, store => store.clear());
+	}
+
 	count(): Promise<number> {
 		return this.tx(this.name, store => store.count(), true);
 	}
 
-	put(key: K, value: T): Promise<void> {
-		return this.tx(this.name, store => store.put(value, key));
+	create = this.add;
+
+	delete(key: K): Promise<void> {
+		return this.tx(this.name, store => store.delete(key));
+	}
+
+	get(key: K): Promise<T> {
+		return this.tx(this.name, store => store.get(key), true);
 	}
 
 	getAll(): Promise<T[]> {
@@ -83,15 +138,20 @@ export class Table<K extends IDBValidKey = any, T = any> {
 		return this.tx(this.name, store => store.getAllKeys(), true);
 	}
 
-	get(key: K): Promise<T> {
-		return this.tx(this.name, store => store.get(key), true);
+	put(key: K, value: T): Promise<void> {
+		return this.tx(this.name, store => store.put(value, key));
 	}
 
-	delete(key: K): Promise<void> {
-		return this.tx(this.name, store => store.delete(key));
+	read(): Promise<T[]>;
+	read(key: K): Promise<T>;
+	read(key?: K): Promise<T | T[]> {
+		return key ? this.get(key) : this.getAll();
 	}
 
-	clear(): Promise<void> {
-		return this.tx(this.name, store => store.clear());
+	set(value: T, key?: K): Promise<void> {
+		if(!key && !(<any>value)[this.key]) return this.add(value);
+		return this.put(key || (<any>value)[this.key], value);
 	}
+
+	update = this.set;
 }