V2.10.7 (#1215 )

* Fix for box-shadow/border-image issues on blockquotes in new columns (#1179) * Fix for issues with box-shadow and border-images on blockquotes when they appear at the top of columns other than the first. * Update phb.style.less Change to `-webkit-transform` IAW Github PR discussion * Add comment Co-authored-by: Sean Robertson <srobertson@fqnz.co.nz> Co-authored-by: Trevor Buckner <calculuschild@gmail.com> * Title will always return *something*, and not CSS (#1214) * Bump codemirror from 5.59.1 to 5.59.2 (#1200) Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.59.1 to 5.59.2. - [Release notes](https://github.com/codemirror/CodeMirror/releases) - [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md) - [Commits](https://github.com/codemirror/CodeMirror/compare/5.59.1...5.59.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump mongoose from 5.11.9 to 5.11.13 (#1199) Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.11.9 to 5.11.13. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md) - [Commits](https://github.com/Automattic/mongoose/compare/5.11.9...5.11.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump fs-extra from 9.0.1 to 9.1.0 (#1197) Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.0.1 to 9.1.0. - [Release notes](https://github.com/jprichardson/node-fs-extra/releases) - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.0.1...9.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump eslint from 7.17.0 to 7.18.0 (#1195) Bumps [eslint](https://github.com/eslint/eslint) from 7.17.0 to 7.18.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.17.0...v7.18.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump nconf from 0.11.0 to 0.11.1 (#1190) Bumps [nconf](https://github.com/flatiron/nconf) from 0.11.0 to 0.11.1. - [Release notes](https://github.com/flatiron/nconf/releases) - [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md) - [Commits](https://github.com/flatiron/nconf/compare/v0.11.0...v0.11.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump googleapis from 66.0.0 to 67.0.0 (#1189) Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 66.0.0 to 67.0.0. - [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases) - [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/v66.0.0...v67.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Trevor Buckner <calculuschild@gmail.com> * Bump express-static-gzip from 2.1.0 to 2.1.1 (#1180) Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/tkoenig89/express-static-gzip/releases) - [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.0...v2.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Trevor Buckner <calculuschild@gmail.com> * use fa-info-circle instead of fa-bars (#1109) * use fa-info-circle instead of fa-bars * Change Metadata button to Info Icon with Text Co-authored-by: Trevor Buckner <calculuschild@gmail.com> * Up Version Co-authored-by: G.Ambatte <sean@robertson-family.nz> Co-authored-by: Sean Robertson <srobertson@fqnz.co.nz> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: ericscheid <ericscheid@users.noreply.github.com>
FreeBSD installation (#1165 )
2026-01-23 18:43:02 +00:00 · 2021-01-25 21:47:36 -05:00 · 2021-01-10 17:44:49 -05:00 · 2021-01-09 02:03:08 -05:00 · 2021-01-09 01:24:03 -05:00 · 2021-01-02 18:38:11 -05:00
70 changed files with 6063 additions and 6311 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2
 jobs:
  build:
    docker:
-      - image: circleci/node:8.9
+      - image: circleci/node:12.16.3
      - image: circleci/mongo:3.4-jessie

    working_directory: ~/repo
@@ -30,4 +30,3 @@ jobs:

      # run tests!
      - run: npm run circleci
-
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
-	root: true,
+	root          : true,
 	parserOptions : {
 		ecmaVersion  : 9,
 		sourceType   : 'module',
@@ -9,6 +9,7 @@ module.exports = {
 	},
 	env : {
 		browser : true,
+		node    : true
 	},
 	plugins : ['react'],
 	rules   : {
@@ -47,14 +48,14 @@ module.exports = {
 		'no-var'          : 'warn',
 		'prefer-const'    : 'warn',
 		'prefer-template' : 'warn',
-		'quotes'          : ['warn', 'single', { 'allowTemplateLiterals': true } ],
+		'quotes'          : ['warn', 'single', { 'allowTemplateLiterals': true }],
 		'semi'            : ['warn', 'always'],

 		/** Whitespace **/
 		'array-bracket-spacing' : ['warn', 'never'],
 		'arrow-spacing'         : ['warn', { before: false, after: false }],
 		'comma-spacing'         : ['warn', { before: false, after: true }],
-		'indent'                : ['warn', 'tab'],
+		'indent'                : ['warn', 'tab', { 'MemberExpression': 'off' }],
 		'keyword-spacing'       : ['warn', {
 			before    : true,
 			after     : true,
@@ -66,7 +67,7 @@ module.exports = {
 			multiLine  : { beforeColon: true, afterColon: true, align: 'colon' },
 			singleLine : { beforeColon: false, afterColon: true }
 		}],
-		'linebreak-style'               : ['warn', 'unix'],
+		'linebreak-style'               : 'off',
 		'no-trailing-spaces'            : 'warn',
 		'no-whitespace-before-property' : 'warn',
 		'object-curly-spacing'          : ['warn', 'always'],
@@ -74,4 +75,4 @@ module.exports = {
 		'space-in-parens'               : ['warn', 'never'],
 		'template-curly-spacing'        : ['warn', 'never'],
 	}
-};
+};
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ config/local.*

 todo.md
 startDB.bat
+startMViewer.bat
--- a/17
+++ b/17
@@ -1,14 +1,19 @@
 FROM node:8

+ENV NODE_ENV=docker
+
 # Create app directory
 WORKDIR /usr/src/app

-# Bundle app source
+# Copy package.json into the image, then run yarn install
+# This improves caching so we don't have to download the dependencies every time the code changes
+COPY package.json ./
+# --ignore-scripts tells yarn not to run postbuild.  We run it explicitly later
+RUN yarn install --ignore-scripts
+
+# Bundle app source and build application
 COPY . .
-
-ENV NODE_ENV=docker
-
-RUN yarn
+RUN yarn build

 EXPOSE 8000
-CMD [ "yarn", "start" ]
+CMD [ "yarn", "start" ]
--- a/README.DOCKER.md
+++ b/README.DOCKER.md
@@ -0,0 +1,12 @@
+# Running Homebrewery via Docker
+
+The repo includes a Dockerfile and a docker-compose.yml file.
+
+To run the application via docker-compose.yml:
+`docker-compose up -d`
+
+To stop the application:
+`docker-compose down`
+
+To stop the application and remove all data:
+`docker-compose down -v`
--- a/README.FREEBSD.md
+++ b/README.FREEBSD.md
@@ -0,0 +1,35 @@
+# FreeBSD/FreeNAS Installation Instructions
+
+## Before Installing
+
+These instructions assume that you are installing to a completely new, fresh FreeBSD/FreeNAS jail. As such, some steps will not be necessary if you are installing to an existing FreeBSD/FreeNAS install.
+
+## Installation instructions
+
+1. Create a new jail, with the appropriate network settings to access the internet.
+
+2. Install wget (`pkg install -y wget`). On a fresh jail, you will be prompted to press 'Y' to set up `pkg`.
+
+3. Download the installation script (`wget --no-check-certificate https://raw.githubusercontent.com/naturalcrit/homebrewery/master/freebsd/install.sh`). The parameter `--no-check-certificate` is required as we haven't set up any trusted certificates/authorities yet.
+
+4. Make the downloaded file executable (`chmod +x install.sh`).
+
+5. Run the script (`./install.sh`). This will automatically download all of the required packages, install both them and HomeBrewery, configure the system and finally start HomeBrewery.
+
+**NOTE:** At this time, the script **ONLY** installs HomeBrewery. It does **NOT** install the NaturalCrit login system, as that is currently a completely separate project.
+
+---
+
+### Testing
+
+These installation instructions have been tested on the following FreeBSD/FreeNAS platforms:
+
+* FreeNAS-11.3-U5; Jail 11.4-RELEASE-p2
+
+## Final Notes
+
+While this installation process works successfully at the time of writing (December 28, 2020), it relies on all of the Node.JS packages used in the HomeBrewery project retaining their cross-platform capabilities to continue to function under FreeBSD. This is one of the inherent advantages of Node.JS, but it is by no means guaranteed and as such, functionality or even installation under FreeBSD may fail without warning at some point in the future.
+
+Regards,  
+G  
+December 28, 2020
--- a/README.md
+++ b/README.md
@@ -1,41 +1,93 @@
 # The Homebrewery
-The Homebrewery is a tool for making authentic looking [D&D content](https://dnd.wizards.com/products/tabletop-games/rpg-products/rpg_playershandbook) using [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). It is distributed under the terms of the [MIT License](./license).
+
+[![Homebrewery](https://circleci.com/gh/naturalcrit/homebrewery/tree/master.svg?style=svg)](https://app.circleci.com/pipelines/github/naturalcrit/homebrewery?branch=master)
+
+The Homebrewery is a tool for making authentic looking [D&D content][dnd-content-url]
+using [Markdown][markdown-url]. It is distributed under the terms of the [MIT License](./license).
+
+[dnd-content-url]: https://dnd.wizards.com/products/tabletop-games/rpg-products/rpg_playershandbook
+[markdown-url]: https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet

 ## Quick Start
-The easiest way to get started using the Homebrewery is to use it [on our website](https://homebrewery.naturalcrit.com). The code is open source, so feel free to clone it, tinker with it. If you want to make changes to the code, you can run your own local version for testing by following the installation instructions below.
+The easiest way to get started using the Homebrewery is to use it
+[on our website][homebrewery-url]. The code is open source, so feel free to
+clone it, tinker with it. If you want to make changes to the code, you can run
+your own local version for testing by following the installation instructions
+below.
+
+[homebrewery-url]: https://homebrewery.naturalcrit.com

 ### Installation
-First, install two programs that the Homebrewery requires to run.
+First, install three programs that the Homebrewery requires to run and retrieve
+updates:

 1. install [node](https://nodejs.org/en/)
-1. install [mongodb](https://www.mongodb.com/)
+1. install [mongodb](https://www.mongodb.com/try/download/community) (Community version)

-Second, download a copy of the repository. If you have git you can do so with
+    For easiest installation, follow these steps:
+    1. In the installer, uncheck the option to run as a service
+    1. You can install MongoDB Compass if you want a GUI to view your database documents
+    1. Go to the C drive and create a folder called "data"
+    1. Inside the "data" folder, create a new folder called "db"
+    1. Open a command prompt or other terminal and navigate to your mongodb install folder (c:program files\mongo\server\4.4\bin)
+    1. In the command prompt, run "mongod", which will start up your local database server
+    1. While MongoD is running, open a second command prompt and navigate to the mongodb install folder
+    1. In the second command prompt, run "mongo", which allows you to edit the database
+    1. Type `use homebrewery` to create the homebrewery database. You should see `switched to db homebrewery`
+    1. Type `db.brews.insert({"title":"test"})` to create a blank document. You should see `WriteResult({ "nInserted" : 1 })`
+    1. Search in Windows for "Advanced system settings" and open it
+    1. Click "Environment variables", find the "path" variable, and double-click to open it
+    1. Click "New" and paste in the path to the mongodb "bin" folder
+    1. Click "OK", "OK", "OK" to close all the windows
+1. install [git](https://git-scm.com/downloads) (select the option that allows Git to run from the command prompt)
+
+Checkout the repo ([documentation][github-clone-repo-docs-url]):
 ```
 git clone https://github.com/naturalcrit/homebrewery.git
 ```

-Third, you will need to add the environment variable `NODE_ENV = local` to allow the project to run locally.
+[github-clone-repo-docs-url]: https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/cloning-a-repository
+
+Second, you will need to add the environment variable `NODE_ENV=local` to allow
+the project to run locally.

 You can set this temporarily in your shell of choice:
 * Windows Powershell: `$env:NODE_ENV="local"`
 * Windows CMD: `set NODE_ENV=local`
 * Linux / OSX: `export NODE_ENV=local`

-Fourth, you will need to install the program and run it using the two commands:
+Third, you will need to install the Node dependencies, compile the app, and run
+it using the two commands:

 1. `npm install`
 1. `npm start`

-You should now be able to go to [http://localhost:8000](http://localhost:8000) in your browser and use the Homebrewery offline.
+You should now be able to go to [http://localhost:8000](http://localhost:8000)
+in your browser and use the Homebrewery offline.
+
+### Running the application via Docker
+
+Please see the docs here: [README.DOCKER.md](./README.DOCKER.md)
+
+### Running the application on FreeBSD or FreeNAS
+
+Please see the docs here: [README.FreeBSD.md](./README.FREEBSD.md)

 ### Standalone PHB Stylesheet
-If you just want the stylesheet that is generated to make pages look like they are from the Player's Handbook, you will find it in the [phb.standalone.css](./phb.standalone.css) file.
+If you just want the stylesheet that is generated to make pages look like they
+are from the Player's Handbook, you will find it in the
+[phb.standalone.css](./phb.standalone.css) file.

-If you are developing locally and would like to generate your own, follow the above steps and then run `npm run phb`.
+If you are developing locally and would like to generate your own, follow the
+above steps and then run `npm run phb`.

 ## Issues, Suggestions, and Bugs
-If you run into any issues using The Homebrewery or have suggestions for improvement, please submit an issue [on GitHub](/issues). You can also get help for issues on the subreddit [r/homebrewery](https://www.reddit.com/r/homebrewery)
+If you run into any issues using The Homebrewery or have suggestions for
+improvement, please submit an issue [on GitHub][repo-issues-url].
+You can also get help for issues on the subreddit [r/homebrewery][subreddit-url]
+
+[repo-issues-url]: https://github.com/naturalcrit/homebrewery/issues
+[subreddit-url]: https://www.reddit.com/r/homebrewery

 ## Changelog

@@ -43,6 +95,33 @@ You can check out the [changelog](./changelog.md).

 ## License

-This project is licensed under the [MIT license](./license). Which means you are free to use The Homebrewery in any way that you want, except for claiming that you made it yourself.
+This project is licensed under the [MIT license](./license). Which means you
+are free to use The Homebrewery in any way that you want, except for claiming
+that you made it yourself.

-If you wish to sell or in some way gain profit for what's created on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
+If you wish to sell or in some way gain profit for what's created on this site,
+it's your responsibility to ensure you have the proper licenses/rights for any
+images or resources used.
+
+## Contributing
+
+You are welcome to contribute to the development and maintenance of the
+project! There are several ways of doing that:
+- At the moment, we have a huge backlog of [issues][repo-issues-url] and some
+  of them are outdated, duplicates or doesn't contain any useful info. In order
+  to help you can [mark duplicates][github-mark-duplicate-url], try to
+  reproduce some complex or weird issues, try with finding a workaround for a
+  reported bug or just mention issue managers team to let them know about
+  outdated issue via `@naturalcrit/issue-managers`.
+- Our [subreddit][subreddit-url] is constantly growing and there are number of
+  bug reports: any help with sorting them out is very welcome.
+- And of course you can contribute by fixing a bug or implementing a new
+  feature by yourself, we are waiting for your
+  [pull requests][github-pr-docs-url]!
+
+Anyway, if you would like to get in touch with the team and discuss/coordinate
+your contribution to the project, please join our [gitter chat][gitter-url].
+
+[github-mark-duplicate-url]: https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/about-duplicate-issues-and-pull-requests
+[github-pr-docs-url]: https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request
+[gitter-url]: https://gitter.im/naturalcrit/Lobby
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,51 @@
 # changelog

+### Friday, 25/1/2021 - v2.10.7
+- Cover Page snippet now flips left-right page numbering.
+- Added instructions for [installing on a FreeBSD Jail](https://github.com/naturalcrit/homebrewery/blob/master/README.FREEBSD.md).
+- Fix for box-shadows breaking across columns. <br>(Thanks @G-Ambatte for all of these!)
+- Small user interface tweaks (Thanks @Ericsheid)
+
+### Friday, 02/1/2021 - v2.10.6
+- Fixed punctuation for usernames ending with 's' on the user page. (Thanks @AlexeySachkov)
+- Fixed server crashes due to excessive long lines in brews
+- Fixed "automated request" lockouts from Google
+
+### Friday, 18/12/2020 - v2.10.5
+- Brews now immediately save when transferring between Google Drive and Homebrewery storage.
+- Added confirmation popup to clarify the transfer process.
+- Brews transferred or deleted from Google will be found in your Google Drive trash.
+- Dependency updates.
+
+### Wednesday, 25/11/2020 - v2.10.4
+- Fixed Google Drive brews not saving metadata (view count, description, etc.) Note that we are still working on making published Google brews visible to the public when viewing your profile page.
+
+### Thursday, 22/10/2020 - v2.10.3
+- Fixed brews with broken code crashing the edit page when loaded (the "blue screen of death" bug).
+
+### Monday, 19/10/2020 - v2.10.2
+- Fixed issue with "recent" item links not updating when transferring between Google Drive.
+
+### Monday, 12/10/2020 - v2.10.1
+- Fixed issue with users unable to create new brews
+- Fixing brews being lost when loaded via back button
+
+### Wednesday, 07/10/2020 - v2.10.0
+- Google Drive integration -- Sign in with your Google account to link it with your Homebrewery profile. A new button in the Edit page will let you transfer your file to your personal Google Drive storage, and Google will keep a backup of each version! No more lost work surprises!
+
+```
+```
+
+### Friday, 28/08/2020 - v2.9.2
+- Many dependency updates
+- Finally fixed this changelog page to not run off the edge :P
+
+### Sunday, 19/07/2020 - v2.9.1
+- Fixed paragraphs appearing blank on new columns
+
+### Wednesday, 20/05/2020 - v2.9.0
+- Major refactoring of site backend to work with updated dependencies for security (should be invisible to users)
+
 ### Wednesday, 11/03/2020 - v2.8.2
 - Fixed delete button removing everyone's copy for brews with multiple authors
 - Compressed homebrew text in database
@@ -33,21 +79,16 @@
 ### Saturday, 18/02/2017 - v2.7.2
 - Adding ability to delete a brew from the user page, incase the user creates a brew that makes the edit page unrender-able. (re:309)

-## BIG NEWS
-With the next major release of Homebrewery, v3.0.0, this tool *will no longer support raw HTML input for brew code*. Most issues and errors users are having are because of this feature and it's become too taxing to help and fix these issues.
+\page

-All brews made previous to the release of v3.0.0 will still render normally.
-
-### Thursday, 19/01/2017 - v2.7.0
+### Thursday, 19/01/2017 - v2.7.1
 - Fixed saving multiple authors and multiple systems on brew metadata (thanks u/PalaNolho re:282)
 - Adding in line highlight for new pages
 - Added in a simple brew lookup for admin

-
 ### Saturday, 14/01/2017 - v2.7.0
 - Added a new Render Warning overlay. It detects situations where the brew may not be rendering correctly (wrong browser, browser is zoomed in...) and let's the user know

-
 ### Sunday, 25/12/2016 - v2.7.0
 - Switching over to using Vitreum v4
  - Removed gulp, all tasks are run through npm scripts
@@ -60,8 +101,6 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Removed a lot of unused files in shared
 - vitreum v4 now lets me use codemirror as a pure node dependacy

-
-
 ### Saturday, 03/12/2016 - v2.6.0
 - Added report back to the edit page
 - Changed metaeditor icon
@@ -73,18 +112,19 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Added a table of contents snippet (thanks u/tullisar)
 - Added a multicolumn snippet

-
-
 ### Thursday, 01/12/2016
 - Added in a snippet for a split table
 - Added an account nav item to new page

-
 ### Sunday, 27/11/2016 - v2.5.1
 - Fixed the column rendering on the new user page. Really should have tested that better
 - Added a hover tooltip to fully read the brew description
 - Made the brew items take up only 25% allowing you to view more per row.

+
+```
+```
+
 ### Wednesday, 23/11/2016 - v2.5.0
 - Metadata can now be added to brews
 - Added a metadata editor onto the edit and new pages
@@ -120,7 +160,6 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Fixed the noteblock overlapping into titles (thanks u/dsompura!)
 - Fixed a bad search route in the admin panel (thanks u/SnappyTom!)

-
 ### Friday, 29/07/2016 - v2.2.7
 - Adding in descriptive note blocks. (Thanks calculuschild!)

@@ -132,6 +171,9 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Allows adding in hyperlinks to specific pages
 - Even works after you print to pdf!

+
+\page
+
 ### Tuesday, 07/06/2016 - v2.2.2
 - Fixed bug with new markdown lexer and aprser not working on print page

@@ -141,12 +183,9 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Added in a new auto-incremeting page number snippet (thakns u/Ryrok!)
 - Lists in monster stat blocks should be fixed now

-
 ### Saturday, 04/06/2016 - v2.2.0
 - MIgrating The Homebrewery over to hombrewery.naturalcrit.com. It know runs on it's own server, with it's own repo separate from the other tools I'm working on. Makes updating and deploying much easier.

-\page
-
 ### Sunday, 29/05/2016 - v2.1.0
 - Finally added a syntax for doing spell lists. A bit in-depth about why this took so long. Essentially I'm running out of syntax to use in stardard Markdown. There are too many unique elements in the PHB-style to be mapped. I solved this earlier by stacking certain elements together (eg. an `<hr>` before a `blockquote` turns it into moster state block), but those are getting unweildly. I would like to simply wrap these in `div`s with classes, but unfortunately Markdown stops processing when within HTML blocks. To get around this I wrote my own override to the Markdown parser and lexer to process Markdown within a simple div class wrapper. This should open the door for more unique syntaxes in the future. Big step!
 - Override Ctrl+P (and cmd+P) to launch to the print page. Many people try to just print either the editing or share page to get a PDF. While this dones;t make much sense, I do get a ton of issues about it. So now if you try to do this, it'll just bring you imediately to the print page. Everybody wins!
@@ -158,6 +197,10 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Updated the issue template for (hopefully) better reporting
 - Added suggestion to use chrome while PDF printing

+
+```
+```
+
 ### Wednesday, 25/05/2016 -v2.0.5
 - The class table generators have the proper ability score improvement progression.

@@ -212,8 +255,6 @@ Massive changelog incoming:
 - Source now opens to it's own route `/source/:sharedId` instead of just a window. Now easier to share, and won't be blocked by some browsers.
 - Print page now auto-opens print dialog. If you want to share your print page link, just remove the `?dialog=true` parameter and it won't open the dialog.

-
-
 \page

 ### Wednesday, 20/04/2016
@@ -273,7 +314,6 @@ Massive changelog incoming:
 * Increased padding on table cells
 * Raw html now shows in view source

-
 ## v1.0.0 - Release

 ### Wednesday, 3/01/2016
@@ -281,4 +321,3 @@ Massive changelog incoming:
 * Added `phb.standalone.css` plus a build system for creating it
 * Added page numbers and footer text
 * Page accent now flips each page
-
--- a/client/admin/admin.jsx
+++ b/client/admin/admin.jsx
@@ -1,3 +1,4 @@
+require('./admin.less');
 const React = require('react');
 const createClass = require('create-react-class');

--- a/client/admin/brewCleanup/brewCleanup.jsx
+++ b/client/admin/brewCleanup/brewCleanup.jsx
@@ -1,3 +1,4 @@
+require('./brewCleanup.less');
 const React       = require('react');
 const createClass = require('create-react-class');
 const cx          = require('classnames');
@@ -71,4 +72,4 @@ const BrewCleanup = createClass({
 	}
 });

-module.exports = BrewCleanup;
+module.exports = BrewCleanup;
--- a/client/admin/brewCompress/brewCompress.jsx
+++ b/client/admin/brewCompress/brewCompress.jsx
@@ -1,3 +1,4 @@
+require('./brewCompress.less');
 const React       = require('react');
 const createClass = require('create-react-class');
 const cx          = require('classnames');
@@ -88,4 +89,4 @@ const BrewCompress = createClass({
 	}
 });

-module.exports = BrewCompress;
+module.exports = BrewCompress;
--- a/client/admin/brewLookup/brewLookup.jsx
+++ b/client/admin/brewLookup/brewLookup.jsx
@@ -1,3 +1,4 @@
+require('./brewLookup.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const cx    = require('classnames');
--- a/client/admin/stats/stats.jsx
+++ b/client/admin/stats/stats.jsx
@@ -1,3 +1,4 @@
+require('./stats.less');
 const React       = require('react');
 const createClass = require('create-react-class');
 const cx          = require('classnames');
@@ -42,4 +43,4 @@ const Stats = createClass({
 	}
 });

-module.exports = Stats;
+module.exports = Stats;
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -1,3 +1,4 @@
+require('./brewRenderer.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
@@ -9,6 +10,7 @@ const ErrorBar = require('./errorBar/errorBar.jsx');
 //TODO: move to the brew renderer
 const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx');
 const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
+const Frame = require('react-frame-component').default;

 const PAGE_HEIGHT = 1056;
 const PPR_THRESHOLD = 50;
@@ -28,17 +30,20 @@ const BrewRenderer = createClass({
 			height             : 0,
 			isMounted          : false,

-			pages  : pages,
-			usePPR : pages.length >= PPR_THRESHOLD,
+			pages          : pages,
+			usePPR         : pages.length >= PPR_THRESHOLD,
+			visibility     : 'hidden',
+			initialContent : `<!DOCTYPE html><html><head>
+												<link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
+												<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
+												<link href='/homebrew/bundle.css' rel='stylesheet' />
+												<base target=_blank>
+												</head><body style='overflow: hidden'><div></div></body></html>`
 		};
 	},
 	height     : 0,
 	lastRender : <div></div>,

-	componentDidMount : function() {
-		this.updateSize();
-		window.addEventListener('resize', this.updateSize);
-	},
 	componentWillUnmount : function() {
 		window.removeEventListener('resize', this.updateSize);
 	},
@@ -53,8 +58,7 @@ const BrewRenderer = createClass({

 	updateSize : function() {
 		this.setState({
-			height    : this.refs.main.parentNode.clientHeight,
-			isMounted : true
+			height : this.refs.main.parentNode.clientHeight,
 		});
 	},

@@ -84,7 +88,7 @@ const BrewRenderer = createClass({
 	},

 	renderPageInfo : function(){
-		return <div className='pageInfo'>
+		return <div className='pageInfo' ref='main'>
 			{this.state.viewablePageNumber + 1} / {this.state.pages.length}
 		</div>;
 	},
@@ -110,7 +114,7 @@ const BrewRenderer = createClass({
 	renderPages : function(){
 		if(this.state.usePPR){
 			return _.map(this.state.pages, (page, index)=>{
-				if(this.shouldRender(page, index)){
+				if(this.shouldRender(page, index) && typeof window !== 'undefined'){
 					return this.renderPage(page, index);
 				} else {
 					return this.renderDummyPage(index);
@@ -119,29 +123,59 @@ const BrewRenderer = createClass({
 		}
 		if(this.props.errors && this.props.errors.length) return this.lastRender;
 		this.lastRender = _.map(this.state.pages, (page, index)=>{
-			return this.renderPage(page, index);
+			if(typeof window !== 'undefined') {
+				return this.renderPage(page, index);
+			} else {
+				return this.renderDummyPage(index);
+			}
 		});
 		return this.lastRender;
 	},

+	frameDidMount : function(){	//This triggers when iFrame finishes internal "componentDidMount"
+		setTimeout(()=>{	//We still see a flicker where the style isn't applied yet, so wait 100ms before showing iFrame
+			this.updateSize();
+			window.addEventListener('resize', this.updateSize);
+			this.renderPages(); //Make sure page is renderable before showing
+			this.setState({
+				isMounted  : true,
+				visibility : 'visible'
+			});
+		}, 100);
+	},
+
 	render : function(){
+		//render in iFrame so broken code doesn't crash the site.
+		//Also render dummy page while iframe is mounting.
+
 		return (
 			<React.Fragment>
-				<div className='brewRenderer'
-					onScroll={this.handleScroll}
-					ref='main'
-					style={{ height: this.state.height }}>
-
-					<ErrorBar errors={this.props.errors} />
-					<div className='popups'>
-						<RenderWarnings />
-						<NotificationPopup />
+				{!this.state.isMounted
+					? <div className='brewRenderer' onScroll={this.handleScroll}>
+						<div className='pages' ref='pages'>
+							{this.renderDummyPage(1)}
+						</div>
 					</div>
+	        : null}

-					<div className='pages' ref='pages'>
-						{this.renderPages()}
+				<Frame initialContent={this.state.initialContent} style={{ width: '100%', height: '100%', visibility: this.state.visibility }} contentDidMount={this.frameDidMount}>
+					<div className='brewRenderer'
+						onScroll={this.handleScroll}
+						style={{ height: this.state.height }}>
+
+						<ErrorBar errors={this.props.errors} />
+						<div className='popups'>
+							<RenderWarnings />
+							<NotificationPopup />
+						</div>
+
+						<div className='pages' ref='pages'>
+							{this.state.isMounted
+								? this.renderPages()
+							  : null}
+						</div>
 					</div>
-				</div>;
+				</Frame>
 				{this.renderPageInfo()}
 				{this.renderPPRmsg()}
 			</React.Fragment>
--- a/client/homebrew/brewRenderer/errorBar/errorBar.jsx
+++ b/client/homebrew/brewRenderer/errorBar/errorBar.jsx
@@ -1,3 +1,4 @@
+require('./errorBar.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
@@ -1,10 +1,10 @@
-
+require('./notificationPopup.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');	//Unused variable

-const DISMISS_KEY = 'dismiss_notification7-24-19';
+const DISMISS_KEY = 'dismiss_notification7-10-20';

 const NotificationPopup = createClass({
 	getInitialState : function() {
@@ -22,17 +22,22 @@ const NotificationPopup = createClass({
 	notifications : {
 		psa : function(){
 			return <li key='psa'>
-				<em>Known bug: Grey Shadow Boxes </em> <br />
-				The shadows around certain brew elements such as notes and statblocks might appear as a solid grey box when generating a PDF.  &nbsp;
-				<a target='_blank' href='https://old.reddit.com/r/homebrewery/comments/ch3v0d/psa_grey_boxesshadows_around_notes_stat_blocks_etc/'>
-					See this Reddit post
-				</a> for updates and possible workarounds.
+				<em>Google Drive Integration!</em> <br />
+				We have added Google Drive integration to the Homebrewery! <a target='_blank' href='http://naturalcrit.com/login'>Sign in</a> with
+				your Google account to link it with your Homebrewery profile. A new button in the Edit page will let you transfer your file to your personal
+				Google Drive storage, and Google will keep a backup of each version! No more lost work surprises!
+				<br /><br />
+				However, we are aware that there may be uncaught bugs. We encourage you to copy your brew into a text document before transferring to Google
+				Drive just in case any issues arise as this update is rolled out.
+				<br /><br />
+				<b>Note:</b> Transferring an existing brew to Google Drive will change the edit and share links of your document. If you have shared your
+				document online, remember to update the links there as well.
 			</li>;
 		},
 		faq : function(){
 			return <li key='faq'>
 				<em>Protect your work! </em> <br />
-				At the moment we do not save a history of your projects, so please make frequent backups of your brews!  &nbsp;
+				If you opt not to use your Google Drive, keep in mind that we do not save a history of your projects. Please make frequent backups of your brews!  &nbsp;
 				<a target='_blank' href='https://www.reddit.com/r/homebrewery/comments/adh6lh/faqs_psas_announcements/'>
 					See the FAQ
 				</a> to learn how to avoid losing your work!
--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less
@@ -9,11 +9,11 @@
 .notificationPopup{
 	position		 : relative;
 	float			 : right;
-	display          : inline-block;	
+	display          : inline-block;
 	width            : 350px;
-	padding          : 20px;
+	padding          : 15px;
 	padding-bottom   : 10px;
-	padding-left     : 85px;
+	padding-left     : 55px;
 	background-color : @blue;
 	color            : white;
 	a{
@@ -22,8 +22,8 @@
 	}
 	i.info{
 		position  : absolute;
-		top       : 24px;
-		left      : 24px;
+		top       : 12px;
+		left      : 12px;
 		opacity   : 0.8;
 		font-size : 2.5em;
 	}
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -1,3 +1,4 @@
+require('./editor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
@@ -22,6 +23,7 @@ const Editor = createClass({

 			metadata         : {},
 			onMetadataChange : ()=>{},
+			showMetaButton   : true
 		};
 	},
 	getInitialState : function() {
@@ -117,7 +119,8 @@ const Editor = createClass({
 					brew={this.props.value}
 					onInject={this.handleInject}
 					onToggle={this.handgleToggle}
-					showmeta={this.state.showMetadataEditor} />
+					showmeta={this.state.showMetadataEditor}
+					showMetaButton={this.props.showMetaButton} />
 				{this.renderMetadataEditor()}
 				<CodeEditor
 					ref='codeEditor'
@@ -138,9 +141,3 @@ const Editor = createClass({
 });

 module.exports = Editor;
-
-
-
-
-
-
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -1,3 +1,4 @@
+require('./metadataEditor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
@@ -50,7 +51,7 @@ const MetadataEditor = createClass({
 			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
 		}

-		request.get(`/api/remove/${this.props.metadata.editId}`)
+		request.delete(`/api/${this.props.metadata.editId}`)
 			.send()
 			.end(function(err, res){
 				window.location.href = '/';
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -1,3 +1,4 @@
+require('./snippetbar.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
@@ -11,15 +12,14 @@ const execute = function(val, brew){
 	return val;
 };

-
-
 const Snippetbar = createClass({
 	getDefaultProps : function() {
 		return {
-			brew     : '',
-			onInject : ()=>{},
-			onToggle : ()=>{},
-			showmeta : false
+			brew           : '',
+			onInject       : ()=>{},
+			onToggle       : ()=>{},
+			showmeta       : false,
+			showMetaButton : true
 		};
 	},

@@ -40,13 +40,19 @@ const Snippetbar = createClass({
 		});
 	},

+	renderMetadataButton : function(){
+		if(!this.props.showMetaButton) return;
+		return <div className={cx('snippetBarButton', 'toggleMeta', { selected: this.props.showmeta })}
+			onClick={this.props.onToggle}>
+			<i className='fa fa-info-circle' />
+			<span className='groupName'>Properties</span>
+		</div>;
+	},
+
 	render : function(){
 		return <div className='snippetBar'>
 			{this.renderSnippetGroups()}
-			<div className={cx('toggleMeta', { selected: this.props.showmeta })}
-				onClick={this.props.onToggle}>
-				<i className='fa fa-bars' />
-			</div>
+			{this.renderMetadataButton()}
 		</div>;
 	}
 });
@@ -81,7 +87,7 @@ const SnippetGroup = createClass({
 	},

 	render : function(){
-		return <div className='snippetGroup'>
+		return <div className='snippetGroup snippetBarButton'>
 			<div className='text'>
 				<i className={`fa fa-fw ${this.props.icon}`} />
 				<span className='groupName'>{this.props.groupName}</span>
@@ -92,4 +98,4 @@ const SnippetGroup = createClass({
 		</div>;
 	},

-});
+});
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -4,44 +4,33 @@
 	position         : relative;
 	height           : @height;
 	background-color : #ddd;
-	.toggleMeta{
-		position    : absolute;
-		top         : 0px;
-		right       : 0px;
-		height      : @height;
-		width       : @height;
-		cursor      : pointer;
-		line-height : @height;
-		text-align  : center;
-		.tooltipLeft("Edit Brew Metadata");
+	.snippetBarButton{
+		height         : @height;
+		line-height    : @height;
+		display        : inline-block;
+		padding        : 0px 5px;
+		font-weight    : 800;
+		font-size      : 0.625em;
+		text-transform : uppercase;
+		cursor         : pointer;
 		&:hover, &.selected{
 			background-color : #999;
 		}
-	}
-	.snippetGroup{
-		display        : inline-block;
-		height         : @height;
-		padding        : 0px 5px;
-		cursor         : pointer;
-		font-size      : 0.6em;
-		font-weight    : 800;
-		line-height    : @height;
-		text-transform : uppercase;
-		border-right   : 1px solid black;
 		i{
 			vertical-align : middle;
 			margin-right   : 3px;
-			font-size      : 1.2em;
-		}
-		&:hover, &.selected{
-			background-color : #999;
-		}
-		.text{
-			line-height : @height;
-			.groupName{
-				font-size : 10px;
-			}
+			font-size      : 1.4em;
 		}
+	}
+	.toggleMeta{
+		position     : absolute;
+		top          : 0px;
+		right        : 0px;
+		border-left  : 1px solid black;
+		.tooltipLeft("Edit Brew Properties");
+	}
+	.snippetGroup{
+		border-right   : 1px solid black;
 		&:hover{
 			.dropdown{
 				visibility : visible;
@@ -62,7 +51,7 @@
 				font-size : 10px;
 				i{
 					margin-right : 8px;
-					font-size    : 13px;
+					font-size    : 1.2em;
 				}
 				&:hover{
 					background-color : #999;
@@ -70,4 +59,4 @@
 			}
 		}
 	}
-}
+}
--- a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
@@ -102,6 +102,13 @@ module.exports = ()=>{
 	return `<style>
  .phb#p1{ text-align:center; }
  .phb#p1:after{ display:none; }
+  .phb#p2 { counter-reset:phb-page-numbers; }
+  .phb:nth-child(2n) .pageNumber { left: inherit !important; right: 2px !important; }
+  .phb:nth-child(2n+1) .pageNumber { right: inherit !important; left: 2px !important; }
+  .phb:nth-child(2n)::after { transform: scaleX(1); }
+  .phb:nth-child(2n+1)::after { transform: scaleX(-1); }
+  .phb:nth-child(2n) .footnote { left: inherit; text-align: right; }
+  .phb:nth-child(2n+1) .footnote { left: 80px; text-align: left; }
 </style>

 <div style='margin-top:450px;'></div>
--- a/client/homebrew/googleDrive.png
+++ b/client/homebrew/googleDrive.png
--- a/client/homebrew/googleDriveMono.png
+++ b/client/homebrew/googleDriveMono.png
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -1,19 +1,17 @@
+require('./homebrew.less');
 const React = require('react');
 const createClass = require('create-react-class');
-const _ = require('lodash');
-const cx = require('classnames');
-
-const CreateRouter = require('pico-router').createRouter;
+const { StaticRouter:Router, Switch, Route } = require('react-router-dom');
+const queryString = require('query-string');

 const HomePage = require('./pages/homePage/homePage.jsx');
 const EditPage = require('./pages/editPage/editPage.jsx');
 const UserPage = require('./pages/userPage/userPage.jsx');
 const SharePage = require('./pages/sharePage/sharePage.jsx');
 const NewPage = require('./pages/newPage/newPage.jsx');
-const ErrorPage = require('./pages/errorPage/errorPage.jsx');
+//const ErrorPage = require('./pages/errorPage/errorPage.jsx');
 const PrintPage = require('./pages/printPage/printPage.jsx');

-let Router;
 const Homebrew = createClass({
 	getDefaultProps : function() {
 		return {
@@ -36,55 +34,36 @@ const Homebrew = createClass({
 		global.account = this.props.account;
 		global.version = this.props.version;

-
-		Router = CreateRouter({
-			'/edit/:id' : (args)=>{
-				if(!this.props.brew.editId){
-					return <ErrorPage errorId={args.id}/>;
-				}
-
-				return <EditPage
-					id={args.id}
-					brew={this.props.brew} />;
-			},
-
-			'/share/:id' : (args)=>{
-				if(!this.props.brew.shareId){
-					return <ErrorPage errorId={args.id}/>;
-				}
-
-				return <SharePage
-					id={args.id}
-					brew={this.props.brew} />;
-			},
-			'/user/:username' : (args)=>{
-				return <UserPage
-					username={args.username}
-					brews={this.props.brews}
-				/>;
-			},
-			'/print/:id' : (args, query)=>{
-				return <PrintPage brew={this.props.brew} query={query}/>;
-			},
-			'/print' : (args, query)=>{
-				return <PrintPage query={query}/>;
-			},
-			'/new' : (args)=>{
-				return <NewPage />;
-			},
-			'/changelog' : (args)=>{
-				return <SharePage
-					brew={{ title: 'Changelog', text: this.props.changelog }} />;
-			},
-			'*' : <HomePage
-				welcomeText={this.props.welcomeText} />,
-		});
 	},
-	render : function(){
-		return <div className='homebrew'>
-			<Router defaultUrl={this.props.url}/>
-		</div>;
+	render : function (){
+		return (
+			<Router location={this.props.url}>
+				<div className='homebrew'>
+					<Switch>
+						<Route path='/edit/:id' component={(routeProps)=><EditPage id={routeProps.match.params.id} brew={this.props.brew} />}/>
+						<Route path='/share/:id' component={(routeProps)=><SharePage id={routeProps.match.params.id} brew={this.props.brew} />}/>
+						<Route path='/user/:username' component={(routeProps)=><UserPage username={routeProps.match.params.username} brews={this.props.brews} />}/>
+						<Route path='/print/:id' component={(routeProps)=><PrintPage brew={this.props.brew} query={queryString.parse(routeProps.location.search)} /> } />
+						<Route path='/print' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} /> } />
+						<Route path='/new' exact component={NewPage}/>
+						<Route path='/changelog' exact component={()=><SharePage brew={{ title: 'Changelog', text: this.props.changelog }} />}/>
+						<Route path='/' component={()=><HomePage welcomeText={this.props.welcomeText}/>}/>
+					</Switch>
+				</div>
+			</Router>
+		);
 	}
 });

 module.exports = Homebrew;
+
+//TODO: Nicer Error page instead of just "cant get that"
+// 	'/share/:id' : (args)=>{
+// 		if(!this.props.brew.shareId){
+// 			return <ErrorPage errorId={args.id}/>;
+// 		}
+//
+// 		return <SharePage
+// 			id={args.id}
+// 			brew={this.props.brew} />;
+// 	},
--- a/client/homebrew/homebrew.less
+++ b/client/homebrew/homebrew.less
@@ -1,4 +1,3 @@
-
@import 'naturalcrit/styles/core.less';
 .homebrew{
 	height : 100%;
--- a/client/homebrew/navbar/account.navitem.jsx
+++ b/client/homebrew/navbar/account.navitem.jsx
@@ -2,17 +2,33 @@ const React = require('react');
 const createClass = require('create-react-class');
 const Nav = require('naturalcrit/nav/nav.jsx');

-module.exports = function(props){
-	if(global.account){
-		return <Nav.item href={`/user/${global.account.username}`} color='yellow' icon='fa-user'>
-			{global.account.username}
+const Account = createClass({
+
+	getInitialState : function() {
+		return {
+			url : ''
+		};
+	},
+
+	componentDidMount : function(){
+		if(typeof window !== 'undefined'){
+			this.setState({
+				url : window.location.href
+			});
+		}
+	},
+
+	render : function(){
+		if(global.account){
+			return <Nav.item href={`/user/${global.account.username}`} color='yellow' icon='fa-user'>
+				{global.account.username}
+			</Nav.item>;
+		}
+
+		return <Nav.item href={`http://naturalcrit.com/login?redirect=${this.state.url}`} color='teal' icon='fa-sign-in'>
+			login
 		</Nav.item>;
 	}
-	let url = '';
-	if(typeof window !== 'undefined'){
-		url = window.location.href;
-	}
-	return <Nav.item href={`http://naturalcrit.com/login?redirect=${url}`} color='teal' icon='fa-sign-in'>
-		login
-	</Nav.item>;
-};
+});
+
+module.exports = Account;
--- a/client/homebrew/navbar/editTitle.navitem.jsx
+++ b/client/homebrew/navbar/editTitle.navitem.jsx
@@ -1,6 +1,5 @@
 const React = require('react');
 const createClass = require('create-react-class');
-const _ = require('lodash');
 const cx = require('classnames');
 const Nav = require('naturalcrit/nav/nav.jsx');

@@ -31,4 +30,4 @@ const EditTitle = createClass({

 });

-module.exports = EditTitle;
+module.exports = EditTitle;
--- a/client/homebrew/navbar/navbar.jsx
+++ b/client/homebrew/navbar/navbar.jsx
@@ -1,8 +1,9 @@
+require('./navbar.less');
 const React = require('react');
 const createClass = require('create-react-class');
-const _ = require('lodash');

 const Nav = require('naturalcrit/nav/nav.jsx');
+const PatreonNavItem = require('./patreon.navitem.jsx');

 const Navbar = createClass({
 	getInitialState : function() {
@@ -39,7 +40,7 @@ const Navbar = createClass({
 					<div>The Homebrewery</div>
 				</Nav.item>
 				<Nav.item>{`v${this.state.ver}`}</Nav.item>
-
+				<PatreonNavItem />
 				{/*this.renderChromeWarning()*/}
 			</Nav.section>
 			{this.props.children}
--- a/client/homebrew/navbar/navbar.less
+++ b/client/homebrew/navbar/navbar.less
@@ -1,4 +1,12 @@
@navbarHeight : 28px;
+@keyframes coloring {
+	//from {color: white;}
+	//to {color: red;}
+	0%   {color: pink;}
+	50%  {color: pink;}
+	75%  {color: red;}
+	100% {color: pink;}
+}
 .homebrew nav{
 	.homebrewLogo{
 		.animate(color);
@@ -47,11 +55,16 @@
 		text-transform : initial;
 	}
 	.patreon.navItem{
+		border-left  : 1px solid #666;
+		border-right : 1px solid #666;
+		&:hover i {
+			color: red;
+		}
 		i{
 			.animate(color);
-			&:hover{
-				color : @red;
-			}
+			animation-name: coloring;
+			animation-duration: 2s;
+			color: pink;
 		}
 	}
 	.recent.navItem{
@@ -125,4 +138,4 @@
 			text-align       : center;
 		}
 	}
-}
+}
--- a/client/homebrew/navbar/patreon.navitem.jsx
+++ b/client/homebrew/navbar/patreon.navitem.jsx
@@ -6,9 +6,9 @@ module.exports = function(props){
 	return <Nav.item
 		className='patreon'
 		newTab={true}
-		href='https://www.patreon.com/stolksdorf'
+		href='https://www.patreon.com/NaturalCrit'
 		color='green'
 		icon='fa-heart'>
 		help out
 	</Nav.item>;
-};
+};
--- a/client/homebrew/navbar/recent.navitem.jsx
+++ b/client/homebrew/navbar/recent.navitem.jsx
@@ -35,24 +35,32 @@ const RecentItems = createClass({

 		//== Add current brew to appropriate recent items list (depending on storageKey) ==//
 		if(this.props.storageKey == 'edit'){
+			let editId = this.props.brew.editId;
+			if(this.props.brew.googleId){
+				editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
+			}
 			edited = _.filter(edited, (brew)=>{
-				return brew.id !== this.props.brew.editId;
+				return brew.id !== editId;
 			});
 			edited.unshift({
-				id    : this.props.brew.editId,
+				id    : editId,
 				title : this.props.brew.title,
-				url   : `/edit/${this.props.brew.editId}`,
+				url   : `/edit/${editId}`,
 				ts    : Date.now()
 			});
 		}
 		if(this.props.storageKey == 'view'){
+			let shareId = this.props.brew.shareId;
+			if(this.props.brew.googleId){
+				shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`;
+			}
 			viewed = _.filter(viewed, (brew)=>{
-				return brew.id !== this.props.brew.shareId;
+				return brew.id !== shareId;
 			});
 			viewed.unshift({
-				id    : this.props.brew.shareId,
+				id    : shareId,
 				title : this.props.brew.title,
-				url   : `/share/${this.props.brew.shareId}`,
+				url   : `/share/${shareId}`,
 				ts    : Date.now()
 			});
 		}
@@ -70,6 +78,40 @@ const RecentItems = createClass({
 		});
 	},

+	componentDidUpdate : function(prevProps) {
+		if(prevProps.brew && this.props.brew.editId !== prevProps.brew.editId) {
+	 		if(this.props.storageKey == 'edit') {
+				let prevEditId = prevProps.brew.editId;
+				if(prevProps.brew.googleId){
+					prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`;
+				}
+
+				edited = _.filter(this.state.edit, (brew)=>{
+					return brew.id !== prevEditId;
+				});
+				let editId = this.props.brew.editId;
+				if(this.props.brew.googleId){
+					editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
+				}
+				edited.unshift({
+					id    : editId,
+					title : this.props.brew.title,
+					url   : `/edit/${editId}`,
+					ts    : Date.now()
+				});
+			}
+
+			//== Store the updated lists (up to 8 items each) ==//
+			edited = _.slice(edited, 0, 8);
+
+			localStorage.setItem(EDIT_KEY, JSON.stringify(edited));
+
+			this.setState({
+				edit : edited
+			});
+		}
+	},
+
 	handleDropdown : function(show){
 		this.setState({
 			showDropdown : show
@@ -140,4 +182,4 @@ module.exports = {
 			showView={true}
 		/>;
 	}
-};
+};
--- a/client/homebrew/navbar/reddit.navitem.jsx
+++ b/client/homebrew/navbar/reddit.navitem.jsx
@@ -1,10 +1,6 @@
 const React = require('react');
 const createClass = require('create-react-class');
-const _ = require('lodash');
 const cx = require('classnames');
-
-//var striptags = require('striptags');
-
 const Nav = require('naturalcrit/nav/nav.jsx');

 const MAX_URL_SIZE = 2083;
@@ -31,10 +27,7 @@ const RedditShare = createClass({
 		const url = [
 			MAIN_URL,
 			`title=${encodeURIComponent(this.props.brew.title ? this.props.brew.title : 'Check out my brew!')}`,
-
 			`text=${encodeURIComponent(this.props.brew.text)}`
-
-
 		].join('&');

 		window.open(url, '_blank');
@@ -49,4 +42,4 @@ const RedditShare = createClass({

 });

-module.exports = RedditShare;
+module.exports = RedditShare;
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -1,8 +1,10 @@
+/* eslint-disable max-lines */
+require('./editPage.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
-const cx = require('classnames');
 const request = require('superagent');
+const { Meta } = require('vitreum/headtags');

 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
@@ -18,8 +20,10 @@ const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');

 const Markdown = require('naturalcrit/markdown.js');

-const SAVE_TIMEOUT = 3000;
+const googleDriveActive = require('../../googleDrive.png');
+const googleDriveInactive = require('../../googleDriveMono.png');

+const SAVE_TIMEOUT = 3000;

 const EditPage = createClass({
 	getDefaultProps : function() {
@@ -30,6 +34,7 @@ const EditPage = createClass({
 				editId    : null,
 				createdAt : null,
 				updatedAt : null,
+				gDrive    : false,

 				title       : '',
 				description : '',
@@ -45,15 +50,22 @@ const EditPage = createClass({
 		return {
 			brew : this.props.brew,

-			isSaving   : false,
-			isPending  : false,
-			errors     : null,
-			htmlErrors : Markdown.validate(this.props.brew.text),
+			isSaving              : false,
+			isPending             : false,
+			saveGoogle            : this.props.brew.googleId ? true : false,
+			confirmGoogleTransfer : false,
+			errors                : null,
+			htmlErrors            : Markdown.validate(this.props.brew.text),
+			url                   : ''
 		};
 	},
 	savedBrew : null,

 	componentDidMount : function(){
+		this.setState({
+			url : window.location.href
+		});
+
 		this.trySave();
 		window.onbeforeunload = ()=>{
 			if(this.state.isSaving || this.state.isPending){
@@ -72,13 +84,12 @@ const EditPage = createClass({
 		document.removeEventListener('keydown', this.handleControlKeys);
 	},

-
 	handleControlKeys : function(e){
 		if(!(e.ctrlKey || e.metaKey)) return;
 		const S_KEY = 83;
 		const P_KEY = 80;
 		if(e.keyCode == S_KEY) this.save();
-		if(e.keyCode == P_KEY) window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
+		if(e.keyCode == P_KEY) window.open(`/print/${this.processShareId()}?dialog=true`, '_blank').focus();
 		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
 			e.stopPropagation();
 			e.preventDefault();
@@ -124,7 +135,30 @@ const EditPage = createClass({
 		}
 	},

-	save : function(){
+	handleGoogleClick : function(){
+		this.setState((prevState)=>({
+			confirmGoogleTransfer : !prevState.confirmGoogleTransfer
+		}));
+		this.clearErrors();
+	},
+
+	toggleGoogleStorage : function(){
+		this.setState((prevState)=>({
+			saveGoogle : !prevState.saveGoogle,
+			isSaving   : false,
+			errors     : null
+		}), ()=>this.save());
+	},
+
+	clearErrors : function(){
+		this.setState({
+			errors   : null,
+			isSaving : false
+
+		});
+	},
+
+	save : async function(){
 		if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel();

 		this.setState((prevState)=>({
@@ -133,22 +167,122 @@ const EditPage = createClass({
 			htmlErrors : Markdown.validate(prevState.brew.text)
 		}));

-		request
-			.put(`/api/update/${this.props.brew.editId}`)
-			.send(this.state.brew)
-			.end((err, res)=>{
-				if(err){
-					this.setState({
-						errors : err,
-					});
-				} else {
-					this.savedBrew = res.body;
-					this.setState({
-						isPending : false,
-						isSaving  : false,
-					});
+		const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);
+
+		if(this.state.saveGoogle) {
+			if(transfer) {
+				const res = await request
+				.post('/api/newGoogle/')
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log(err.status === 401
+						? 'Not signed in!'
+						: 'Error Saving to Google!');
+					this.setState({ errors: err, saveGoogle: false });
+				});
+
+				if(!res) { return; }
+
+				console.log('Deleting Local Copy');
+				await request.delete(`/api/${this.state.brew.editId}`)
+				.send()
+				.catch((err)=>{
+					console.log('Error deleting Local Copy');
+				});
+
+				this.savedBrew = res.body;
+				history.replaceState(null, null, `/edit/${this.savedBrew.googleId}${this.savedBrew.editId}`); //update URL to match doc ID
+			} else {
+				const res = await request
+				.put(`/api/updateGoogle/${this.state.brew.editId}`)
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log(err.status === 401
+						? 'Not signed in!'
+						: 'Error Saving to Google!');
+					this.setState({ errors: err, saveGoogle: false });
+					return;
+				});
+
+				this.savedBrew = res.body;
+			}
+		} else {
+			if(transfer) {
+				const res = await request.post('/api')
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log('Error creating Local Copy');
+					this.setState({ errors: err });
+					return;
+				});
+
+				await request.get(`/api/removeGoogle/${this.state.brew.googleId}${this.state.brew.editId}`)
+				.send()
+				.catch((err)=>{
+					console.log('Error Deleting Google Brew');
+				});
+
+				this.savedBrew = res.body;
+				history.replaceState(null, null, `/edit/${this.savedBrew.editId}`); //update URL to match doc ID
+			} else {
+				const res = await request
+				.put(`/api/update/${this.state.brew.editId}`)
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log('Error Updating Local Brew');
+					this.setState({ errors: err });
+					return;
+				});
+
+				this.savedBrew = res.body;
+			}
+		}
+
+		this.setState((prevState)=>({
+			brew : _.merge({}, prevState.brew, {
+				googleId : this.savedBrew.googleId ? this.savedBrew.googleId : null,
+				editId 	 : this.savedBrew.editId,
+				shareId  : this.savedBrew.shareId
+			}),
+			isPending : false,
+			isSaving  : false,
+		}));
+	},
+
+	renderGoogleDriveIcon : function(){
+		if(this.state.saveGoogle) {
+			return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
+				<img src={googleDriveActive} alt='googleDriveActive' />
+
+				{this.state.confirmGoogleTransfer &&
+					<div className='errorContainer'>
+					Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?<br />
+						<div className='confirm' onClick={this.toggleGoogleStorage}>
+							Yes
+						</div>
+						<div className='deny'>
+							No
+						</div>
+					</div>
 				}
-			});
+			</Nav.item>;
+		} else {
+			return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
+				<img src={googleDriveInactive} alt='googleDriveInactive' />
+
+				{this.state.confirmGoogleTransfer &&
+					<div className='errorContainer'>
+					Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?<br />
+						<div className='confirm' onClick={this.toggleGoogleStorage}>
+							Yes
+						</div>
+						<div className='deny'>
+							No
+						</div>
+					</div>
+				}
+			</Nav.item>;
+		}
 	},

 	renderSaveButton : function(){
@@ -159,12 +293,31 @@ const EditPage = createClass({
 				errMsg += `\`\`\`\n${JSON.stringify(this.state.errors.response.error, null, '  ')}\n\`\`\``;
 			} catch (e){}

+			if(this.state.errors.status == '401'){
+				return <Nav.item className='save error' icon='fa-warning'>
+					Oops!
+					<div className='errorContainer' onClick={this.clearErrors}>
+					You must be signed in to a Google account
+						to save this to<br />Google Drive!<br />
+						<a target='_blank' rel='noopener noreferrer'
+							href={`http://naturalcrit.com/login?redirect=${this.state.url}`}>
+							<div className='confirm' onClick={this.toggleGoogleStorage}>
+								Sign In
+							</div>
+						</a>
+						<div className='deny'>
+							Not Now
+						</div>
+					</div>
+				</Nav.item>;
+			}
+
 			return <Nav.item className='save error' icon='fa-warning'>
 				Oops!
 				<div className='errorContainer'>
 					Looks like there was a problem saving. <br />
 					Report the issue <a target='_blank' rel='noopener noreferrer'
-						href={`https://github.com/stolksdorf/naturalcrit/issues/new?body=${encodeURIComponent(errMsg)}`}>
+						href={`https://github.com/naturalcrt/naturalcrit/issues/new?body=${encodeURIComponent(errMsg)}`}>
 						here
 					</a>.
 				</div>
@@ -181,6 +334,13 @@ const EditPage = createClass({
 			return <Nav.item className='save saved'>saved.</Nav.item>;
 		}
 	},
+
+	processShareId : function() {
+		return this.state.brew.googleId ?
+					 this.state.brew.googleId + this.state.brew.shareId :
+					 this.state.brew.shareId;
+	},
+
 	renderNavbar : function(){
 		return <Navbar>
 			<Nav.section>
@@ -188,13 +348,14 @@ const EditPage = createClass({
 			</Nav.section>

 			<Nav.section>
+				{this.renderGoogleDriveIcon()}
 				{this.renderSaveButton()}
 				<ReportIssue />
-				<Nav.item newTab={true} href={`/share/${this.props.brew.shareId}`} color='teal' icon='fa-share-alt'>
+				<Nav.item newTab={true} href={`/share/${this.processShareId()}`} color='teal' icon='fa-share-alt'>
 					Share
 				</Nav.item>
-				<PrintLink shareId={this.props.brew.shareId} />
-				<RecentNavItem brew={this.props.brew} storageKey='edit' />
+				<PrintLink shareId={this.processShareId()} />
+				<RecentNavItem brew={this.state.brew} storageKey='edit' />
 				<Account />
 			</Nav.section>
 		</Navbar>;
@@ -202,6 +363,7 @@ const EditPage = createClass({

 	render : function(){
 		return <div className='editPage page'>
+			<Meta name='robots' content='noindex, nofollow' />
 			{this.renderNavbar()}

 			<div className='content'>
--- a/client/homebrew/pages/editPage/editPage.less
+++ b/client/homebrew/pages/editPage/editPage.less
@@ -1,7 +1,7 @@

 .editPage{
 	.navItem.save{
-		width      : 105px;
+		width      : 106px;
 		text-align : center;
 		&.saved{
 			cursor : initial;
@@ -10,18 +10,78 @@
 		&.error{
 			position         : relative;
 			background-color : @red;
-			.errorContainer{
-				position         : absolute;
-				top              : 29px;
-				left             : -20px;
-				z-index          : 1000;
-				width            : 120px;
-				padding          : 8px;
-				background-color : #333;
-				a{
-					color : @teal;
-				}
+		}
+	}
+	.googleDriveStorage {
+		position : relative;
+	}
+	.googleDriveStorage img{
+		height	: 20px;
+		padding : 0px;
+		margin  : -5px;
+	}
+	.errorContainer{
+		position         : absolute;
+		top              : 100%;
+		left             : 50%;
+		z-index          : 1000;
+		width            : 140px;
+		padding          : 3px;
+		background-color : #333;
+		border           : 3px solid #444;
+		border-radius    : 5px;
+		transform        : translate(-50% + 3px, 10px);
+		text-align       : center;
+		a{
+			color : @teal;
+		}
+		&:before {
+			content: "";
+			width: 0px;
+			height: 0px;
+			position: absolute;
+			border-left: 10px solid transparent;
+			border-right: 10px solid transparent;
+			border-top: 10px solid transparent;
+			border-bottom: 10px solid #444;
+			left: 53px;
+			top: -23px;
+		}
+		&:after {
+			content: "";
+			width: 0px;
+			height: 0px;
+			position: absolute;
+			border-left: 10px solid transparent;
+			border-right: 10px solid transparent;
+			border-top: 10px solid transparent;
+			border-bottom: 10px solid #333;
+			left: 53px;
+			top: -19px;
+		}
+		.deny {
+			width            : 48%;
+		  margin           : 1px;
+			padding          : 5px;
+			background-color : #333;
+			display          : inline-block;
+			border-left      : 1px solid #666;
+			.animate(background-color);
+			&:hover{
+				background-color : red;
+			}
+		}
+		.confirm {
+			width            : 48%;
+			margin           : 1px;
+			padding          : 5px;
+			background-color : #333;
+			display          : inline-block;
+			color            : white;
+			.animate(background-color);
+			&:hover{
+				background-color : teal;
 			}
 		}
 	}
-}
+}
--- a/client/homebrew/pages/errorPage/errorPage.jsx
+++ b/client/homebrew/pages/errorPage/errorPage.jsx
@@ -1,3 +1,4 @@
+require('./errorPage.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -1,12 +1,12 @@
+require('./homePage.less');
 const React = require('react');
 const createClass = require('create-react-class');
-const _ = require('lodash');
 const cx = require('classnames');
 const request = require('superagent');
+const { Meta } = require('vitreum/headtags');

 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
-const PatreonNavItem = require('../../navbar/patreon.navitem.jsx');
 const IssueNavItem = require('../../navbar/issue.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const AccountNavItem = require('../../navbar/account.navitem.jsx');
@@ -54,29 +54,24 @@ const HomePage = createClass({
 	renderNavbar : function(){
 		return <Navbar ver={this.props.ver}>
 			<Nav.section>
-				<PatreonNavItem />
 				<IssueNavItem />
 				<Nav.item newTab={true} href='/changelog' color='purple' icon='fa-file-text-o'>
 					Changelog
 				</Nav.item>
 				<RecentNavItem />
 				<AccountNavItem />
-				{/*}
-				<Nav.item href='/new' color='green' icon='fa-external-link'>
-					New Brew
-				</Nav.item>
-				*/}
 			</Nav.section>
 		</Navbar>;
 	},

 	render : function(){
 		return <div className='homePage page'>
+			<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
 			{this.renderNavbar()}

 			<div className='content'>
 				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor value={this.state.text} onChange={this.handleTextChange} ref='editor'/>
+					<Editor value={this.state.text} onChange={this.handleTextChange} showMetaButton={false} ref='editor'/>
 					<BrewRenderer text={this.state.text} />
 				</SplitPane>
 			</div>
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -1,7 +1,7 @@
+require('./newPage.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
-const cx = require('classnames');
 const request = require('superagent');

 const Markdown = require('naturalcrit/markdown.js');
@@ -23,6 +23,7 @@ const NewPage = createClass({
 	getInitialState : function() {
 		return {
 			metadata : {
+				gDrive      : false,
 				title       : '',
 				description : '',
 				tags        : '',
@@ -31,11 +32,13 @@ const NewPage = createClass({
 				systems     : []
 			},

-			text     : '',
-			isSaving : false,
-			errors   : []
+			text       : '',
+			isSaving   : false,
+			saveGoogle : (global.account && global.account.googleId ? true : false),
+			errors     : []
 		};
 	},
+
 	componentDidMount : function() {
 		const storage = localStorage.getItem(KEY);
 		if(storage){
@@ -79,12 +82,30 @@ const NewPage = createClass({
 		localStorage.setItem(KEY, text);
 	},

-	save : function(){
+	save : async function(){
 		this.setState({
 			isSaving : true
 		});

-		request.post('/api')
+		console.log('saving new brew');
+
+		if(this.state.saveGoogle) {
+			const res = await request
+			.post('/api/newGoogle/')
+			.send(_.merge({}, this.state.metadata, { text: this.state.text }))
+			.catch((err)=>{
+				console.log(err.status === 401
+					? 'Not signed in!'
+					: 'Error Creating New Google Brew!');
+				this.setState({ isSaving: false });
+				return;
+			});
+
+			const brew = res.body;
+			localStorage.removeItem(KEY);
+			window.location = `/edit/${brew.googleId}${brew.editId}`;
+		} else {
+			request.post('/api')
 			.send(_.merge({}, this.state.metadata, {
 				text : this.state.text
 			}))
@@ -100,6 +121,8 @@ const NewPage = createClass({
 				localStorage.removeItem(KEY);
 				window.location = `/edit/${brew.editId}`;
 			});
+		}
+
 	},

 	renderSaveButton : function(){
--- a/client/homebrew/pages/printPage/printPage.jsx
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -1,7 +1,9 @@
+require('./printPage.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
+const { Meta } = require('vitreum/headtags');
 const Markdown = require('naturalcrit/markdown.js');

 const PrintPage = createClass({
@@ -42,6 +44,7 @@ const PrintPage = createClass({

 	render : function(){
 		return <div>
+			<Meta name='robots' content='noindex, nofollow' />
 			{this.renderPages()}
 		</div>;
 	}
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -1,7 +1,7 @@
+require('./sharePage.less');
 const React = require('react');
 const createClass = require('create-react-class');
-const _ = require('lodash');
-const cx = require('classnames');
+const { Meta } = require('vitreum/headtags');

 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
@@ -43,16 +43,23 @@ const SharePage = createClass({
 		}
 	},

+	processShareId : function() {
+		return this.props.brew.googleId ?
+					 this.props.brew.googleId + this.props.brew.shareId :
+					 this.props.brew.shareId;
+	},
+
 	render : function(){
 		return <div className='sharePage page'>
+			<Meta name='robots' content='noindex, nofollow' />
 			<Navbar>
 				<Nav.section>
 					<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>
 				</Nav.section>

 				<Nav.section>
-					<PrintLink shareId={this.props.brew.shareId} />
-					<Nav.item href={`/source/${this.props.brew.shareId}`} color='teal' icon='fa-code'>
+					<PrintLink shareId={this.processShareId()} />
+					<Nav.item href={`/source/${this.processShareId()}`} color='teal' icon='fa-code'>
 						source
 					</Nav.item>
 					<RecentNavItem brew={this.props.brew} storageKey='view' />
--- a/client/homebrew/pages/userPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx
@@ -1,3 +1,4 @@
+require('./brewItem.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
@@ -5,6 +6,8 @@ const cx    = require('classnames');
 const moment = require('moment');
 const request = require('superagent');

+const googleDriveIcon = require('../../../googleDrive.png');
+
 const BrewItem = createClass({
 	getDefaultProps : function() {
 		return {
@@ -26,11 +29,19 @@ const BrewItem = createClass({
 			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
 		}

-		request.get(`/api/remove/${this.props.brew.editId}`)
-			.send()
-			.end(function(err, res){
-				location.reload();
-			});
+		if(this.props.brew.googleId) {
+			request.get(`/api/removeGoogle/${this.props.brew.googleId}${this.props.brew.editId}`)
+				.send()
+				.end(function(err, res){
+					location.reload();
+				});
+		} else {
+			request.delete(`/api/${this.props.brew.editId}`)
+				.send()
+				.end(function(err, res){
+					location.reload();
+				});
+		}
 	},

 	renderDeleteBrewLink : function(){
@@ -40,14 +51,41 @@ const BrewItem = createClass({
 			<i className='fa fa-trash' />
 		</a>;
 	},
+
 	renderEditLink : function(){
 		if(!this.props.brew.editId) return;

-		return <a href={`/edit/${this.props.brew.editId}`} target='_blank' rel='noopener noreferrer'>
+		let editLink = this.props.brew.editId;
+		if(this.props.brew.googleId) {
+			editLink = this.props.brew.googleId + editLink;
+		}
+
+		return <a href={`/edit/${editLink}`} target='_blank' rel='noopener noreferrer'>
 			<i className='fa fa-pencil' />
 		</a>;
 	},

+	renderShareLink : function(){
+		if(!this.props.brew.shareId) return;
+
+		let shareLink = this.props.brew.shareId;
+		if(this.props.brew.googleId) {
+			shareLink = this.props.brew.googleId + shareLink;
+		}
+
+		return <a href={`/share/${shareLink}`} target='_blank' rel='noopener noreferrer'>
+			<i className='fa fa-share-alt' />
+		</a>;
+	},
+
+	renderGoogleDriveIcon : function(){
+		if(!this.props.brew.gDrive) return;
+
+		return <span>
+			<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
+		</span>;
+	},
+
 	render : function(){
 		const brew = this.props.brew;
 		return <div className='brewItem'>
@@ -65,12 +103,11 @@ const BrewItem = createClass({
 				<span>
 					<i className='fa fa-refresh' /> {moment(brew.updatedAt).fromNow()}
 				</span>
+				{this.renderGoogleDriveIcon()}
 			</div>

 			<div className='links'>
-				<a href={`/share/${brew.shareId}`} target='_blank' rel='noopener noreferrer'>
-					<i className='fa fa-share-alt' />
-				</a>
+				{this.renderShareLink()}
 				{this.renderEditLink()}
 				{this.renderDeleteBrewLink()}
 			</div>
--- a/client/homebrew/pages/userPage/brewItem/brewItem.less
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.less
@@ -7,6 +7,7 @@
 	box-sizing                  : border-box;
 	overflow                    : hidden;
 	width                       : 48%;
+	min-height                  : 80px;
 	margin-right                : 15px;
 	margin-bottom               : 15px;
 	padding                     : 5px 15px 5px 8px;
@@ -24,7 +25,7 @@
 		font-family : ScalySans;
 		font-size   : 1.2em;
 		&>span{
-			margin-right : 15px;
+			margin-right : 12px;
 		}
 	}
 	&:hover{
@@ -55,6 +56,14 @@
 			&:hover{
 				opacity : 1;
 			}
+			i{
+				cursor : pointer;
+			}
 		}
 	}
-}
+	.googleDriveIcon {
+		height	: 20px;
+		padding : 0px;
+		margin  : -5px;
+	}
+}
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -1,3 +1,4 @@
+require('./userPage.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
@@ -25,6 +26,11 @@ const UserPage = createClass({
 			brews    : []
 		};
 	},
+	getUsernameWithS : function() {
+		if(this.props.username.endsWith('s'))
+			return `${this.props.username}'`;
+		return `${this.props.username}'s`;
+	},

 	renderBrews : function(brews){
 		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
@@ -56,11 +62,11 @@ const UserPage = createClass({
 			<div className='content'>
 				<div className='phb'>
 					<div>
-						<h1>{this.props.username}'s brews</h1>
+						<h1>{this.getUsernameWithS()} brews</h1>
 						{this.renderBrews(brews.published)}
 					</div>
 					<div>
-						<h1>{this.props.username}'s unpublished brews</h1>
+						<h1>{this.getUsernameWithS()} unpublished brews</h1>
 						{this.renderBrews(brews.private)}
 					</div>
 				</div>
--- a/client/homebrew/phbStyle/phb.style.less
+++ b/client/homebrew/phbStyle/phb.style.less
@@ -1,4 +1,3 @@
-
@import (less) 'shared/naturalcrit/styles/reset.less';
@import (less) './client/homebrew/phbStyle/phb.fonts.css';
@import (less) './client/homebrew/phbStyle/phb.assets.less';
@@ -190,6 +189,7 @@ body {
 		border-image        : @noteBorderImage 11;
 		border-image-outset : 9px 0px;
 		box-shadow          : 1px 4px 14px #888;
+		-webkit-transform   : translateZ(0); //Prevents shadows from breaking across columns
 		p, ul{
 			font-size   : 0.352cm;
 			line-height : 1.1em;
@@ -340,7 +340,6 @@ body {
 		-webkit-column-break-inside : avoid;
 		page-break-inside           : avoid;
 		break-inside                : avoid;
-		overflow: hidden; /* Firefox fix */
 	}
 	//Better spacing for spell blocks
 	h4+p+hr+ul{
--- a/client/template.js
+++ b/client/template.js
@@ -1,21 +1,19 @@
-module.exports = function(vitreum){
+module.exports = async(name, title = '', props = {})=>{
 	return `
 <!DOCTYPE html>
 <html>
 	<head>
 		<link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
 		<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
+		<link href=${`/${name}/bundle.css`} rel='stylesheet'></link>
 		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
-		<title>The Homebrewery - NaturalCrit</title>
-		${vitreum.head}
+		<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
 	</head>
 	<body>
-		<main id="reactRoot">${vitreum.body}</main>
+		<main id="reactRoot">${require(`../build/${name}/ssr.js`)(props)}</main>
 	</body>
-	${vitreum.js}
+	<script src=${`/${name}/bundle.js`}></script>
+	<script>start_app(${JSON.stringify(props)})</script>
 </html>
 `;
-};
-
-
-
+};
--- a/config/default.json
+++ b/config/default.json
@@ -1,5 +1,6 @@
 {
 	"host" : "homebrewery.local.naturalcrit.com:8000",
 	"naturalcrit_url" : "local.naturalcrit.com:8010",
-	"secret" : "secret"
-}
+	"secret" : "secret",
+	"web_port" : 8000
+}
--- a/freebsd/install.sh
+++ b/freebsd/install.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+pkg install -y git nano node npm mongodb44
+
+sysrc mongod_enable=YES
+service mongod start
+
+cd /usr/local/
+git clone https://github.com/naturalcrit/homebrewery.git
+
+cd homebrewery
+npm install
+npm audit fix
+npm run postinstall
+
+cp freebsd/rc.d/homebrewery /usr/local/etc/rc.d/
+chmod +x /usr/local/etc/rc.d/homebrewery
+
+sysrc homebrewery_enable=YES
+service homebrewery start
--- a/freebsd/rc.d/homebrewery
+++ b/freebsd/rc.d/homebrewery
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# PROVIDE: homebrewery
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+# Author: S Robertson
+# Version: 1.0.0
+
+# Description:
+#    This script runs HomeBrewery as a service under the supplied user on boot
+
+# How to use:
+#    Place this file in /usr/local/etc/rc.d/
+#    Add homebrewery_enable="YES" to /etc/rc.config
+#    (Optional) To run as non-root, add homebrewery_runAs="homebrewery" to /etc/rc.config
+#    (Optional) To pass HomeBrewery args, add homebrewery_args="" to /etc/rc.config
+
+# Freebsd rc library
+. /etc/rc.subr
+
+# General Info
+name="homebrewery"            # Safe name of program
+location="/usr/local/"	      # Install location
+program_name="homebrewery"    # Name of exec
+title="HomeBrewery"           # Title to display in top/htop
+
+# RC.config vars
+load_rc_config $name      # Loading rc config vars
+: ${homebrewery_enable="NO"}  # Default: Do not enable HomeBrewery
+: ${homebrewery_runAs="root"} # Default: Run HomeBrewery as root
+: ${homebrewery_port=8000}    # Default: Run HomeBrewery on port 8000
+: ${homebrewery_NODE_ENV="local"}  # Default: Run HomeBrewery in local mode
+
+# Freebsd Setup
+rcvar=homebrewery_enable                   # Enables the rc.conf YES/NO flag
+pidfile="/var/run/${program_name}.pid" 	   # File that allows the system to keep track of HomeBrewery status
+
+# Env Setup
+export HOME=$( getent passwd "homebrewery_runAs" | cut -d: -f6 ) # Gets the home directory of the runAs user
+export NODE_ENV=${homebrewery_NODE_ENV}
+export PORT=${homebrewery_port}
+
+# Command Setup
+exec_cmd="${location}/${program_name}/server.js" 	# Path to the HomeBrewery server.js, /usr/local/bin/ when installed globally
+output_file="/var/log/${program_name}.log" 		# Path to HomeBrewery output file
+
+# Command
+command="/usr/sbin/daemon"
+command_args="-r -t ${title} -u ${homebrewery_runAs} -o ${output_file} -P ${pidfile} /usr/local/bin/node ${exec_cmd} ${homebrewery_args}"
+
+# Extra Commands
+extra_commands="dev_mode"
+
+dev_mode_cmd="homebrewery_dev_mode"
+
+homebrewery_dev_mode() {
+echo "Starting HomeBrewery in live rebuild Developer mode..."
+cd ${location}/${program_name}/
+/usr/local/bin/node ${location}/${program_name}/scripts/buildHomebrew.js --dev
+}
+
+# Loading Config
+load_rc_config ${name}
+run_rc_command "$1"
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,10 @@
 {
  "name": "homebrewery",
  "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "2.8.2",
+  "version": "2.10.7",
+  "engines": {
+    "node": "12.16.x"
+  },
  "repository": {
    "type": "git",
    "url": "git://github.com/naturalcrit/homebrewery.git"
@@ -9,7 +12,8 @@
  "scripts": {
    "dev": "node scripts/dev.js",
    "quick": "node scripts/quick.js",
-    "build": "node scripts/build.js",
+    "build": "node scripts/buildHomebrew.js",
+    "buildall": "node scripts/buildHomebrew.js && node scripts/buildAdmin.js",
    "lint": "eslint --fix **/*.{js,jsx}",
    "lint:dry": "eslint **/*.{js,jsx}",
    "circleci": "npm test && eslint **/*.{js,jsx} --max-warnings=0",
@@ -18,7 +22,7 @@
    "test:dev": "pico-check -v -w",
    "phb": "node scripts/phb.js",
    "prod": "set NODE_ENV=production && npm run build",
-    "postinstall": "npm run build",
+    "postinstall": "npm run buildall",
    "start": "node server.js"
  },
  "author": "stolksdorf",
@@ -36,30 +40,38 @@
    ]
  },
  "dependencies": {
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.24.1",
+    "@babel/core": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
    "body-parser": "^1.19.0",
    "classnames": "^2.2.6",
-    "codemirror": "^5.52.0",
-    "cookie-parser": "^1.4.4",
-    "create-react-class": "^15.6.3",
+    "codemirror": "^5.59.2",
+    "cookie-parser": "^1.4.5",
+    "create-react-class": "^15.7.0",
    "express": "^4.17.1",
+    "express-static-gzip": "2.1.1",
+    "fs-extra": "9.1.0",
+    "googleapis": "67.0.0",
    "jwt-simple": "^0.5.6",
-    "lodash": "^4.17.15",
+    "less": "^3.13.1",
+    "lodash": "^4.17.20",
    "marked": "^0.3.19",
-    "moment": "^2.24.0",
-    "mongoose": "^5.9.2",
-    "nconf": "^0.10.0",
-    "pico-router": "^2.1.0",
-    "react": "^16.13.0",
-    "react-dom": "^16.13.0",
-    "shortid": "^2.2.15",
-    "superagent": "^5.2.2",
-    "vitreum": "^4.10.1"
+    "moment": "^2.29.1",
+    "mongoose": "^5.11.13",
+    "nanoid": "3.1.20",
+    "nconf": "^0.11.1",
+    "prop-types": "15.7.2",
+    "query-string": "6.13.8",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-frame-component": "4.1.3",
+    "react-router-dom": "5.2.0",
+    "superagent": "^6.1.0",
+    "vitreum": "github:calculuschild/vitreum#21a8e1c9421f1d3a3b474c12f480feb2fbd28c5b"
  },
  "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.19.0",
-    "pico-check": "^1.3.2"
+    "eslint": "^7.18.0",
+    "eslint-plugin-react": "^7.22.0",
+    "pico-check": "^2.0.3"
  }
 }
--- a/robots.txt
+++ b/robots.txt
@@ -0,0 +1,2 @@
+# Notes
+User-agent: *
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -1,20 +0,0 @@
-const label = 'build';
-console.time(label);
-
-const clean = require('vitreum/steps/clean.js');
-const jsx   = require('vitreum/steps/jsx.js');
-const lib   = require('vitreum/steps/libs.js');
-const less  = require('vitreum/steps/less.js');
-const asset = require('vitreum/steps/assets.js');
-
-const Proj = require('./project.json');
-
-clean()
-	.then(lib(Proj.libs))
-	.then(()=>jsx('homebrew', './client/homebrew/homebrew.jsx', { libs: Proj.libs, shared: ['./shared'] }))
-	.then((deps)=>less('homebrew', { shared: ['./shared'] }, deps))
-	.then(()=>jsx('admin', './client/admin/admin.jsx', { libs: Proj.libs, shared: ['./shared'] }))
-	.then((deps)=>less('admin', { shared: ['./shared'] }, deps))
-	.then(()=>asset(Proj.assets, ['./shared', './client']))
-	.then(console.timeEnd.bind(console, label))
-	.catch(console.error);
--- a/scripts/buildAdmin.js
+++ b/scripts/buildAdmin.js
@@ -0,0 +1,31 @@
+const fs = require('fs-extra');
+const Proj = require('./project.json');
+
+const { pack } = require('vitreum');
+const isDev = !!process.argv.find((arg)=>arg=='--dev');
+
+const lessTransform  = require('vitreum/transforms/less.js');
+const assetTransform = require('vitreum/transforms/asset.js');
+//const Meta = require('vitreum/headtags');
+
+const transforms = {
+	'.less' : lessTransform,
+	'*'     : assetTransform('./build')
+};
+
+const build = async ({ bundle, render, ssr })=>{
+	await fs.outputFile('./build/admin/bundle.css', await lessTransform.generate({ paths: './shared' }));
+	await fs.outputFile('./build/admin/bundle.js', bundle);
+	await fs.outputFile('./build/admin/ssr.js', ssr);
+	await fs.outputFile('./build/admin/render.js', render);
+};
+
+fs.emptyDirSync('./build/admin');
+pack('./client/admin/admin.jsx', {
+	paths : ['./shared'],
+	libs  : Proj.libs,
+	dev   : isDev && build,
+	transforms
+})
+	.then(build)
+	.catch(console.error);
--- a/scripts/buildHomebrew.js
+++ b/scripts/buildHomebrew.js
@@ -0,0 +1,47 @@
+const fs = require('fs-extra');
+const zlib = require('zlib');
+const Proj = require('./project.json');
+
+const { pack, watchFile, livereload } = require('vitreum');
+const isDev = !!process.argv.find((arg)=>arg=='--dev');
+
+const lessTransform  = require('vitreum/transforms/less.js');
+const assetTransform = require('vitreum/transforms/asset.js');
+//const Meta = require('vitreum/headtags');
+
+const transforms = {
+	'.less' : lessTransform,
+	'*'     : assetTransform('./build')
+};
+
+const build = async ({ bundle, render, ssr })=>{
+	const css = await lessTransform.generate({ paths: './shared' });
+	await fs.outputFile('./build/homebrew/bundle.css', css);
+	await fs.outputFile('./build/homebrew/bundle.js', bundle);
+	await fs.outputFile('./build/homebrew/ssr.js', ssr);
+	await fs.outputFile('./build/homebrew/render.js', render);
+
+	//compress files
+	await fs.outputFile('./build/homebrew/bundle.css.br', zlib.brotliCompressSync(css));
+	await fs.outputFile('./build/homebrew/bundle.js.br', zlib.brotliCompressSync(bundle));
+	await fs.outputFile('./build/homebrew/ssr.js.br', zlib.brotliCompressSync(ssr));
+};
+
+fs.emptyDirSync('./build/homebrew');
+pack('./client/homebrew/homebrew.jsx', {
+	paths : ['./shared'],
+	libs  : Proj.libs,
+	dev   : isDev && build,
+	transforms
+})
+	.then(build)
+	.catch(console.error);
+
+
+//In development set up a watch server and livereload
+if(isDev){
+	livereload('./build');
+	watchFile('./server.js', {
+		watch : ['./homebrew'] // Watch additional folders if you want
+	});
+}
--- a/scripts/project.json
+++ b/scripts/project.json
@@ -13,7 +13,6 @@
 		"codemirror/mode/javascript/javascript.js",
 		"moment",
 		"superagent",
-		"marked",
-		"pico-router"
+		"marked"
 	]
-}
+}
--- a/server.js
+++ b/server.js
@@ -1,9 +1,22 @@
 const _ = require('lodash');
 const jwt = require('jwt-simple');
+const expressStaticGzip = require('express-static-gzip');
 const express = require('express');
 const app = express();

-app.use(express.static(`${__dirname}/build`));
+const homebrewApi = require('./server/homebrew.api.js');
+const GoogleActions = require('./server/googleActions.js');
+
+// Serve brotli-compressed static files if available
+app.use('/', expressStaticGzip(`${__dirname}/build`, {
+	enableBrotli    : true,
+	orderPreference : ['br'],
+	index           : false
+}));
+
+process.chdir(__dirname);
+
+//app.use(express.static(`${__dirname}/build`));
 app.use(require('body-parser').json({ limit: '25mb' }));
 app.use(require('cookie-parser')());
 app.use(require('./server/forcessl.mw.js'));
@@ -24,120 +37,201 @@ mongoose.connection.on('error', ()=>{
 	throw 'Can not connect to Mongo';
 });

-
 //Account Middleware
 app.use((req, res, next)=>{
 	if(req.cookies && req.cookies.nc_session){
 		try {
 			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
+			//console.log("Just loaded up JWT from cookie:");
+			//console.log(req.account);
 		} catch (e){}
 	}
+
+	req.config = {
+		google_client_id     : config.get('google_client_id'),
+		google_client_secret : config.get('google_client_secret')
+	};
 	return next();
 });

-
-app.use(require('./server/homebrew.api.js'));
+app.use(homebrewApi);
 app.use(require('./server/admin.api.js'));

-
 const HomebrewModel = require('./server/homebrew.model.js').model;
 const welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
 const changelogText = require('fs').readFileSync('./changelog.md', 'utf8');

+String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
+
+//Robots.txt
+app.get('/robots.txt', (req, res)=>{
+	return res.sendFile(`${__dirname}/robots.txt`);
+});

 //Source page
-String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
 app.get('/source/:id', (req, res)=>{
-	HomebrewModel.get({ shareId: req.params.id })
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const shareId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
 		.then((brew)=>{
 			const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
 			return res.send(`<code><pre style="white-space: pre-wrap;">${text}</pre></code>`);
 		})
 		.catch((err)=>{
 			console.log(err);
-			return res.status(404).send('Could not find Homebrew with that id');
+			return res.status(400).send('Can\'t get brew from Google');
 		});
+	} else {
+		HomebrewModel.get({ shareId: req.params.id })
+			.then((brew)=>{
+				const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+				return res.send(`<code><pre style="white-space: pre-wrap;">${text}</pre></code>`);
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(404).send('Could not find Homebrew with that id');
+			});
+	}
 });

-
-app.get('/user/:username', (req, res, next)=>{
+//User Page
+app.get('/user/:username', async (req, res, next)=>{
 	const fullAccess = req.account && (req.account.username == req.params.username);
-	HomebrewModel.getByUser(req.params.username, fullAccess)
-		.then((brews)=>{
-			req.brews = brews;
-			return next();
-		})
+
+	let googleBrews = [];
+
+	if(req.account && req.account.googleId){
+		googleBrews = await GoogleActions.listGoogleBrews(req, res)
 		.catch((err)=>{
-			console.log(err);
+			console.error(err);
 		});
+	}
+
+	const brews = await HomebrewModel.getByUser(req.params.username, fullAccess)
+	.catch((err)=>{
+		console.log(err);
+	});
+
+	if(googleBrews) {
+		req.brews = _.concat(brews, googleBrews);
+	} else {req.brews = brews;}
+
+	return next();
 });

-
+//Edit Page
 app.get('/edit/:id', (req, res, next)=>{
-	HomebrewModel.get({ editId: req.params.id })
+	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const editId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, editId, 'edit')
 		.then((brew)=>{
-			req.brew = brew.sanatize();
+			req.brew = brew; //TODO Need to sanitize later
 			return next();
 		})
 		.catch((err)=>{
 			console.log(err);
-			return res.status(400).send(`Can't get that`);
+			return res.status(400).send('Can\'t get brew from Google');
 		});
+	} else {
+		HomebrewModel.get({ editId: req.params.id })
+			.then((brew)=>{
+				req.brew = brew.sanatize();
+				return next();
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(400).send(`Can't get that`);
+			});
+	}
 });

 //Share Page
 app.get('/share/:id', (req, res, next)=>{
-	HomebrewModel.get({ shareId: req.params.id })
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const shareId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
 		.then((brew)=>{
-			return brew.increaseView();
+			GoogleActions.increaseView(googleId, shareId, 'share', brew);
+			return brew;
 		})
 		.then((brew)=>{
-			req.brew = brew.sanatize(true);
+			req.brew = brew; //TODO Need to sanitize later
 			return next();
 		})
 		.catch((err)=>{
 			console.log(err);
-			return res.status(400).send(`Can't get that`);
+			return res.status(400).send('Can\'t get brew from Google');
 		});
+	} else {
+		HomebrewModel.get({ shareId: req.params.id })
+			.then((brew)=>{
+				return brew.increaseView();
+			})
+			.then((brew)=>{
+				req.brew = brew.sanatize(true);
+				return next();
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(400).send(`Can't get that`);
+			});
+	}
 });

 //Print Page
 app.get('/print/:id', (req, res, next)=>{
-	HomebrewModel.get({ shareId: req.params.id })
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const shareId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
 		.then((brew)=>{
-			req.brew = brew.sanatize(true);
+			req.brew = brew; //TODO Need to sanitize later
 			return next();
 		})
 		.catch((err)=>{
 			console.log(err);
-			return res.status(400).send(`Can't get that`);
+			return res.status(400).send('Can\'t get brew from Google');
 		});
+	} else {
+		HomebrewModel.get({ shareId: req.params.id })
+			.then((brew)=>{
+				req.brew = brew.sanatize(true);
+				return next();
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(400).send(`Can't get that`);
+			});
+	}
 });

-
-//Render Page
-const render = require('vitreum/steps/render');
+//Render the page
+//const render = require('.build/render');
 const templateFn = require('./client/template.js');
 app.use((req, res)=>{
-	render('homebrew', templateFn, {
+	const props = {
 		version     : require('./package.json').version,
 		url         : req.originalUrl,
 		welcomeText : welcomeText,
 		changelog   : changelogText,
 		brew        : req.brew,
 		brews       : req.brews,
-		account     : req.account
-	})
-		.then((page)=>{
-			return res.send(page);
-		})
-		.catch((err)=>{
-			console.log(err);
-			return res.sendStatus(500);
-		});
+		googleBrews : req.googleBrews,
+		account     : req.account,
+	};
+	templateFn('homebrew', title = req.brew ? req.brew.title : '', props)
+        .then((page)=>{ res.send(page); })
+        .catch((err)=>{
+        	console.log(err);
+        	return res.sendStatus(500);
+        });
 });


-const PORT = process.env.PORT || 8000;
+const PORT = process.env.PORT || config.get('web_port') || 8000;
 app.listen(PORT);
 console.log(`server on port:${PORT}`);
--- a/server/admin.api.js
+++ b/server/admin.api.js
@@ -1,7 +1,7 @@
 const HomebrewModel = require('./homebrew.model.js').model;
 const router = require('express').Router();
 const Moment = require('moment');
-const render = require('vitreum/steps/render');
+//const render = require('vitreum/steps/render');
 const templateFn = require('../client/template.js');
 const zlib = require('zlib');

@@ -37,7 +37,7 @@ const junkBrewQuery = HomebrewModel.find({

 /* Search for brews that aren't compressed (missing the compressed text field) */
 const uncompressedBrewQuery = HomebrewModel.find({
-	'textBin' : null
+	'text' : { '$exists': true }
 }).lean().limit(10000).select('_id');

 router.get('/admin/cleanup', mw.adminOnly, (req, res)=>{
@@ -100,7 +100,7 @@ router.get('/admin/stats', mw.adminOnly, (req, res)=>{
 });

 router.get('/admin', mw.adminOnly, (req, res)=>{
-	render('admin', templateFn, {
+	templateFn('admin', {
 		url : req.originalUrl
 	})
 		.then((page)=>res.send(page))
--- a/server/forcessl.mw.js
+++ b/server/forcessl.mw.js
@@ -1,5 +1,5 @@
 module.exports = (req, res, next)=>{
-	if(process.env.NODE_ENV === 'local') return next();
+	if(process.env.NODE_ENV === 'local' || process.env.NODE_ENV === 'docker') return next();
 	if(req.header('x-forwarded-proto') !== 'https') {
 		return res.redirect(302, `https://${req.get('Host')}${req.url}`);
 	}
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -0,0 +1,361 @@
+/* eslint-disable max-lines */
+const _ = require('lodash');
+const { google } = require('googleapis');
+const { nanoid } = require('nanoid');
+const token = require('./token.js');
+const config = require('nconf')
+	.argv()
+	.env({ lowerCase: true })	// Load environment variables
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('defaults', { file: 'config/default.json' });
+
+//let oAuth2Client;
+
+GoogleActions = {
+
+	authCheck : (account, res)=>{
+		if(!account || !account.googleId){ // If not signed into Google
+			const err = new Error('Not Signed In');
+			err.status = 401;
+			throw err;
+		}
+
+		const oAuth2Client = new google.auth.OAuth2(
+			config.get('google_client_id'),
+			config.get('google_client_secret'),
+			'/auth/google/redirect'
+		);
+
+		oAuth2Client.setCredentials({
+			access_token  : account.googleAccessToken, //Comment out to refresh token
+			refresh_token : account.googleRefreshToken
+		});
+
+		oAuth2Client.on('tokens', (tokens)=>{
+			if(tokens.refresh_token) {
+				account.googleRefreshToken = tokens.refresh_token;
+			}
+			account.googleAccessToken = tokens.access_token;
+			const JWTToken = token.generateAccessToken(account);
+
+			//Save updated token to cookie
+			//res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax' });
+			res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax', domain: '.naturalcrit.com' });
+		});
+
+		return oAuth2Client;
+	},
+
+	getGoogleFolder : async (auth)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		fileMetadata = {
+			'name'     : 'Homebrewery',
+			'mimeType' : 'application/vnd.google-apps.folder'
+		};
+
+		const obj = await drive.files.list({
+			q : 'mimeType = \'application/vnd.google-apps.folder\''
+		})
+		.catch((err)=>{
+			console.log('Error searching Google Drive Folders');
+			console.error(err);
+		});
+
+		let folderId;
+
+		if(obj.data.files.length == 0){
+			const obj = await drive.files.create({
+				resource : fileMetadata
+			})
+			.catch((err)=>{
+				console.log('Error creating google app folder');
+				console.error(err);
+			});
+
+			folderId = obj.data.id;
+		} else {
+			folderId = obj.data.files[0].id;
+		}
+
+		return folderId;
+	},
+
+	listGoogleBrews : async (req, res)=>{
+
+		oAuth2Client = GoogleActions.authCheck(req.account, res);
+
+		//TODO: Change to service account to allow non-owners to view published files.
+		// Requires a driveId parameter in the drive.files.list command
+		// const keys = JSON.parse(config.get('service_account'));
+		// const auth = google.auth.fromJSON(keys);
+		// auth.scopes = ['https://www.googleapis.com/auth/drive'];
+
+		const drive = google.drive({ version: 'v3', auth: oAuth2Client });
+
+		const obj = await drive.files.list({
+			pageSize : 100,
+			fields   : 'nextPageToken, files(id, name, description, modifiedTime, properties)',
+			q        : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false'
+		})
+		.catch((err)=>{
+	    return console.error(`Error Listing Google Brews: ${err}`);
+	  });
+
+		if(!obj.data.files.length) {
+	    console.log('No files found.');
+	  }
+
+		const brews = obj.data.files.map((file)=>{
+	    return {
+	      text      : '',
+	      shareId   : file.properties.shareId,
+	      editId    : file.properties.editId,
+	      createdAt : file.createdTime,
+	      updatedAt : file.modifiedTime,
+	      gDrive    : true,
+	      googleId  : file.id,
+
+	      title       : file.properties.title,
+	      description : file.description,
+				views       : file.properties.views,
+	      tags        : '',
+	      published   : file.properties.published ? file.properties.published == 'true' : false,
+	      authors     : [req.account.username],	//TODO: properly save and load authors to google drive
+	      systems     : []
+	    };
+	  });
+
+	  return brews;
+	},
+
+	existsGoogleBrew : async (auth, id)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		const result = await drive.files.get({ fileId: id })
+		.catch((err)=>{
+			console.log('error checking file exists...');
+			console.log(err);
+			return false;
+		});
+
+		if(result){return true;}
+
+		return false;
+	},
+
+	updateGoogleBrew : async (auth, brew)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		if(await GoogleActions.existsGoogleBrew(auth, brew.googleId) == true) {
+			await drive.files.update({
+				fileId   : brew.googleId,
+				resource : { name        : `${brew.title}.txt`,
+										 description : `${brew.description}`,
+										 properties  : { title   			: brew.title,
+										 								published  : brew.published,
+																	  lastViewed : brew.lastViewed,
+																	  views      : brew.views,
+																	  version    : brew.version,
+																	  tags       : brew.tags,
+																	  systems    : brew.systems.join() }
+									 },
+				media : { mimeType : 'text/plain',
+										 body     : brew.text }
+			})
+			.catch((err)=>{
+				console.log('Error saving to google');
+				console.error(err);
+				//return res.status(500).send('Error while saving');
+			});
+		}
+
+		return (brew);
+	},
+
+	newGoogleBrew : async (auth, brew)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		const media = {
+			mimeType : 'text/plain',
+			body     : brew.text
+		};
+
+		const folderId = await GoogleActions.getGoogleFolder(auth);
+
+		const fileMetadata = {
+			'name'        : `${brew.title}.txt`,
+			'description' : `${brew.description}`,
+			'parents'     : [folderId],
+			'properties'  : {								//AppProperties is not accessible
+				'shareId' : nanoid(12),
+				'editId'  : nanoid(12),
+				'title'   : brew.title,
+				'views'   : '0'
+			}
+		};
+
+		const obj = await drive.files.create({
+			resource : fileMetadata,
+			media    : media
+		})
+		.catch((err)=>{
+			console.error(err);
+			return res.status(500).send('Error while creating google brew');
+		});
+
+		if(!obj) return;
+
+		await drive.permissions.create({
+			resource : { type : 'anyone',
+									 role : 'writer' },
+			fileId : obj.data.id,
+			fields : 'id',
+		})
+		.catch((err)=>{
+			console.log('Error updating permissions');
+			console.error(err);
+		});
+
+		const newHomebrew = {
+			text      : brew.text,
+			shareId   : fileMetadata.properties.shareId,
+			editId    : fileMetadata.properties.editId,
+			createdAt : new Date(),
+			updatedAt : new Date(),
+			gDrive    : true,
+			googleId  : obj.data.id,
+
+			title       : brew.title,
+			description : brew.description,
+			tags        : '',
+			published   : brew.published,
+			authors     : [],
+			systems     : []
+		};
+
+		return newHomebrew;
+	},
+
+	readFileMetadata : async (auth, id, accessId, accessType)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		const obj = await drive.files.get({
+			fileId : id,
+			fields : 'properties, createdTime, modifiedTime, description'
+		})
+		.catch((err)=>{
+			console.log('Error loading from Google');
+			console.error(err);
+			return;
+		});
+
+		if(obj) {
+			if(accessType == 'edit' && obj.data.properties.editId != accessId){
+				throw ('Edit ID does not match');
+			} else if(accessType == 'share' && obj.data.properties.shareId != accessId){
+				throw ('Share ID does not match');
+			}
+
+			//Access actual file with service account. Just api key is causing "automated query" errors.
+			const keys = JSON.parse(config.get('service_account'));
+			const serviceAuth = google.auth.fromJSON(keys);
+			serviceAuth.scopes = ['https://www.googleapis.com/auth/drive'];
+
+			const serviceDrive = google.drive({ version: 'v3', auth: serviceAuth });
+
+			const file = await serviceDrive.files.get({
+				fileId : id,
+				fields : 'description, properties',
+				alt    : 'media'
+			})
+			.catch((err)=>{
+				console.log('Error getting file contents from Google');
+				console.error(err);
+			});
+
+			const brew = {
+				shareId : obj.data.properties.shareId,
+				editId  : obj.data.properties.editId,
+				title   : obj.data.properties.title,
+				text    : file.data,
+
+				description : obj.data.description,
+				tags        : obj.data.properties.tags    ? obj.data.properties.tags               : '',
+				systems     : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
+				authors     : [],
+				published   : obj.data.properties.published ? obj.data.properties.published == 'true' : false,
+
+				createdAt  : obj.data.createdTime,
+				updatedAt  : obj.data.modifiedTime,
+				lastViewed : obj.data.properties.lastViewed,
+				views      : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
+				version    : parseInt(obj.data.properties.version) || 0,
+
+				gDrive   : true,
+				googleId : id
+			};
+
+			return (brew);
+		}
+	},
+
+	deleteGoogleBrew : async (req, res, id)=>{
+
+		oAuth2Client = GoogleActions.authCheck(req.account, res);
+		const drive = google.drive({ version: 'v3', auth: oAuth2Client });
+
+		const googleId = id.slice(0, -12);
+		const accessId = id.slice(-12);
+
+		const obj = await drive.files.get({
+			fileId : googleId,
+			fields : 'properties'
+		})
+		.catch((err)=>{
+			console.log('Error loading from Google');
+			console.error(err);
+			return;
+		});
+
+		if(obj && obj.data.properties.editId != accessId) {
+			throw ('Not authorized to delete this Google brew');
+		}
+
+		await drive.files.update({
+			fileId   : googleId,
+			resource : { trashed: true }
+		})
+		.catch((err)=>{
+			console.log('Can\'t delete Google file');
+			console.error(err);
+		});
+
+		return res.status(200).send();
+	},
+
+	increaseView : async (id, accessId, accessType, brew)=>{
+		//service account because this is modifying another user's file properties
+		//so we need extended scope
+		const keys = JSON.parse(config.get('service_account'));
+		const auth = google.auth.fromJSON(keys);
+		auth.scopes = ['https://www.googleapis.com/auth/drive'];
+
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		await drive.files.update({
+			fileId   : brew.googleId,
+			resource : { properties : { views      : brew.views + 1,
+		 															lastViewed : new Date() } }
+		})
+		.catch((err)=>{
+			console.log('Error updating Google views');
+			console.error(err);
+			//return res.status(500).send('Error while saving');
+		});
+
+		return;
+	}
+};
+
+module.exports = GoogleActions;
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -2,62 +2,63 @@ const _ = require('lodash');
 const HomebrewModel = require('./homebrew.model.js').model;
 const router = require('express').Router();
 const zlib = require('zlib');
+const GoogleActions = require('./googleActions.js');
+const Markdown = require('../shared/naturalcrit/markdown.js');

-// const getTopBrews = (cb)=>{
+// const getTopBrews = (cb) => {
 // 	HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
 // 		cb(brews);
 // 	});
 // };

 const getGoodBrewTitle = (text)=>{
-	const titlePos = text.indexOf('# ');
-	if(titlePos !== -1){
-		const ending = text.indexOf('\n', titlePos);
-		return text.substring(titlePos + 2, ending);
-	} else {
-		return _.find(text.split('\n'), (line)=>{
-			return line;
-		});
-	}
+	const tokens = Markdown.marked.lexer(text);
+ 	return title = (tokens.find((token)=>token.type == 'heading' || token.type == 'paragraph') || { text: 'No Title' }).text;
 };

+const newBrew = (req, res)=>{
+	const brew = req.body;
+	brew.authors = (req.account) ? [req.account.username] : [];

-
-router.post('/api', (req, res)=>{
-
-	let authors = [];
-	if(req.account) authors = [req.account.username];
-
-	const newHomebrew = new HomebrewModel(_.merge({},
-		req.body,
-		{ authors: authors }
-	));
-
-	if(!newHomebrew.title){
-		newHomebrew.title = getGoodBrewTitle(newHomebrew.text);
+	if(!brew.title) {
+		brew.title = getGoodBrewTitle(brew.text);
 	}

-	newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);	// Compress brew text to binary before saving
-	newHomebrew.text = undefined;									// Delete the non-binary text field since it's not needed anymore
+	delete brew.editId;
+	delete brew.shareId;
+	delete brew.googleId;
+
+	const newHomebrew = new HomebrewModel(brew);
+	// Compress brew text to binary before saving
+	newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
+	// Delete the non-binary text field since it's not needed anymore
+	newHomebrew.text = undefined;

 	newHomebrew.save((err, obj)=>{
-		if(err){
+		if(err) {
 			console.error(err, err.toString(), err.stack);
 			return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
 		}
-		return res.json(obj);
-	});
-});

-router.put('/api/update/:id', (req, res)=>{
+		obj = obj.toObject();
+		obj.gDrive = false;
+		return res.status(200).send(obj);
+	});
+};
+
+const updateBrew = (req, res)=>{
 	HomebrewModel.get({ editId: req.params.id })
 		.then((brew)=>{
 			brew = _.merge(brew, req.body);
-			brew.textBin = zlib.deflateRawSync(req.body.text);	// Compress brew text to binary before saving
-			brew.text = undefined;								// Delete the non-binary text field since it's not needed anymore
+			// Compress brew text to binary before saving
+			brew.textBin = zlib.deflateRawSync(req.body.text);
+			// Delete the non-binary text field since it's not needed anymore
+			brew.text = undefined;
 			brew.updatedAt = new Date();

-			if(req.account) brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
+			if(req.account) {
+				brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
+			}

 			brew.markModified('authors');
 			brew.markModified('systems');
@@ -68,87 +69,83 @@ router.put('/api/update/:id', (req, res)=>{
 			});
 		})
 		.catch((err)=>{
-			console.log(err);
+			console.error(err);
 			return res.status(500).send('Error while saving');
 		});
-});
+};

-router.get('/api/remove/:id', (req, res)=>{
+const deleteBrew = (req, res)=>{
 	HomebrewModel.find({ editId: req.params.id }, (err, objs)=>{
-		if(!objs.length || err) return res.status(404).send('Can not find homebrew with that id');
+		if(!objs.length || err) {
+			return res.status(404).send('Can not find homebrew with that id');
+		}
+
 		const brew = objs[0];

-		// Remove current user as author
-		if(req.account){
+		if(req.account) {
+			// Remove current user as author
 			brew.authors = _.pull(brew.authors, req.account.username);
 			brew.markModified('authors');
 		}

-		// Delete brew if there are no authors left
-		if(!brew.authors.length)
+		if(brew.authors.length === 0) {
+			// Delete brew if there are no authors left
 			brew.remove((err)=>{
 				if(err) return res.status(500).send('Error while removing');
 				return res.status(200).send();
 			});
-		// Otherwise, save the brew with updated author list
-		else
+		} else {
+			// Otherwise, save the brew with updated author list
 			brew.save((err, savedBrew)=>{
 				if(err) throw err;
 				return res.status(200).send(savedBrew);
 			});
+		}
 	});
-});
+};

+const newGoogleBrew = async (req, res, next)=>{
+	let oAuth2Client;
+
+	try {	oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); }
+
+	const brew = req.body;
+	brew.authors = (req.account) ? [req.account.username] : [];
+
+	if(!brew.title) {
+		brew.title = getGoodBrewTitle(brew.text);
+	}
+
+	delete brew.editId;
+	delete brew.shareId;
+	delete brew.googleId;
+
+	req.body = brew;
+
+	console.log(oAuth2Client);
+
+	const newBrew = await GoogleActions.newGoogleBrew(oAuth2Client, brew);
+
+	return res.status(200).send(newBrew);
+};
+
+const updateGoogleBrew = async (req, res, next)=>{
+	let oAuth2Client;
+
+	try {	oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); }
+
+	const updatedBrew = await GoogleActions.updateGoogleBrew(oAuth2Client, req.body);
+
+	return res.status(200).send(updatedBrew);
+};
+
+router.post('/api', newBrew);
+router.post('/api/newGoogle/', newGoogleBrew);
+router.put('/api/:id', updateBrew);
+router.put('/api/update/:id', updateBrew);
+router.put('/api/updateGoogle/:id', updateGoogleBrew);
+router.delete('/api/:id', deleteBrew);
+router.get('/api/remove/:id', deleteBrew);
+router.get('/api/removeGoogle/:id', (req, res)=>{GoogleActions.deleteGoogleBrew(req, res, req.params.id);});

 module.exports = router;
-
-/*
-
-
-
-module.exports = function(app){
-
-	app;
-
-
-
-
-	app.get('/api/search', mw.adminOnly, function(req, res){
-
-		var page = req.query.page || 0;
-		var count = req.query.count || 20;
-
-		var query = {};
-		if(req.query && req.query.id){
-			query = {
-				"$or" : [{
-					editId : req.query.id
-				},{
-					shareId : req.query.id
-				}]
-			};
-		}
-
-		HomebrewModel.find(query, {
-			text : 0 //omit the text
-		}, {
-			skip: page*count,
-			limit: count*1
-		}, function(err, objs){
-			if(err) console.log(err);
-			return res.json({
-				page : page,
-				count : count,
-				total : homebrewTotal,
-				brews : objs
-			});
-
-		});
-	})
-
-
-
-
-	return app;
-}
-*/
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -1,11 +1,11 @@
 const mongoose = require('mongoose');
-const shortid = require('shortid');
+const { nanoid } = require('nanoid');
 const _ = require('lodash');
 const zlib = require('zlib');

 const HomebrewSchema = mongoose.Schema({
-	shareId : { type: String, default: shortid.generate, index: { unique: true } },
-	editId  : { type: String, default: shortid.generate, index: { unique: true } },
+	shareId : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
+	editId  : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
 	title   : { type: String, default: '' },
 	text    : { type: String, default: '' },
 	textBin : { type: Buffer },
@@ -24,7 +24,6 @@ const HomebrewSchema = mongoose.Schema({
 }, { versionKey: false });


-
 HomebrewSchema.methods.sanatize = function(full=false){
 	const brew = this.toJSON();
 	delete brew._id;
@@ -35,20 +34,19 @@ HomebrewSchema.methods.sanatize = function(full=false){
 	return brew;
 };

-
-HomebrewSchema.methods.increaseView = function(){
-	return new Promise((resolve, reject)=>{
-		this.lastViewed = new Date();
-		this.views = this.views + 1;
-		this.save((err)=>{
-			if(err) return reject(err);
-			return resolve(this);
-		});
+HomebrewSchema.methods.increaseView = async function(){
+	this.lastViewed = new Date();
+	this.views = this.views + 1;
+	const text = this.text;
+	this.text = undefined;
+	await this.save()
+	.catch((err)=>{
+		return err;
 	});
+	this.text = text;
+	return this;
 };

-
-
 HomebrewSchema.statics.get = function(query){
 	return new Promise((resolve, reject)=>{
 		Homebrew.find(query, (err, brews)=>{
@@ -77,11 +75,9 @@ HomebrewSchema.statics.getByUser = function(username, allowAccess=false){
 	});
 };

-
-
 const Homebrew = mongoose.model('Homebrew', HomebrewSchema);

 module.exports = {
 	schema : HomebrewSchema,
 	model  : Homebrew,
-};
+};
--- a/server/token.js
+++ b/server/token.js
@@ -0,0 +1,33 @@
+const jwt = require('jwt-simple');
+
+// Load configuration values
+const config = require('nconf')
+	.argv()
+	.env({ lowerCase: true })	// Load environment variables
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('defaults', { file: 'config/default.json' });
+
+// Generate an Access Token for the given User ID
+const generateAccessToken = (account)=>{
+	const payload = account;
+
+	// When the token was issued
+	payload.issued = (new Date());
+	// Which service issued the Token
+	payload.issuer = config.get('authentication_token_issuer');
+	// Which service is the token intended for
+	payload.audience = config.get('authentication_token_audience');
+	// The signing key for signing the token
+	delete payload.password;
+	delete payload._id;
+
+	const secret = config.get('authentication_token_secret');
+
+	const token = jwt.encode(payload, secret);
+
+	return token;
+};
+
+module.exports = {
+	generateAccessToken : generateAccessToken
+};
--- a/shared/homebrewery/renderWarnings/renderWarnings.jsx
+++ b/shared/homebrewery/renderWarnings/renderWarnings.jsx
@@ -1,4 +1,4 @@
-
+require('./renderWarnings.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
@@ -25,10 +25,10 @@ const RenderWarnings = createClass({
 			if(!isChrome){
 				return <li key='chrome'>
 					<em>Built for Chrome </em> <br />
-					Other browsers do not support &nbsp;
-					<a target='_blank' href='https://developer.mozilla.org/en-US/docs/Web/CSS/column-span#Browser_compatibility'>
-						key features
-					</a> this site uses.
+					Other browsers have not been tested for compatiblilty. If you
+					experience issues with your document not rendering or printing
+					properly, please try using the latest version of Chrome before
+					submitting a bug report.
 				</li>;
 			}
 		},
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -1,3 +1,4 @@
+require('./codeEditor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
@@ -45,11 +46,19 @@ const CodeEditor = createClass({
 	makeBold : function() {
 		const selection = this.codeMirror.getSelection();
 		this.codeMirror.replaceSelection(`**${selection}**`, 'around');
+		if(selection.length === 0){
+			const cursor = this.codeMirror.getCursor();
+			this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
+		}
 	},

 	makeItalic : function() {
 		const selection = this.codeMirror.getSelection();
 		this.codeMirror.replaceSelection(`*${selection}*`, 'around');
+		if(selection.length === 0){
+			const cursor = this.codeMirror.getCursor();
+			this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
+		}
 	},

 	componentWillReceiveProps : function(nextProps){
--- a/shared/naturalcrit/markdown.js
+++ b/shared/naturalcrit/markdown.js
@@ -13,6 +13,76 @@ renderer.html = function (html) {
 	return html;
 };

+renderer.link = function (href, title, text) {
+	let self = false;
+	if(href[0] == '#') {
+		self = true;
+	}
+	href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
+
+	if(href === null) {
+		return text;
+	}
+	let out = `<a href="${escape(href)}"`;
+	if(title) {
+		out += ` title="${title}"`;
+	}
+	if(self) {
+		out += ' target="_self"';
+	}
+	out += `>${text}</a>`;
+	return out;
+};
+
+const nonWordAndColonTest = /[^\w:]/g;
+const cleanUrl = function (sanitize, base, href) {
+	if(sanitize) {
+		let prot;
+		try {
+			prot = decodeURIComponent(unescape(href))
+        .replace(nonWordAndColonTest, '')
+        .toLowerCase();
+		} catch (e) {
+			return null;
+		}
+		if(prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
+			return null;
+		}
+	}
+	try {
+		href = encodeURI(href).replace(/%25/g, '%');
+	} catch (e) {
+		return null;
+	}
+	return href;
+};
+
+const escapeTest = /[&<>"']/;
+const escapeReplace = /[&<>"']/g;
+const escapeTestNoEncode = /[<>"']|&(?!#?\w+;)/;
+const escapeReplaceNoEncode = /[<>"']|&(?!#?\w+;)/g;
+const escapeReplacements = {
+	'&'  : '&amp;',
+	'<'  : '&lt;',
+	'>'  : '&gt;',
+	'"'  : '&quot;',
+	'\'' : '&#39;'
+};
+const getEscapeReplacement = (ch)=>escapeReplacements[ch];
+const escape = function (html, encode) {
+	if(encode) {
+		if(escapeTest.test(html)) {
+			return html.replace(escapeReplace, getEscapeReplacement);
+		}
+	} else {
+		if(escapeTestNoEncode.test(html)) {
+			return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+		}
+	}
+
+	return html;
+};
+
 const sanatizeScriptTags = (content)=>{
 	return content
 		.replace(/<script/ig, '&lt;script')
@@ -87,4 +157,3 @@ module.exports = {
 		return errors;
 	},
 };
-
--- a/shared/naturalcrit/nav/nav.jsx
+++ b/shared/naturalcrit/nav/nav.jsx
@@ -1,3 +1,4 @@
+require('./nav.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
@@ -70,4 +71,4 @@ const Nav = {
 };


-module.exports = Nav;
+module.exports = Nav;
--- a/shared/naturalcrit/nav/nav.less
+++ b/shared/naturalcrit/nav/nav.less
@@ -1,3 +1,4 @@
+//@import (less) 'naturalcrit/styles/style.fonts.css';
 nav{
 	background-color : #333;
 	.navContent{
@@ -77,4 +78,4 @@ nav{
 	.navSection:last-child .navItem{
 		border-left : 1px solid #666;
 	}
-}
+}
--- a/shared/naturalcrit/splitPane/splitPane.jsx
+++ b/shared/naturalcrit/splitPane/splitPane.jsx
@@ -1,3 +1,4 @@
+require('./splitPane.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
@@ -53,7 +54,7 @@ const SplitPane = createClass({
 	},
 */
 	renderDivider : function(){
-		return <div className='divider' onMouseDown={this.handleDown}>
+		return <div className='divider' onMouseDown={this.handleDown} >
 			<div className='dots'>
 				<i className='fa fa-circle' />
 				<i className='fa fa-circle' />
@@ -66,16 +67,11 @@ const SplitPane = createClass({
 		return <div className='splitPane' onMouseMove={this.handleMove} onMouseUp={this.handleUp}>
 			<Pane ref='pane1' width={this.state.size}>{this.props.children[0]}</Pane>
 			{this.renderDivider()}
-			<Pane ref='pane2'>{this.props.children[1]}</Pane>
+			<Pane ref='pane2' isDragging={this.state.isDragging}>{this.props.children[1]}</Pane>
 		</div>;
 	}
 });

-
-
-
-
-
 const Pane = createClass({
 	getDefaultProps : function() {
 		return {
@@ -89,12 +85,16 @@ const Pane = createClass({
 				flex  : 'none',
 				width : `${this.props.width}px`
 			};
+		} else {
+			styles = {
+				pointerEvents : this.props.isDragging ? 'none' : 'auto' //Disable mouse capture in the rightmost pane; dragging into the iframe drops the divider otherwise
+			};
 		}
+
 		return <div className={cx('pane', this.props.className)} style={styles}>
 			{this.props.children}
 		</div>;
 	}
 });

-
 module.exports = SplitPane;
--- a/shared/naturalcrit/splitPane/splitPane.less
+++ b/shared/naturalcrit/splitPane/splitPane.less
@@ -15,7 +15,7 @@
 		height           : 100%;
 		width            : 12px;
 		cursor           : ew-resize;
-		background-color : #ddd;
+		background-color : #bbb;
 		text-align       : center;
 		.dots{
 			display        : table-cell;
--- a/shared/naturalcrit/styles/core.less
+++ b/shared/naturalcrit/styles/core.less
@@ -5,12 +5,12 @@
@import 'naturalcrit/styles/colors.less';
@import 'naturalcrit/styles/tooltip.less';
@font-face {
-	font-family : CodeLight;
-	src         : url('/assets/naturalcrit/styles/CODE Light.otf');
+	font-family : 'CodeLight';
+	src         : data-uri('naturalcrit/styles/CODE Light.otf') format('opentype');
 }
@font-face {
-	font-family : CodeBold;
-	src         : url('/assets/naturalcrit/styles/CODE Bold.otf');
+	font-family : 'CodeBold';
+	src         : data-uri('naturalcrit/styles/CODE Bold.otf') format('opentype');
 }
 html,body, #reactRoot{
 	height      : 100vh;
@@ -47,4 +47,4 @@ button{
 	&:disabled{
 		background-color : @silver !important;
 	}
-}
+}