diff --git a/manuscript/recipies/cryptominer/exchange.md b/manuscript/recipies/cryptominer/exchange.md
index be6ae9f..787e3b3 100644
--- a/manuscript/recipies/cryptominer/exchange.md
+++ b/manuscript/recipies/cryptominer/exchange.md
@@ -2,3 +2,4 @@
 
 * [cryptopia](https://www.cryptopia.co.nz/Register?referrer=funkypenguin)
 * [Binance](https://www.binance.com/?ref=15312815)
+* [Coinbase](https://www.coinbase.com/join/5a4d1ed0ee3de40195a695c8)
diff --git a/manuscript/recipies/cryptominer/minerhotel.md b/manuscript/recipies/cryptominer/minerhotel.md
index 546778b..f717676 100644
--- a/manuscript/recipies/cryptominer/minerhotel.md
+++ b/manuscript/recipies/cryptominer/minerhotel.md
@@ -1 +1,63 @@
 # Minerhotel
+
+!!! warning
+    This is not a complete recipe - it's a component of the [cryptominer](/recipies/cryptominer/) "_uber-recipe_", but has been split into its own page to reduce complexity.
+
+So, you have GPUs. You can mine cryptocurrency. But **what** cryptocurrency should you mine?
+
+1. You could manually keep track of [whattomine](http://whattomine.com/), and launch/stop miners based on profitability/convenience, as you see fit.
+2. You can automate the process of mining the most profitable coin based on your GPUs' capabilities and the current market prices, and do better things with your free time! (_[receiving alerts](/recipies/crytominer/monitor/), of course, if anything stops working!_)
+
+This recipe covers option #2 :)
+
+[Miner hotel](http://minerhotel.com/) is a collection of scripts and config files to fully automate your mining across AMD or Nvidia cards.
+
+
+## Ingredients
+
+* [Latest Minerhotel release](http://minerhotel.com/download.html) for Linux
+
+## Preparation
+
+### Unpack Minerhotel
+
+Unpack the minerhotel release. You can technically unpack it anywhere, but this guide, and all pre-configured miners, expect an installation at /opt/minerhotel.
+
+### Prepare miner.config
+
+Copy /opt/minerhotel/miner.config.example to /opt/minerhotel/miner.config, and start making changes. Here's a rundown of the variables:
+
+* **WALLET<WHATEVER\>** : Set these WALLET variables to your wallet addresses for all the currencies you want to mine. Your miner will fail to start without the wallet variable, but it won't confirm it's a **valid** wallet. **Now, double-check to confirm the wallet is correct, and you're not just mining coins to /dev/null, or someone else's wallet!** You can either use your [exchange](/recipes/cryptominer/exchange/) wallet address or your own [wallet](/recipes/cryptominer/wallet/).
+* **WORKER** : Set this to the name you'll use to define your miner in the various pools you mine. Some pools (_i.e. NiceHash_) auto-create workers based on whatever worked name you specify, whereas others (_Supernova.cc_) will refuse to authenticate you unless you've manually created the worker/password in their UI first.
+* **SUPRUSER** : Set this to your supernova.cc login username (**not** your worker name) (_optional, only use this if you want to use supernova.cc_)
+* **SUPRPASS** : Set this to the password you've configured within Supernova.cc for your **worker** as defined by the WORKER variable. Note that this require syou to use the **same** worker name and password across all your supernova.cc pools (_optional, only necessary if you want to use supernova.cc_)
+* **MPHUSER** : Set this to your miningpoolhub login username (_optional, only necessary if you want to use [miningpoolhub.com](https://miningpoolhub.com/)_)
+* **TBFUSER** : Set this to your theblocksfactory login username (_optional, only necessary if you want to use t[heblocksfactory.com](https://theblocksfactory.com/)_)
+* **VERTPOOLUSER/VERTPOOLPASS** : Set these to your vertpool user/password (_optional, only necessary if you want to use [vertpool.org](http://vertpool.org/)_)
+
+### Install services
+
+1. Run ```/opt/minerhotel/scripts/install-services.sh``` to install the necessary services for systemd
+2. Run ```/opt/minerhotel/scripts/fixmods.sh``` to correctly set the filesystem permissions for the various miner executables
+
+!!! note
+    fixmods.sh doesn't correctly set permissions on subdirectories, so until this is fixed, you also need to run ```chmod 755 /opt/minerhotel/bin/claymore/ethdcrminer64```
+
+### Setup whattomine-linux
+
+For the whattomine bot to select the most profitable coin to mine for **your** GPUs, you'll need to feed your cookie from https://whattomine.com
+
+1. Start by installing [this](https://chrome.google.com/webstore/detail/cookie-inspector/jgbbilmfbammlbbhmmgaagdkbkepnijn) addon for Chrome, or [this](https://addons.mozilla.org/en-US/firefox/addon/firecookie/) addon for firefox
+2. Then visit http://whattomine.com/ and tweak settings for you GPUs, power costs, etc.
+3. Grab the cookie per the whattomine [README](http://git.minerhotel.com:3000/minerhotel/minerhotel/src/master/whattomine/README.md), and paste it (_about 2200 characters_) into /opt/minerhotel/whattomine/config.json
+4. Ensure that only the coins/miners that you **want** are enabled in config.json - delete the others, or put a dash ("-") after the ones you want to disable. Set the service names as defined in /opt/minerhotel/services/
+
+### Test miners
+
+Before trusting the whattomine service to launch your miners, test each one first by starting them manually, and then checking their status.
+
+For example, to test the **miner-amd-eth-ethhash-ethermine** miner, run
+
+1. ```systemctl start miner-amd-eth-ethhash-ethermine.service``` to start the service
+2. And then watch the output by running ```journalctl -u miner-amd-eth-ethhash-ethermine -f```
+3. When you're satisfied it's working correctly (_without errors and with a decent hashrate_), stop the miner again by running ```systemctl stop miner-amd-eth-ethhash-ethermine```, and move onto testing the next one.
diff --git a/manuscript/recipies/cryptominer/monitor.md b/manuscript/recipies/cryptominer/monitor.md
index 1aab995..4c8d2c5 100644
--- a/manuscript/recipies/cryptominer/monitor.md
+++ b/manuscript/recipies/cryptominer/monitor.md
@@ -1,5 +1,6 @@
 # Monitor
 
+<<<<<<< Updated upstream
 !!! warning
     This is not a complete recipe - it's a component of the [cryptominer](/recipies/cryptominer/) "_uber-recipe_", but has been split into its own page to reduce complexity.
 
@@ -81,3 +82,40 @@ Now, continue to the next stage of your grand mining adventure:
 Did you receive excellent service? Want to make your waiter happy? (_..and support development of current and future recipes!_) See the [support](/support/) page for (_free or paid)_ ways to say thank you! 👏
 
 ### Your comments? 💬
+=======
+![Monitor Screenshot](../../images/cryptominer_monitor.png)
+
+## Monitor your GPUs
+
+Your mining rig is working hard to make you money. Time is money, and any downtime delays your ROI. Non-working GPUs are therefore costing you money. It's important therefor to monitor and chart your GPUs performance.
+
+I wrote a [script](https://gist.github.com/funkypenguin/456f2b960b62409f1e977df695c62a23),
+ which I use with Icinga/Nagios, to alert me if any of my GPUs are misbehaving.
+
+!!! tip
+        I share (_with my [patreon patrons](https://www.patreon.com/funkypenguin)_) a private "_premix_" git repository, which includes up-to-date copies of all supporting scripts and tools I produce, meaning patrons just run a "git pull" and they're ready to go! 👍
+
+I use NRPE to execute the GPU-testing script, from my Icinga host (_hopefully a future recipe will cover Icinga_), with a config something like this:
+
+```
+# monitor_gpu
+dont_blame_nrpe=1
+command[check_gpu]=/usr/bin/sudo /opt/minerhotel/scripts/monitor-gpu.sh $ARG1$ $ARG2$
+```
+
+And the following to sudoers:
+
+```
+nrpe ALL= NOPASSWD: /opt/minerhotel/scripts/monitor-gpu.sh *
+```
+
+## Monitor your empire
+
+So you're mining coins. How do you know how much profit you're making? How do you track your portfolio?
+
+Here are some (affiliate) links:
+
+* [altpocket](https://altpocket.io/?ref=ilVqdeWbAv): A WebUI to track your portfolio, syncs with Bitfinex
+* [cointracking](https://cointracking.info?ref=F560640): The standard in serious crypto-investment tracking.
+* [More options](https://www.cryptostache.com/2017/11/10/keeping-track-cryptocurrency-portfolio-best-apps-2017/)
+>>>>>>> Stashed changes
diff --git a/manuscript/recipies/cryptominer/nvidia-gpu.md b/manuscript/recipies/cryptominer/nvidia-gpu.md
index d895dd6..2f86f04 100644
--- a/manuscript/recipies/cryptominer/nvidia-gpu.md
+++ b/manuscript/recipies/cryptominer/nvidia-gpu.md
@@ -1,5 +1,8 @@
 # NVidia GPU
 
+!!! warning
+    This is not a complete recipe - it's a component of the [cryptominer](/recipies/cryptominer/) "_uber-recipe_", but has been split into its own page to reduce complexity.
+
 ## Ingredients
 
 1. [Nvidia drivers](http://www.nvidia.com/Download/driverResults.aspx/104284/en-us) for your GPU