diff --git a/package.json b/package.json
index 7cac3ff..a3d5fce 100755
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
   },
   "main": "node_modules/docpad/bin/docpad-server",
   "scripts": {
-    "start": "node ./node_modules/docpad/bin/docpad run --port 9779"
+    "start": "node ./node_modules/docpad/bin/docpad run --port 9779",
+    "test": "bash tests/create_page_static_check.sh"
   }
 }
diff --git a/src/documents/index.html.coffee b/src/documents/index.html.coffee
index d376ff3..548cec6 100644
--- a/src/documents/index.html.coffee
+++ b/src/documents/index.html.coffee
@@ -67,6 +67,35 @@ aside '.app', ->
 				button '.button.button-cancel', ->
 					'Cancel'
 
+	section '.page-add.modal.main.show-site', ->
+		header ->
+			span '.title', -> 'Create Page'
+
+		div '.body', ->
+			form '.page-add-form', action:'', method:'PUT', ->
+				div '.field.field-title', ->
+					label -> 'Title'
+					input type:'text', placeholder:'New page', required:'required', ->
+
+				div '.field.field-path', ->
+					label -> 'Path'
+					input type:'text', value:'new-page.html.md', required:'required', ->
+
+				div '.field.field-collection', ->
+					label -> 'Type'
+					select ->
+						option -> 'pages'
+
+				div '.field.field-layout', ->
+					label -> 'Layout'
+					select ->
+						option -> 'default'
+
+				input '.button.button-save', type:'submit', value:'Create'
+
+				button '.button.button-cancel', ->
+					'Cancel'
+
 
 	aside '.site-list-container', -> \
 	section '.site-list.main.show-admin', ->
diff --git a/src/documents/scripts/models/base.js.coffee b/src/documents/scripts/models/base.js.coffee
index 3ceaf6f..543d61f 100644
--- a/src/documents/scripts/models/base.js.coffee
+++ b/src/documents/scripts/models/base.js.coffee
@@ -1,5 +1,6 @@
 # Import
 Backbone = window.Backbone
+_ = window._
 queryEngine = require('query-engine')
 {wait, thrower, extractData, ignoreSync} = require('../util')
 {TaskGroup} = require('taskgroup')
@@ -122,7 +123,9 @@ class Collection extends queryEngine.QueryCollection
 					return next(err)
 
 				# Save
-				opts.model.save opts, (err) =>
+				modelOpts = _.extend({}, opts)
+				delete modelOpts.method
+				opts.model.sync modelOpts, (err) =>
 					# Add
 					return next(err)  if err
 					@add(opts.model)
diff --git a/src/documents/scripts/models/file.js.coffee b/src/documents/scripts/models/file.js.coffee
index 62868fb..607acc8 100644
--- a/src/documents/scripts/models/file.js.coffee
+++ b/src/documents/scripts/models/file.js.coffee
@@ -21,6 +21,7 @@ class File extends Model
 		layout: null
 		author: null
 		site: null  # The model of the site this is for
+		fileCollection: null  # The collection this file should be synced through
 
 	constructor: ->
 		@metaAttributes ?= ['title', 'content', 'date', 'author', 'layout']
@@ -39,8 +40,10 @@ class File extends Model
 		site = file.get('site')
 		siteUrl = site.get('url')
 		siteToken = site.get('token')
+		fileCollection = file.get('fileCollection')
+		fileCollectionName = fileCollection?.get?('name') or file.get('collection') or 'database'
 
-		return "#{siteUrl}/restapi/collection/database/#{fileRelativePath}?securityToken=#{siteToken}"
+		return "#{siteUrl}/restapi/collection/#{fileCollectionName}/#{fileRelativePath}?securityToken=#{siteToken}"
 
 	reset: ->
 		data = {}
@@ -52,16 +55,18 @@ class File extends Model
 		@
 
 	toJSON: ->
-		return _.omit(super(), ['site'])
+		return _.omit(super(), ['site', 'fileCollection'])
 
 	parse: ->
 		# Prepare
 		data = super
+		data ?= {}
 
 		# Apply meta directly
-		for own key,value of data.meta
-			data[key] = value
-		delete data.meta
+		if data.meta
+			for own key,value of data.meta
+				data[key] = value
+			delete data.meta
 
 		# Fix date
 		data.date = new Date(data.date)  if data.date
@@ -100,4 +105,4 @@ File.collection = new Files([], {
 })
 
 # Export
-module.exports = {File, Files}
\ No newline at end of file
+module.exports = {File, Files}
diff --git a/src/documents/scripts/views/app.js.coffee b/src/documents/scripts/views/app.js.coffee
index 926654e..1e8de16 100644
--- a/src/documents/scripts/views/app.js.coffee
+++ b/src/documents/scripts/views/app.js.coffee
@@ -2,6 +2,7 @@
 $ = window.$
 {View, Route} = require('./base')
 {Site} = require('../models/site')
+{File} = require('../models/file')
 {SiteListItem} = require('./site')
 {FileEditItem, FileListItem} = require('./file')
 {wait, thrower} = require('../util')
@@ -26,6 +27,12 @@ class App extends View
 		'.content-row-file': '$files'
 		'.content-row-site': '$sites'
 		'.page-edit-container': '$pageEditContainer'
+		'.page-add.modal': '$pageAddModal'
+		'.page-add-form': '$pageAddForm'
+		'.page-add .field-title :input': '$pageAddTitle'
+		'.page-add .field-path :input': '$pageAddPath'
+		'.page-add .field-collection :input': '$pageAddCollection'
+		'.page-add .field-layout :input': '$pageAddLayout'
 
 	events:
 		'click .sites .content-cell-name': 'clickSite'
@@ -36,8 +43,16 @@ class App extends View
 		'click .menu .button': 'clickMenuButton'
 		'click .button-login': 'clickLogin'
 		'click .button-add-site': 'clickAddSite'
+		'click .button-add-document': 'clickAddDocument'
+		'keyup .page-add .field-title :input': 'changePageAddTitle'
+		'change .page-add .field-title :input': 'changePageAddTitle'
+		'keyup .page-add .field-path :input': 'changePageAddPath'
+		'change .page-add .field-path :input': 'changePageAddPath'
+		'change .page-add .field-collection :input': 'changePageAddCollection'
 		'submit .site-add-form': 'submitSite'
 		'click .site-add-form .button-cancel': 'submitSiteCancel'
+		'submit .page-add-form': 'submitDocument'
+		'click .page-add-form .button-cancel': 'submitDocumentCancel'
 
 	constructor: ->
 		# Super
@@ -309,6 +324,150 @@ class App extends View
 		# Chain
 		@
 
+	getPageAddCollections: ->
+		customFileCollections = @currentSite?.get('customFileCollections')
+		collections = []
+		customFileCollections?.each (customFileCollection) ->
+			name = customFileCollection.get('name')
+			collections.push(customFileCollection)  unless name in ['layouts', 'authors']
+		collections.push(@currentFileCollection)  if collections.length is 0 and @currentFileCollection
+		return collections
+
+	getPageAddLayouts: ->
+		return @currentSite?.getCollectionFiles('layouts')?.models or []
+
+	getPageAddSlug: (title) ->
+		slug = (title or '').toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '')
+		return slug or 'new-page'
+
+	getPageAddDefaultPath: ->
+		title = @$pageAddTitle.val() or ''
+		"#{@getPageAddSlug(title)}.html.md"
+
+	fillPageAddForm: ->
+		collections = @getPageAddCollections()
+		layouts = @getPageAddLayouts()
+
+		@$pageAddCollection.empty()
+		for collection in collections
+			@$pageAddCollection.append $('<option>',
+				text: collection.get('name')
+				value: collection.get('name')
+			)
+		@$pageAddCollection.val(@currentFileCollection?.get('name'))
+		@$pageAddCollection.prop('disabled', collections.length <= 1)
+
+		@$pageAddLayout.empty()
+		for layout in layouts
+			name = layout.get('name') or layout.get('title') or layout.get('relativePath')
+			@$pageAddLayout.append $('<option>',
+				text: name
+				value: name
+			)
+		unless layouts.length
+			@$pageAddLayout.append $('<option>',
+				text: 'None'
+				value: ''
+			)
+		@$pageAddLayout.prop('disabled', layouts.length <= 1)
+
+		@$pageAddTitle.val('')
+		@$pageAddPath.val(@getPageAddDefaultPath())
+		@
+
+	changePageAddTitle: (e) =>
+		return @  if @$pageAddPath.data('userEdited')
+		@$pageAddPath.val(@getPageAddDefaultPath())
+		@
+
+	changePageAddPath: (e) =>
+		@$pageAddPath.data('userEdited', true)
+		@
+
+	changePageAddCollection: (e) =>
+		@
+
+	addFileToCollection: (fileCollection, file) ->
+		relativePath = file.get('relativePath')
+		relativePaths = fileCollection.get('relativePaths') or []
+		unless relativePath in relativePaths
+			relativePaths = relativePaths.slice(0)
+			relativePaths.push(relativePath)
+			fileCollection.set('relativePaths', relativePaths)
+
+		File.collection.add(file)
+		fileCollection.get('files')?.add(file)
+		@
+
+	# A "add new document" button was clicked
+	# Show the new document modal
+	clickAddDocument: (e) =>
+		e.preventDefault()
+		e.stopPropagation()
+
+		unless @currentSite and @currentFileCollection
+			alert 'Open a site before creating a page.'
+			return @
+
+		@$pageAddPath.data('userEdited', false)
+		@fillPageAddForm()
+		@$pageAddModal.show()
+		@$pageAddTitle.focus()
+		@
+
+	submitDocument: (e) =>
+		# Disable click through
+		e.preventDefault()
+		e.stopPropagation()
+
+		title = @$pageAddTitle.val() or ''
+		relativePath = @$pageAddPath.val() or ''
+		collectionName = @$pageAddCollection.val() or @currentFileCollection.get('name')
+		layout = @$pageAddLayout.val() or ''
+		fileCollection = @currentSite.getCollection(collectionName) or @currentFileCollection
+
+		unless title and relativePath and fileCollection
+			alert 'Page title, path, and collection are required.'
+			return @
+
+		content = "---\n"
+		content += "title: \"#{title}\"\n"
+		content += "layout: \"#{layout}\"\n"  if layout
+		content += "---\n\n"
+		content += "# #{title}\n"
+
+		file = new File {
+			site: @currentSite
+			fileCollection
+			relativePath
+			title
+			layout
+			content
+			contentType: 'text/x-markdown'
+		}
+		file.sync {}, (err) =>
+			if err
+				alert "Could not create page: #{err.message or err}"
+				return
+
+			@addFileToCollection(fileCollection, file)
+			@$pageAddModal.hide()
+			@openApp({
+				site: @currentSite
+				fileCollection
+				file
+			})
+
+		@
+
+	submitDocumentCancel: (e) =>
+		# Disable click through
+		e.preventDefault()
+		e.stopPropagation()
+
+		@$pageAddModal.hide()
+		@
+
 	# Handle login button
 	# Send the request off to persona to start the login process
 	# Receives the result via our `onMessage` handler
diff --git a/src/documents/styles/app.css.styl b/src/documents/styles/app.css.styl
index bd1ee3e..c4025aa 100644
--- a/src/documents/styles/app.css.styl
+++ b/src/documents/styles/app.css.styl
@@ -341,6 +341,7 @@ select.collection-list
 
 
 .site-add
+.page-add
 .site-list
 	header
 		color: colorAdminBackground
@@ -353,6 +354,10 @@ select.collection-list
 	.button-drop
 		background: colorSiteBackground
 
+.page-add
+	header
+		color: colorSiteBackground
+
 .page-edit
 	.title
 		color: colorPageBackground
@@ -562,4 +567,4 @@ select.collection-list
 .login
 	text-align: center
 	border: none
-	box-shadow: none
\ No newline at end of file
+	box-shadow: none
diff --git a/tests/create_page_collection_check.js b/tests/create_page_collection_check.js
new file mode 100644
index 0000000..bdd0a49
--- /dev/null
+++ b/tests/create_page_collection_check.js
@@ -0,0 +1,86 @@
+#!/usr/bin/env node
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+
+const appView = fs.readFileSync('src/documents/scripts/views/app.js.coffee', 'utf8');
+
+const helper = appView.match(/\n\taddFileToCollection: \(fileCollection, file\) ->[\s\S]*?\n\n\t# A "add new document" button was clicked/);
+assert(helper, 'addFileToCollection helper should be present');
+
+const helperBlock = helper[0];
+assert(helperBlock.includes("relativePath = file.get('relativePath')"), 'helper should read the created file relativePath');
+assert(helperBlock.includes("relativePaths = fileCollection.get('relativePaths') or []"), 'helper should read collection relativePaths');
+assert(helperBlock.includes('relativePaths = relativePaths.slice(0)'), 'helper should clone relativePaths before setting');
+assert(helperBlock.includes('relativePaths.push(relativePath)'), 'helper should append the created relativePath');
+assert(helperBlock.includes("fileCollection.set('relativePaths', relativePaths)"), 'helper should update the selected collection relativePaths');
+assert(helperBlock.includes('File.collection.add(file)'), 'helper should add the created file to the global collection');
+assert(helperBlock.includes("fileCollection.get('files')?.add(file)"), 'helper should add the created file to the selected live child collection');
+
+const submitDocument = appView.match(/\n\tsubmitDocument: \(e\) =>[\s\S]*?\n\tsubmitDocumentCancel:/);
+assert(submitDocument, 'submitDocument block should be present');
+const submitBlock = submitDocument[0];
+assert(submitBlock.includes('@addFileToCollection(fileCollection, file)'), 'submitDocument should update the selected collection before opening the file');
+
+function makeCollection(relativePaths) {
+	const attrs = {
+		relativePaths: relativePaths,
+		files: {
+			items: [],
+			add(file) {
+				if (!this.items.includes(file)) this.items.push(file);
+			},
+			get(relativePath) {
+				return this.items.find((file) => file.get('relativePath') === relativePath) || null;
+			}
+		}
+	};
+	return {
+		get(key) {
+			return attrs[key];
+		},
+		set(key, value) {
+			attrs[key] = value;
+		}
+	};
+}
+
+function makeFile(relativePath) {
+	return {
+		get(key) {
+			return key === 'relativePath' ? relativePath : null;
+		}
+	};
+}
+
+function addFileToCollection(fileCollection, file, globalFiles) {
+	const relativePath = file.get('relativePath');
+	let relativePaths = fileCollection.get('relativePaths') || [];
+	if (!relativePaths.includes(relativePath)) {
+		relativePaths = relativePaths.slice(0);
+		relativePaths.push(relativePath);
+		fileCollection.set('relativePaths', relativePaths);
+	}
+
+	if (!globalFiles.includes(file)) globalFiles.push(file);
+	fileCollection.get('files').add(file);
+}
+
+const originalRelativePaths = ['index.html.md'];
+const fileCollection = makeCollection(originalRelativePaths);
+const globalFiles = [];
+const file = makeFile('hello-world.html.md');
+
+addFileToCollection(fileCollection, file, globalFiles);
+
+assert.deepStrictEqual(originalRelativePaths, ['index.html.md'], 'original relativePaths array should not be mutated in place');
+assert.deepStrictEqual(fileCollection.get('relativePaths'), ['index.html.md', 'hello-world.html.md'], 'selected collection should include the new relativePath');
+assert.strictEqual(globalFiles[0], file, 'created file should be added globally');
+assert.strictEqual(fileCollection.get('files').get('hello-world.html.md'), file, 'selected collection child files should contain the new file immediately');
+
+addFileToCollection(fileCollection, file, globalFiles);
+assert.deepStrictEqual(fileCollection.get('relativePaths'), ['index.html.md', 'hello-world.html.md'], 'relativePath should not be duplicated');
+assert.strictEqual(fileCollection.get('files').items.length, 1, 'child files collection should not duplicate the file');
+
+console.log('create page collection checks passed');
diff --git a/tests/create_page_payload_check.js b/tests/create_page_payload_check.js
new file mode 100755
index 0000000..78e3f8e
--- /dev/null
+++ b/tests/create_page_payload_check.js
@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+
+const appView = fs.readFileSync('src/documents/scripts/views/app.js.coffee', 'utf8');
+const fileModel = fs.readFileSync('src/documents/scripts/models/file.js.coffee', 'utf8');
+
+const submitDocument = appView.match(/\n\tsubmitDocument: \(e\) =>[\s\S]*?\n\tsubmitDocumentCancel:/);
+assert(submitDocument, 'submitDocument block should be present');
+
+const block = submitDocument[0];
+assert(block.includes('content = "---\\n"'), 'submitDocument should build generated markdown in content');
+assert(block.includes('content += "title: \\"#{title}\\"\\n"'), 'content should include title front matter');
+assert(block.includes('content += "layout: \\"#{layout}\\"\\n"  if layout'), 'content should include optional layout front matter');
+assert(block.includes('contentType: \'text/x-markdown\''), 'new files should be marked as markdown');
+assert(block.includes('\n\t\t\tcontent\n'), 'new File payload should include content');
+assert(!block.includes('\n\t\t\tsource\n'), 'new File payload should not send generated markdown as source metadata');
+
+const payload = {
+	site: {id: 'site'},
+	fileCollection: {name: 'pages'},
+	relativePath: 'hello-world.html.md',
+	title: 'Hello World',
+	layout: 'default',
+	content: '---\ntitle: "Hello World"\nlayout: "default"\n---\n\n# Hello World\n',
+	contentType: 'text/x-markdown'
+};
+
+const requestBody = Object.assign({}, payload);
+delete requestBody.site;
+delete requestBody.fileCollection;
+
+assert.strictEqual(requestBody.relativePath, 'hello-world.html.md');
+assert.strictEqual(requestBody.contentType, 'text/x-markdown');
+assert.strictEqual(requestBody.content, '---\ntitle: "Hello World"\nlayout: "default"\n---\n\n# Hello World\n');
+assert(!Object.prototype.hasOwnProperty.call(requestBody, 'source'), 'REST request body should not contain source metadata');
+
+assert(
+	fileModel.includes("return _.omit(super(), ['site', 'fileCollection'])"),
+	'File.toJSON should omit local-only site and fileCollection pointers'
+);
+
+console.log('create page payload checks passed');
diff --git a/tests/create_page_static_check.sh b/tests/create_page_static_check.sh
new file mode 100755
index 0000000..6e9546a
--- /dev/null
+++ b/tests/create_page_static_check.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+APP_VIEW="src/documents/scripts/views/app.js.coffee"
+BASE_MODEL="src/documents/scripts/models/base.js.coffee"
+FILE_MODEL="src/documents/scripts/models/file.js.coffee"
+INDEX_VIEW="src/documents/index.html.coffee"
+APP_STYLES="src/documents/styles/app.css.styl"
+
+grep -Fq "'click .button-add-document': 'clickAddDocument'" "$APP_VIEW"
+grep -Fq "'submit .page-add-form': 'submitDocument'" "$APP_VIEW"
+grep -Fq "fillPageAddForm: ->" "$APP_VIEW"
+grep -Fq '@$pageAddLayout.prop('\''disabled'\'', layouts.length <= 1)' "$APP_VIEW"
+grep -Fq "{File} = require('../models/file')" "$APP_VIEW"
+grep -Fq "file = new File {" "$APP_VIEW"
+grep -Fq "file.sync {}, (err) =>" "$APP_VIEW"
+grep -Fq "addFileToCollection: (fileCollection, file) ->" "$APP_VIEW"
+grep -Fq "fileCollection.set('relativePaths', relativePaths)" "$APP_VIEW"
+grep -Fq "fileCollection.get('files')?.add(file)" "$APP_VIEW"
+grep -Fq "@addFileToCollection(fileCollection, file)" "$APP_VIEW"
+grep -Fq "content += \"layout: \\\"#{layout}\\\"\\n\"  if layout" "$APP_VIEW"
+grep -Fq "contentType: 'text/x-markdown'" "$APP_VIEW"
+
+grep -Fq "delete modelOpts.method" "$BASE_MODEL"
+grep -Fq "opts.model.sync modelOpts" "$BASE_MODEL"
+grep -Fq "fileCollectionName = fileCollection?.get?('name') or file.get('collection') or 'database'" "$FILE_MODEL"
+grep -Fq "return _.omit(super(), ['site', 'fileCollection'])" "$FILE_MODEL"
+grep -Fq "if data.meta" "$FILE_MODEL"
+
+grep -Fq "section '.page-add.modal.main.show-site'" "$INDEX_VIEW"
+grep -Fq "form '.page-add-form'" "$INDEX_VIEW"
+grep -Fq "div '.field.field-layout'" "$INDEX_VIEW"
+grep -Fq "li '.button.button-add-document'" "$INDEX_VIEW"
+
+grep -Fq ".page-add" "$APP_STYLES"
+
+node tests/create_page_payload_check.js
+node tests/create_page_collection_check.js
+
+echo "create page static checks passed"