diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 658b73883..f27217025 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -75,6 +75,7 @@ jobs:
               id: pnpm-cache
               run: |
                 echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
+
             - uses: actions/cache@v3
               name: Setup pnpm cache
               with:
@@ -82,6 +83,7 @@ jobs:
                 key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
                 restore-keys: |
                   ${{ runner.os }}-pnpm-store-
+
             - name: Install dependencies
               run: pnpm install
 
@@ -91,8 +93,8 @@ jobs:
             - name: Tests
               run: pnpm run tests
 
-    verify_create:
-        name: Verify Create
+    verify_init:
+        name: Verify Init
         runs-on: ubuntu-latest
         steps:
             - name: Checkout source
@@ -140,6 +142,62 @@ jobs:
 
             - name: Run init
               run: cd project && node ../houdini/packages/houdini/build/cmd-esm/index.js init -y
+    
+    verify_create:
+        name: Verify Create
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                template: [react, react-typescript, sveltekit-demo]
+        steps:
+            - name: Checkout source
+              uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.ref }}
+
+            - name: Install Node.js
+              uses: actions/setup-node@v3
+              with:
+                node-version: 18.17.1
+
+            - uses: pnpm/action-setup@v2.0.1
+              name: Install pnpm
+              id: pnpm-install
+              with:
+                version: 8
+
+            - name: Get pnpm store directory
+              id: pnpm-cache
+              run: |
+                echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
+
+            - uses: actions/cache@v3
+              name: Setup pnpm cache
+              with:
+                path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
+                key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+                restore-keys: |
+                  ${{ runner.os }}-pnpm-store-
+
+            - name: Install dependencies
+              run: cd packages/create-houdini && pnpm install
+
+            - name: Create template (local)
+              if: matrix.template != 'sveltekit-demo'
+              run: cd packages/create-houdini && pnpm dev test-${{ matrix.template }} -t ${{ matrix.template }} -s local
+
+            - name: Create template (not local)
+              if: matrix.template == 'sveltekit-demo'
+              run: cd packages/create-houdini && pnpm dev test-${{ matrix.template }} -t ${{ matrix.template }}
+
+            - run: cd packages/create-houdini/test-${{ matrix.template }} && npx playwright install
+
+            - name: e2e install
+              run: cd packages/create-houdini/test-${{ matrix.template }} && npm i
+
+            - name: e2e tests
+              if: matrix.template == 'sveltekit-demo'
+              run: cd packages/create-houdini/test-${{ matrix.template }} && npm run test:integration
 
     e2e_tests:
         name: End-to-End Tests
@@ -256,4 +314,4 @@ jobs:
               run: pnpm --filter e2e-kit run lint
 
             - name: End-to-End check
-              run: pnpm --filter e2e-kit run check
+              run: pnpm --filter e2e-kit run check
\ No newline at end of file
diff --git a/packages/create-houdini/.gitignore b/packages/create-houdini/.gitignore
new file mode 100644
index 000000000..e37745539
--- /dev/null
+++ b/packages/create-houdini/.gitignore
@@ -0,0 +1 @@
+test-*
\ No newline at end of file
diff --git a/packages/create-houdini/bin.js b/packages/create-houdini/bin.js
index c628bde5e..ea3b56d6e 100755
--- a/packages/create-houdini/bin.js
+++ b/packages/create-houdini/bin.js
@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import * as p from '@clack/prompts'
+import { program, Option, InvalidArgumentError } from 'commander'
 import * as graphql from 'graphql'
-import { bold, cyan, gray, green, grey, italic, white } from 'kleur/colors'
+import { bold, cyan, gray, grey, italic, white } from 'kleur/colors'
 import fs, { readFileSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { exit } from 'node:process'
@@ -28,6 +29,24 @@ const options = fs.readdirSync(templatesDir).map((templateDir) => {
 	return { ...data, value: templateDir }
 })
 
+program.argument('[project_name]', 'optional project name')
+program.addOption(
+	new Option('-t, --template <template>', 'template you want to use').choices(
+		options.map((c) => c.value)
+	)
+)
+program.addOption(
+	new Option('-s, --schema <schema>', '"local" or "http..."').argParser((value) => {
+		if (value === 'local' || value.startsWith('http')) {
+			return value
+		}
+		throw new InvalidArgumentError('Should be "local" or "http..." or do not set it!')
+	})
+)
+
+program.parse(process.argv)
+const options_cli = program.opts()
+
 p.intro('🎩 Welcome to Houdini!')
 
 // if we weren't given a directory, then we should ask
@@ -78,11 +97,13 @@ if (dirToCreate && !fs.existsSync(projectDir)) {
 	fs.mkdirSync(projectDir)
 }
 
-const template = await p.select({
-	message: 'Which template do you want to use?',
-	initialValue: 'react-typescript',
-	options,
-})
+const template = options_cli.template
+	? options_cli.template
+	: await p.select({
+			message: 'Which template do you want to use?',
+			initialValue: 'react-typescript',
+			options,
+	  })
 if (p.isCancel(template)) {
 	process.exit(1)
 }
@@ -94,14 +115,18 @@ if (!templateMeta) {
 }
 
 // ask if the schema is local or remote
-const localSchema =
-	template !== 'sveltekit-demo' &&
-	(await p.confirm({
-		message: 'Is your api going to be defined in this project too?',
-	}))
+const localSchema = templateMeta.apiUrl
+	? false
+	: options_cli.schema === 'local'
+	? true
+	: options_cli.schema?.startsWith('http')
+	? false
+	: await p.confirm({
+			message: 'Is your api going to be defined in this project too?',
+	  })
 
 // if we have a remote schema then we need to introspect it and write the value
-let apiUrl = templateMeta.apiUrl ?? ''
+let apiUrl = options_cli.schema?.startsWith('http') ? options_cli.schema : templateMeta.apiUrl ?? ''
 if (!localSchema) {
 	let pullSchema_content = ''
 	if (apiUrl === '') {
@@ -153,13 +178,9 @@ copy(
 	['.meta.json']
 )
 
-// if we have a local schema then we have more fiiles to copy
+// if we have a local schema then we have more files to copy
 if (localSchema) {
-	if (template === 'react') {
-		copy(sourcePath('./fragments/localApi'))
-	} else if (template === 'react-typescript') {
-		copy(sourcePath('./fragments/localApi-typescript'))
-	}
+	copy(sourcePath('./fragments/localSchema/' + template))
 }
 
 // If anything goes wrong, we don't want to block the user
diff --git a/packages/create-houdini/fragments/localApi-typescript/src/api/+schema.ts b/packages/create-houdini/fragments/localSchema/react-typescript/src/api/+schema.ts
similarity index 100%
rename from packages/create-houdini/fragments/localApi-typescript/src/api/+schema.ts
rename to packages/create-houdini/fragments/localSchema/react-typescript/src/api/+schema.ts
diff --git a/packages/create-houdini/fragments/localApi/src/api/+schema.js b/packages/create-houdini/fragments/localSchema/react/src/api/+schema.js
similarity index 100%
rename from packages/create-houdini/fragments/localApi/src/api/+schema.js
rename to packages/create-houdini/fragments/localSchema/react/src/api/+schema.js
diff --git a/packages/create-houdini/package.json b/packages/create-houdini/package.json
index 009942b26..dd6e5f42c 100644
--- a/packages/create-houdini/package.json
+++ b/packages/create-houdini/package.json
@@ -20,8 +20,9 @@
 	},
 	"dependencies": {
 		"@clack/prompts": "^0.6.3",
-		"kleur": "^4.1.5",
-		"graphql": "16.8.0"
+		"commander": "^9.4.0",
+		"graphql": "16.8.0",
+		"kleur": "^4.1.5"
 	},
 	"devDependencies": {
 		"@types/node": "^18.7.23",
diff --git a/packages/create-houdini/templates/react-typescript/.graphqlrc.yaml b/packages/create-houdini/templates/react-typescript/.graphqlrc.yaml
new file mode 100644
index 000000000..da0c00d2c
--- /dev/null
+++ b/packages/create-houdini/templates/react-typescript/.graphqlrc.yaml
@@ -0,0 +1,8 @@
+projects:
+    default:
+        schema:
+            - ./$houdini/graphql/schema.graphql
+        documents:
+            - '**/*.gql'
+            - '**/*.tsx'
+            - ./$houdini/graphql/documents.gql
diff --git a/packages/create-houdini/templates/react/.graphqlrc.yaml b/packages/create-houdini/templates/react/.graphqlrc.yaml
new file mode 100644
index 000000000..8e575b52a
--- /dev/null
+++ b/packages/create-houdini/templates/react/.graphqlrc.yaml
@@ -0,0 +1,8 @@
+projects:
+    default:
+        schema:
+            - ./$houdini/graphql/schema.graphql
+        documents:
+            - '**/*.gql'
+            - '**/*.jsx'
+            - ./$houdini/graphql/documents.gql
diff --git a/packages/create-houdini/templates/sveltekit-demo/package.json b/packages/create-houdini/templates/sveltekit-demo/package.json
index 167e2b344..eb5ebff49 100644
--- a/packages/create-houdini/templates/sveltekit-demo/package.json
+++ b/packages/create-houdini/templates/sveltekit-demo/package.json
@@ -15,7 +15,7 @@
 		"test:unit": "vitest"
 	},
 	"devDependencies": {
-		"@playwright/test": "^1.28.1",
+		"@playwright/test": "1.30.0",
 		"@sveltejs/adapter-auto": "^2.0.0",
 		"@sveltejs/kit": "^1.20.4",
 		"@typescript-eslint/eslint-plugin": "^5.45.0",
diff --git a/packages/create-houdini/templates/sveltekit-demo/tests/test.ts b/packages/create-houdini/templates/sveltekit-demo/tests/test.ts
index 5816be413..f8a924355 100644
--- a/packages/create-houdini/templates/sveltekit-demo/tests/test.ts
+++ b/packages/create-houdini/templates/sveltekit-demo/tests/test.ts
@@ -2,5 +2,5 @@ import { expect, test } from '@playwright/test';
 
 test('index page has expected h1', async ({ page }) => {
 	await page.goto('/');
-	await expect(page.getByRole('heading', { name: 'Welcome to SvelteKit' })).toBeVisible();
+	await expect(page.getByRole('heading', { name: 'Welcome to Houdini 🎩' })).toBeVisible();
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d0abaefc..9999c3c0c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -326,6 +326,9 @@ importers:
       '@clack/prompts':
         specifier: ^0.6.3
         version: 0.6.3
+      commander:
+        specifier: ^9.4.0
+        version: 9.4.1
       graphql:
         specifier: 15.5.0
         version: 15.5.0
@@ -2269,7 +2272,7 @@ packages:
     resolution: {integrity: sha512-SKlIcMA71Dha5JnEWlw4XxcaJ+YupuXg0QCZgl2TOLFz4SkGCwU/geAsJvUJFwK2RbVLpQv/UMq67lOaBuwDtg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       '@graphql-tools/utils': 10.0.6(graphql@15.5.0)
       '@graphql-typed-document-node/core': 3.2.0(graphql@15.5.0)
@@ -2282,7 +2285,7 @@ packages:
   /@graphql-tools/merge@8.3.14(graphql@15.5.0):
     resolution: {integrity: sha512-zV0MU1DnxJLIB0wpL4N3u21agEiYFsjm6DI130jqHpwF0pR9HkF+Ni65BNfts4zQelP0GjkHltG+opaozAJ1NA==}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       '@graphql-tools/utils': 9.1.3(graphql@15.5.0)
       graphql: 15.5.0
@@ -2293,7 +2296,7 @@ packages:
     resolution: {integrity: sha512-J7/xqjkGTTwOJmaJQJ2C+VDBDOWJL3lKrHJN4yMaRLAJH3PosB7GiPRaSDZdErs0+F77sH2MKs2haMMkywzx7Q==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       '@graphql-tools/utils': 10.0.6(graphql@15.5.0)
       graphql: 15.5.0
@@ -2304,7 +2307,7 @@ packages:
     resolution: {integrity: sha512-kf3qOXMFcMs2f/S8Y3A8fm/2w+GaHAkfr3Gnhh2LOug/JgpY/ywgFVxO3jOeSpSEdoYcDKLcXVjMigNbY4AdQg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       '@graphql-tools/merge': 9.0.0(graphql@15.5.0)
       '@graphql-tools/utils': 10.0.6(graphql@15.5.0)
@@ -2316,7 +2319,7 @@ packages:
   /@graphql-tools/schema@9.0.12(graphql@15.5.0):
     resolution: {integrity: sha512-DmezcEltQai0V1y96nwm0Kg11FDS/INEFekD4nnVgzBqawvznWqK6D6bujn+cw6kivoIr3Uq//QmU/hBlBzUlQ==}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       '@graphql-tools/merge': 8.3.14(graphql@15.5.0)
       '@graphql-tools/utils': 9.1.3(graphql@15.5.0)
@@ -2329,7 +2332,7 @@ packages:
     resolution: {integrity: sha512-hZMjl/BbX10iagovakgf3IiqArx8TPsotq5pwBld37uIX1JiZoSbgbCIFol7u55bh32o6cfDEiiJgfAD5fbeyQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       '@graphql-typed-document-node/core': 3.2.0(graphql@15.5.0)
       dset: 3.1.2
@@ -2340,7 +2343,7 @@ packages:
   /@graphql-tools/utils@9.1.3(graphql@15.5.0):
     resolution: {integrity: sha512-bbJyKhs6awp1/OmP+WKA1GOyu9UbgZGkhIj5srmiMGLHohEOKMjW784Sk0BZil1w2x95UPu0WHw6/d/HVCACCg==}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       graphql: 15.5.0
       tslib: 2.6.2
@@ -2349,7 +2352,7 @@ packages:
   /@graphql-tools/utils@9.2.1(graphql@15.5.0):
     resolution: {integrity: sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==}
     peerDependencies:
-      graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       '@graphql-typed-document-node/core': 3.2.0(graphql@15.5.0)
       graphql: 15.5.0
@@ -2359,7 +2362,7 @@ packages:
   /@graphql-typed-document-node/core@3.2.0(graphql@15.5.0):
     resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
     peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+      graphql: 15.5.0
     dependencies:
       graphql: 15.5.0
     dev: false
@@ -2375,7 +2378,7 @@ packages:
     resolution: {integrity: sha512-pjA7xLIYVCugxyM/FwG7SlbPVPxn8cr5AFT0I4EsgwK2z6D0oM+fN6guPam7twTVKr0BmA/EtVm2RWkik114Mw==}
     peerDependencies:
       '@graphql-tools/utils': ^9.2.1
-      graphql: ^15.2.0 || ^16.0.0
+      graphql: 15.5.0
       graphql-yoga: ^3.9.1
     dependencies:
       '@graphql-tools/utils': 9.2.1(graphql@15.5.0)
@@ -6930,7 +6933,7 @@ packages:
     resolution: {integrity: sha512-44yBuw2/DLNEiMypbNZBt1yMDbBmyVPVesPywnteGGALiBmdyy1JP8jSg8ClLePg8ZZxk0O4BLhd1a6U/1jDOQ==}
     engines: {node: ^12.20.0 || ^14.15.0 || >= 15.9.0}
     peerDependencies:
-      graphql: ^16.2.0
+      graphql: 15.5.0
     dependencies:
       graphql: 15.5.0
     dev: false
@@ -6939,7 +6942,7 @@ packages:
     resolution: {integrity: sha512-4EiZ3/UXYcjm+xFGP544/yW1+DVI8ZpKASFbzrV5EDTFWJp0ZvLl4Dy2fSZAzz9imKp5pZMIcjB0x/H69Pv/6w==}
     engines: {node: '>=10'}
     peerDependencies:
-      graphql: '>=0.11 <=16'
+      graphql: 15.5.0
     dependencies:
       graphql: 15.5.0
     dev: false
@@ -6948,7 +6951,7 @@ packages:
     resolution: {integrity: sha512-MvCLhFecYNIKuxAZisPjpIL9lxRYbpgPSNKENDO/8CV3oiFlsLJHZb5dp2sVAeLafXHeZ9TgkijLthUBc1+Jag==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      graphql: ^15.2.0 || ^16.0.0
+      graphql: 15.5.0
     dependencies:
       '@envelop/core': 4.0.1
       '@graphql-tools/executor': 1.2.0(graphql@15.5.0)