diff --git a/firebase-rules.json b/firebase-rules.json
index 12445aeb..9836a25f 100644
--- a/firebase-rules.json
+++ b/firebase-rules.json
@@ -3,7 +3,179 @@
 		"campaigns": {
 			"$uid": {
 				".write": "$uid === auth.uid || root.child('users').child(auth.uid).child('admin').exists()",
-				".indexOn": "private"
+				".indexOn": "private",
+				"$campaignId": {
+					".validate": "newData.hasChildren(['name'])",
+					"timestamp": {
+						".validate": "newData.isNumber()"
+					},
+					"harmless_key": {
+						".validate": "newData.isString() && newData.val().length <= 100"
+					},
+					"name": {
+						".validate": "newData.isString() && newData.val().length <= 200"
+					},
+					"advancement": {
+						".validate": true
+					},
+					"private": {
+						".validate": "newData.isBoolean()"
+					},
+					"background": {
+						".validate": "newData.isString() && newData.val().length <= 2000"
+					},
+					"hk_background": {
+						".validate": "newData.isString() && newData.val().length <= 2000"
+					},
+					"inventory": {
+						"currency": {
+							".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 4294967295"
+						},
+						"items": { ".validate": true }
+					},
+					"temporary_background": {
+						"image": { ".validate": "newData.isString() && newData.val().length <= 2000" },
+						"youtube": { ".validate": "newData.isString() && newData.val().length <= 2000" },
+						"video": { ".validate": "newData.isString() && newData.val().length <= 2000" }
+					},
+					"sharing": {
+						"image": { ".validate": "newData.isString() && newData.val().length <= 2000" },
+						"youtube": { ".validate": "newData.isString() && newData.val().length <= 2000" },
+						"message": { ".validate": "newData.isString() && newData.val().length <= 9999" }
+					},
+					"weather": {
+						"$idx": {
+							".validate": "$idx.matches(/^(ash|fog|hail|lightning|quake|rain|sand|smoke|snow)$/)"
+						}
+					},
+					"companions": {
+						"$companionId": {
+							"curHp": {
+								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+							},
+							"tempHp": {
+								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+							},
+							"ac_bonus": {
+								".validate": "newData.isNumber() && newData.val() >= -999 && newData.val() <= 999"
+							},
+							"maxHpMod": {
+								".validate": "newData.isNumber() && newData.val() >= -9999 && newData.val() <= 9999"
+							},
+							"saves": {
+								"$idx": {
+									".validate": "newData.isString() && newData.val().matches(/^(succes|fail)$/)"
+								}
+							},
+							"dead": { ".validate": "newData.isBoolean()" },
+							"stable": { ".validate": "newData.isBoolean()" },
+							"meters": {
+								"damage": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"damageTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overkill": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overkillTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"healing": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"healingTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overhealing": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overhealingTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								}
+							},
+							"transformed": {
+								"curHp": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								},
+								"maxHp": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								},
+								"ac": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								}
+							},
+							"$other": { ".validate": false }
+						}
+					},
+					"players": {
+						"$playerId": {
+							"curHp": {
+								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+							},
+							"tempHp": {
+								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+							},
+							"ac_bonus": {
+								".validate": "newData.isNumber() && newData.val() >= -999 && newData.val() <= 999"
+							},
+							"maxHpMod": {
+								".validate": "newData.isNumber() && newData.val() >= -9999 && newData.val() <= 9999"
+							},
+							"saves": {
+								"$idx": {
+									".validate": "newData.isString() && newData.val().matches(/^(succes|fail)$/)"
+								}
+							},
+							"dead": { ".validate": "newData.isBoolean()" },
+							"stable": { ".validate": "newData.isBoolean()" },
+							"meters": {
+								"damage": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"damageTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overkill": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overkillTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"healing": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"healingTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overhealing": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								},
+								"overhealingTaken": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+								}
+							},
+							"transformed": {
+								"curHp": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								},
+								"maxHp": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								},
+								"ac": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								}
+							},
+							"$other": { ".validate": false }
+						}
+					},
+					"player_count": {
+						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
+					},
+					"shares": { ".validate": true },
+					"$other": { ".validate": false }
+				}
 			},
 			".read": true
 		},
@@ -16,6 +188,26 @@
 				}
 			}
 		},
+		"campaign_notes": {
+			"$uid": {
+				"$campaignId": {
+					"$noteId": {
+						"title": {
+							".validate": "newData.isString() && newData.val().length <= 100"
+						},
+						"description": {
+							".validate": "newData.isString() && newData.val().length <= 1000"
+						},
+						"created": {
+							".validate": "newData.isNumber()"
+						}
+					},
+					".indexOn": ["created"]
+				},
+				".read": "$uid === auth.uid",
+				".write": "$uid === auth.uid"
+			}
+		},
 		"users": {
 			"$uid": {
 				"username": {
@@ -1160,9 +1352,218 @@
 				"$campaignId": {
 					".indexOn": "entities/id",
 					"$encounterId": {
+						"timestamp": {
+							".validate": "newData.isNumber()"
+						},
+						"name": {
+							".validate": "newData.isString() && newData.val().length <= 200"
+						},
+						"encounter": {
+							".validate": "newData.isString() && newData.val().length <= 200"
+						},
+						"turn": {
+							".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
+						},
+						"round": {
+							".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
+						},
+						"finished": {
+							".validate": "newData.isBoolean()"
+						},
+						"audio": {
+							".validate": "newData.isString() && newData.val().length <= 2000"
+						},
+						"background": {
+							".validate": "newData.isString() && newData.val().length <= 2000"
+						},
+						"hk_background": {
+							".validate": "newData.isString() && newData.val().length <= 2000"
+						},
+						"currency": {
+							"$coin": {
+								".validate": "$coin.matches(/^(cp|sp|ep|gp|pp)$/)"
+							}
+						},
+						"loot": {
+							"$itemId": {
+								"linked_item": {
+									"custom": {
+										".validate": "newData.isBoolean()"
+									},
+									"key": {
+										".validate": "newData.isString() && newData.val().length <= 100"
+									}
+								},
+								"public_name": {
+									".validate": "newData.isString() && newData.val().length <= 100"
+								},
+								"public_description": {
+									".validate": "newData.isString() && newData.val().length <= 9999"
+								}
+							}
+						},
+						"xp": {
+							"calculated": {
+								".validate": "newData.isNumber() && newData.val() >= 0"
+							},
+							"overwrite": {
+								".validate": "newData.isString() || newData.isNumber()"
+							}
+						},
+						"weather": {
+							"$idx": {
+								".validate": "$idx.matches(/^(ash|fog|hail|lightning|quake|rain|sand|smoke|snow)$/)"
+							}
+						},
+						"entities": {
+							"$entityId": {
+								"id": {
+									".validate": "newData.isString() && newData.val().length <= 100"
+								},
+								"key": {
+									".validate": "newData.isString() && newData.val().length <= 100"
+								},
+								"entityType": {
+									".validate": "newData.isString() && newData.val().matches(/^(player|npc|companion)$/)"
+								},
+								"npc": {
+									".validate": "newData.isString() && newData.val().matches(/^(srd|custom|api)$/)"
+								},
+								"name": {
+									".validate": "newData.isString() && newData.val().length <= 200"
+								},
+								"active": {
+									".validate": "newData.isBoolean()"
+								},
+								"hidden": {
+									".validate": "newData.isBoolean()"
+								},
+								"initiative": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								},
+								"ac": {
+									".validate": "(newData.isNumber() && newData.val() >= 1 && newData.val() <= 9999) || (newData.isString() && newData.val().length <= 10)"
+								},
+								"ac_bonus": {
+									".validate": "newData.isNumber() && newData.val() >= -999 && newData.val() <= 9999"
+								},
+								"curHp": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								},
+								"maxHp": {
+									".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9999"
+								},
+								"maxHpMod": {
+									".validate": "newData.isNumber() && newData.val() >= -9999 && newData.val() <= 9999"
+								},
+								"tempHp": {
+									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
+								},
+								"color_label": {
+									".validate": "newData.isString() && newData.val().length <= 10"
+								},
+								"conditions": {
+									"exhaustion": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 6"
+									},
+									"$condition": {
+										".validate": "newData.isBoolean() && $condition.matches(/^(blinded|charmed|deafened|exhaustion|frightened|grappled|incapacitated|invisible|paralyzed|petrified|poisoned|prone|restrained|stunned|unconscious)$/)"
+									}
+								},
+								"reminders": {
+									"$remindId": {
+										"action": {
+											".validate": "newData.isString() && newData.val().matches(/^(remove|notify)$/)"
+										},
+										"color": {
+											".validate": "newData.isString() && newData.val().matches(/^(green-light|yellow-light|orange-light|red-light|purple|blue-light)$/)"
+										},
+										"trigger": {
+											".validate": "newData.isString() && newData.val().matches(/^(endTurn|startTurn|damage|timed)$/)"
+										},
+										"rounds": {
+											".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
+										},
+										"title": {
+											".validate": "newData.isString() && newData.val().length <= 999"
+										},
+										"notify": {
+											".validate": "newData.isString() && newData.val().length <= 999"
+										},
+										"variables": {
+											"$varName": {
+												"$vi": {
+													".validate": "newData.isString() && newData.val().length <= 5"
+												}
+											}
+										}
+									}
+								},
+								"settings": {
+									"ac": {
+										".validate": "newData.isBoolean()"
+									},
+									"health": {
+										".validate": "newData.isBoolean() || newData.val().matches(/^(obscured)$/)"
+									},
+									"name": {
+										".validate": "newData.isBoolean()"
+									}
+								},
+								"meters": {
+									"damage": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									},
+									"damageTaken": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									},
+									"overkill": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									},
+									"overkillTaken": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									},
+									"healing": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									},
+									"healingTaken": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									},
+									"overhealing": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									},
+									"overhealingTaken": {
+										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
+									}
+								},
+								"limited_uses": {
+									"caster": {
+										"$lvl": {
+											".validate": "newData.isNumber() && newData.val() <= 100"
+										}
+									},
+									"innate": {
+										"$spellId": {
+											".validate": "newData.isNumber() && newData.val() <= 100"
+										}
+									},
+									"actions": {
+										"$actionId": {
+											".validate": "newData.isNumber() && newData.val() <= 100"
+										}
+									},
+									"legendary_actions": {
+										"legendaries_used": {
+											".validate": "newData.isNumber() && newData.val() <= 100"
+										}
+									}
+								}
+							}
+						},
 						"requests": {
 							".write": true
-						}
+						},
+						"$other": { ".validate": false }
 					}
 				}
 			},
@@ -1444,6 +1845,29 @@
 				".read": "$uid === auth.uid",
 				".write": "$uid === auth.uid"
 			}
+		},
+		"soundboard": {
+			"$uid": {
+				"$soundboardId": {
+					".validate": "newData.hasChildren(['type', 'name', 'url'])",
+					"type": {
+						".validate": "newData.isString() && newData.val().matches(/^(music|ambience)$/)"
+					},
+					"name": {
+						".validate": "newData.isString() && newData.val().length <= 20"
+					},
+					"url": {
+						".validate": "newData.isString() && newData.val().length <= 2000"
+					},
+					"image": {
+						".validate": "newData.isString() && newData.val().length <= 2000"
+					},
+					"$other": { ".validate": false }
+				},
+				".indexOn": ["type"],
+				".read": "$uid === auth.uid",
+				".write": "$uid === auth.uid"
+			}
 		}
 	}
 }
diff --git a/src/components/ReminderForm.vue b/src/components/ReminderForm.vue
index 3d75fb86..9b6a3bb0 100644
--- a/src/components/ReminderForm.vue
+++ b/src/components/ReminderForm.vue
@@ -1,16 +1,18 @@
 <template>
 	<div>
-		<ValidationProvider 
-			name="Title" 
+		<ValidationProvider
+			name="Title"
 			:rules="{
 				required: true,
 				max: 30,
-				variable_check: [reminder.variables]
-			}" 
+				variable_check: [reminder.variables],
+			}"
 			v-slot="{ errors, invalid, validated }"
 		>
-			<q-input 
-				:dark="$store.getters.theme === 'dark'" filled square
+			<q-input
+				:dark="$store.getters.theme === 'dark'"
+				filled
+				square
 				label="Title"
 				type="text"
 				autocomplete="off"
@@ -22,19 +24,29 @@
 		</ValidationProvider>
 
 		<div class="colors d-flex justify-content-between my-3">
-			<a v-for="(color, index) in colors" :key="index" class="color" :class="'bg-'+color" @click="setColor(color)">
-				<span v-show="color == reminder.color"><i aria-hidden="true" class="fas fa-check"></i></span>
+			<a
+				v-for="(color, index) in colors"
+				:key="index"
+				class="color"
+				:class="'bg-' + color"
+				@click="setColor(color)"
+			>
+				<span v-show="color == reminder.color"
+					><i aria-hidden="true" class="fas fa-check"></i
+				></span>
 			</a>
 		</div>
 
 		<ValidationProvider name="Trigger" rules="required" v-slot="{ errors, invalid, validated }">
-			<q-select 
-				:dark="$store.getters.theme === 'dark'" filled square
+			<q-select
+				:dark="$store.getters.theme === 'dark'"
+				filled
+				square
 				map-options
 				emit-value
 				label="Trigger"
 				:options="triggers"
-				type="text" 
+				type="text"
 				v-model="reminder.trigger"
 				:error="invalid && validated"
 				:error-message="errors[0]"
@@ -42,12 +54,18 @@
 		</ValidationProvider>
 
 		<div v-if="reminder.trigger === 'timed'" class="my-2">
-			<ValidationProvider name="Rounds" rules="required|max_value:99" v-slot="{ errors, invalid, validated }">
-				<q-input 
-					:dark="$store.getters.theme === 'dark'" filled square
+			<ValidationProvider
+				name="Rounds"
+				rules="required|max_value:99"
+				v-slot="{ errors, invalid, validated }"
+			>
+				<q-input
+					:dark="$store.getters.theme === 'dark'"
+					filled
+					square
 					label="Rounds"
-					type="number" 
-					v-model="reminder.rounds"
+					type="number"
+					v-model.number="reminder.rounds"
 					min="1"
 					max="99"
 					hint="One round is 6 seconds"
@@ -61,9 +79,9 @@
 			<q-field
 				:dark="$store.getters.theme === 'dark'"
 				:hint="
-					reminder.action == 'notify' 
-					? 'You\'ll get the option to keep or remove the reminder.'
-					: 'Reminder will be removed, but you\'ll still be notified'
+					reminder.action == 'notify'
+						? 'You\'ll get the option to keep or remove the reminder.'
+						: 'Reminder will be removed, but you\'ll still be notified'
 				"
 			>
 				<q-option-group
@@ -74,20 +92,22 @@
 					v-model="reminder.action"
 				/>
 			</q-field>
-			
-			<ValidationProvider 
-				name="Notification" 
+
+			<ValidationProvider
+				name="Notification"
 				:rules="{
 					max: 999,
-					variable_check: [reminder.variables]
-				}" 
+					variable_check: [reminder.variables],
+				}"
 				v-slot="{ errors, invalid, validated }"
 			>
-				<q-input 
-					:dark="$store.getters.theme === 'dark'" filled square
+				<q-input
+					:dark="$store.getters.theme === 'dark'"
+					filled
+					square
 					label="Notification"
 					class="mt-3"
-					name="notification" 
+					name="notification"
 					maxLength="999"
 					v-model="reminder.notify"
 					autogrow
@@ -100,29 +120,40 @@
 		<!-- VARIABLES -->
 		<div class="mb-3" v-if="variables">
 			<label>
-				Variables 
+				Variables
 				<hk-popover header="Reminder variable" :content="variableInfo">
 					<q-icon name="info" size="xs" class="blue" />
 				</hk-popover>
 			</label>
 			<div class="mb-3">
-				<ValidationProvider name="Variable" rules="alpha_dash" v-slot="{ errors, invalid, validated }">
-					<q-input 
-						:dark="$store.getters.theme === 'dark'" filled square
+				<ValidationProvider
+					name="Variable"
+					rules="alpha_dash"
+					v-slot="{ errors, invalid, validated }"
+				>
+					<q-input
+						:dark="$store.getters.theme === 'dark'"
+						filled
+						square
 						label="New variable name"
 						name="var_name"
-						type="text" 
-						autocomplete="off" 
+						type="text"
+						autocomplete="off"
 						v-model="newVar"
 						placeholder="New Variable name"
 						:error="invalid && validated"
 						:error-message="errors[0]"
 					>
-						<a 
-							slot="after" 
-							class="btn bg-neutral-5" 
-							@click="addVariable()" 
-							:class="{ disabled: !newVar || errors[0] || (reminder.variables && Object.keys(reminder.variables).includes(newVar)) }"
+						<a
+							slot="after"
+							class="btn bg-neutral-5"
+							@click="addVariable()"
+							:class="{
+								disabled:
+									!newVar ||
+									errors[0] ||
+									(reminder.variables && Object.keys(reminder.variables).includes(newVar)),
+							}"
 						>
 							<q-icon name="fas fa-plus" />
 						</a>
@@ -131,53 +162,74 @@
 			</div>
 
 			<div v-for="(variable, key) in reminder.variables" :key="`var-${key}`" class="var">
-
 				<div class="d-flex justify-content-between var-title">
 					<span>{{ key }}</span>
 					<div>
 						<a @click="removeVar(key)" class="btn btn-sm bg-neutral-5">
 							<i aria-hidden="true" class="fas fa-trash-alt"></i>
-							<q-tooltip anchor="top middle" self="bottom middle">
-								Remove variable
-							</q-tooltip>
+							<q-tooltip anchor="top middle" self="bottom middle"> Remove variable </q-tooltip>
 						</a>
 						<a @click="addOption(key)" class="btn btn-sm bg-neutral-5 ml-2">
 							<i aria-hidden="true" class="fas fa-plus"></i>
-							<q-tooltip anchor="top middle" self="bottom middle">
-								Add option
-							</q-tooltip>
+							<q-tooltip anchor="top middle" self="bottom middle"> Add option </q-tooltip>
 						</a>
 					</div>
 				</div>
 
 				<!-- Options -->
 				<div v-for="(option, i) in variable" :key="`${key}-option-${i}`" class="option">
-					<ValidationProvider name="Option" rules="required|max:30" v-slot="{ errors, invalid, validated }">
-						<q-input 
-							:dark="$store.getters.theme === 'dark'" filled square
-							:label="`Option ${i+1}`"
-							:disable="selectOptions && reminder.selectedVars && reminder.selectedVars[key] === reminder.variables[key][i]"
-							type="text" 
-							autocomplete="off" 
+					<ValidationProvider
+						name="Option"
+						rules="required|max:30"
+						v-slot="{ errors, invalid, validated }"
+					>
+						<q-input
+							:dark="$store.getters.theme === 'dark'"
+							filled
+							square
+							:label="`Option ${i + 1}`"
+							:disable="
+								selectOptions &&
+								reminder.selectedVars &&
+								reminder.selectedVars[key] === reminder.variables[key][i]
+							"
+							type="text"
+							autocomplete="off"
 							v-model="reminder.variables[key][i]"
 							maxLength="30"
 							:error="invalid && validated"
 							:error-message="errors[0]"
 						>
 							<div slot="before" v-if="selectOptions">
-								<button class="btn btn-sm bg-neutral-4" @click="setOption(key, reminder.variables[key][i])">
-									<i aria-hidden="true" class="fas fa-check" :class="{ green: reminder.selectedVars && reminder.selectedVars[key] === reminder.variables[key][i] }"></i>
+								<button
+									class="btn btn-sm bg-neutral-4"
+									@click="setOption(key, reminder.variables[key][i])"
+								>
+									<i
+										aria-hidden="true"
+										class="fas fa-check"
+										:class="{
+											green:
+												reminder.selectedVars &&
+												reminder.selectedVars[key] === reminder.variables[key][i],
+										}"
+									></i>
 								</button>
 							</div>
 							<template slot="append">
-								<q-icon 
-									name="fas fa-trash-alt" 
-									class="red pointer" size="xs" 
-									@click="(selectOptions && reminder.selectedVars && reminder.selectedVars[key] === reminder.variables[key][i]) ? null : removeOption(key, i)"
+								<q-icon
+									name="fas fa-trash-alt"
+									class="red pointer"
+									size="xs"
+									@click="
+										selectOptions &&
+										reminder.selectedVars &&
+										reminder.selectedVars[key] === reminder.variables[key][i]
+											? null
+											: removeOption(key, i)
+									"
 								>
-									<q-tooltip anchor="top middle" self="center middle">
-										Remove option
-									</q-tooltip>
+									<q-tooltip anchor="top middle" self="center middle"> Remove option </q-tooltip>
 								</q-icon>
 							</template>
 						</q-input>
@@ -194,42 +246,36 @@ export default {
 	props: {
 		value: {
 			type: Object,
-			required: true
+			required: true,
 		},
 		variables: {
 			type: Boolean,
-			default: true
+			default: true,
 		},
 		selectOptions: {
 			type: Boolean,
-			default: false
-		}
+			default: false,
+		},
 	},
 	data() {
 		return {
 			triggers: [
-				{ value: 'startTurn', label: 'Start of own turn' },
-				{ value: 'endTurn', label: 'End of own turn' },
-				{ value: 'damage', label: 'On damage taken' },
-				{ value: 'timed', label: 'Timer' },
+				{ value: "startTurn", label: "Start of own turn" },
+				{ value: "endTurn", label: "End of own turn" },
+				{ value: "damage", label: "On damage taken" },
+				{ value: "timed", label: "Timer" },
 			],
 			actions: [
-				{ label: 'Notify on trigger', value: 'notify' },
-				{ label: 'Remove on trigger', value: 'remove' }
+				{ label: "Notify on trigger", value: "notify" },
+				{ label: "Remove on trigger", value: "remove" },
 			],
-			colors: [
-				'green-light',
-				'yellow-light',
-				'orange-light',
-				'red-light',
-				'purple',
-				'blue-light',
-			],
-			variableInfo: "Variables are options for your description that you choose when the reminder is applied. " + 
+			colors: ["green-light", "yellow-light", "orange-light", "red-light", "purple", "blue-light"],
+			variableInfo:
+				"Variables are options for your description that you choose when the reminder is applied. " +
 				"To use a variable in your description add it's name between brackets, like this: [your_variable_name]. " +
 				"Variables can also be used in the title.",
-			newVar: undefined
-		}
+			newVar: undefined,
+		};
 	},
 	computed: {
 		reminder: {
@@ -237,25 +283,25 @@ export default {
 				return this.value;
 			},
 			set(newValue) {
-				this.$emit('input', newValue);
-			}
-		}
+				this.$emit("input", newValue);
+			},
+		},
 	},
 	mounted() {
-		if(Object.keys(this.value).length === 0) {
+		if (Object.keys(this.value).length === 0) {
 			//Set default values
-			this.$set(this.reminder, 'color', 'green-light');
-			this.$set(this.reminder, 'action', 'remove');
+			this.$set(this.reminder, "color", "green-light");
+			this.$set(this.reminder, "action", "remove");
 		}
 	},
 	methods: {
 		setColor(color) {
-			this.$set(this.reminder, 'color', color);
+			this.$set(this.reminder, "color", color);
 		},
 		addVariable() {
-			if(this.newVar) {
-				if(!this.reminder.variables) {
-					this.$set(this.reminder, 'variables', {});
+			if (this.newVar) {
+				if (!this.reminder.variables) {
+					this.$set(this.reminder, "variables", {});
 				}
 				this.$set(this.reminder.variables, this.newVar, [""]);
 				this.newVar = undefined;
@@ -274,52 +320,52 @@ export default {
 			this.$delete(this.reminder.variables, key);
 
 			// if the reminder is in use, the selection must be deleted too
-			if(this.reminder.selectedVars) {
+			if (this.reminder.selectedVars) {
 				this.$delete(this.reminder.selectedVars, key);
 			}
 
 			this.$forceUpdate();
 		},
 		setOption(key, i) {
-			if(!this.reminder.selectedVars) {
+			if (!this.reminder.selectedVars) {
 				this.$set(this.reminder, "selectedVars", {});
 			}
 			this.reminder.selectedVars[key] = i;
 			this.$forceUpdate();
-		}
-	}
-}
+		},
+	},
+};
 </script>
 
 <style scoped lang="scss">
-	.colors {
-		background-color: rgba(255, 255, 255, 0.07);
-		max-width: 250px;
-		padding: 5px;
+.colors {
+	background-color: rgba(255, 255, 255, 0.07);
+	max-width: 250px;
+	padding: 5px;
 
-		a.color {
-			display: inline-block;
-			width: 25px;
-			height: 25px;
-			padding: 2px 5px;
-			color:$neutral-1 !important;
-			margin-right: 5px;
+	a.color {
+		display: inline-block;
+		width: 25px;
+		height: 25px;
+		padding: 2px 5px;
+		color: $neutral-1 !important;
+		margin-right: 5px;
 
-			&:last-child {
-				margin-right: 0;
-			}
+		&:last-child {
+			margin-right: 0;
 		}
 	}
-	.var {		
-		margin-bottom: 15px;
+}
+.var {
+	margin-bottom: 15px;
 
-		.var-title {
-			border-bottom: solid 1px $neutral-4;
-			padding-bottom: 3px;
-			margin-bottom: 10px;
-		}
-		.option {
-			margin-bottom: 2px;
-		}
+	.var-title {
+		border-bottom: solid 1px $neutral-4;
+		padding-bottom: 3px;
+		margin-bottom: 10px;
+	}
+	.option {
+		margin-bottom: 2px;
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/src/components/compendium/Monster.vue b/src/components/compendium/Monster.vue
index 38a90b38..0ff8e774 100644
--- a/src/components/compendium/Monster.vue
+++ b/src/components/compendium/Monster.vue
@@ -520,6 +520,9 @@ export default {
 	padding: 20px;
 	color: $black;
 	font-family: Helvetica, sans-serif, serif;
+	.hk-roll {
+		color: $black;
+	}
 
 	h2 {
 		color: #6e1d10;
diff --git a/src/components/slides/EditPlayer.vue b/src/components/slides/EditPlayer.vue
index adacb785..c4b5080f 100644
--- a/src/components/slides/EditPlayer.vue
+++ b/src/components/slides/EditPlayer.vue
@@ -7,14 +7,14 @@
 			<a @click="setTransform = !setTransform">
 				<i aria-hidden="true" v-if="setTransform" class="fas fa-times red"></i>
 				<i aria-hidden="true" v-else class="fas fa-paw-claws green"></i>
-				<q-tooltip anchor="top middle" self="center middle">
-					Transform
-				</q-tooltip>
+				<q-tooltip anchor="top middle" self="center middle"> Transform </q-tooltip>
 			</a>
 		</h2>
-		
-		<a v-if="entity.transformed" @click="removeTransform()" class="btn btn-block bg-red mb-3">Remove transformation</a>
-		
+
+		<a v-if="entity.transformed" @click="removeTransform()" class="btn btn-block bg-red mb-3"
+			>Remove transformation</a
+		>
+
 		<Transform :data="entityKey" @close="closeTransform" v-if="setTransform" />
 
 		<template v-else>
@@ -25,50 +25,69 @@
 						<template v-if="entity.saves && Object.keys(entity.saves).length === n">
 							<a v-show="entity.saves[n] === 'succes'" class="green" @click="set_save(null, n)">
 								<i aria-hidden="true" class="fas fa-check"></i>
-								<q-tooltip anchor="top middle" self="center middle">
-									Change
-								</q-tooltip>
+								<q-tooltip anchor="top middle" self="center middle"> Change </q-tooltip>
 							</a>
 							<a v-show="entity.saves[n] === 'fail'" class="red" @click="set_save(null, n)">
 								<i aria-hidden="true" class="fas fa-times"></i>
-								<q-tooltip anchor="top middle" self="center middle">
-									Change
-								</q-tooltip>
+								<q-tooltip anchor="top middle" self="center middle"> Change </q-tooltip>
 							</a>
 						</template>
 						<template v-else-if="entity.saves">
-							<span v-show="entity.saves[n] === 'succes'" class="green"><i aria-hidden="true" class="fas fa-check"></i></span>
-							<span v-show="entity.saves[n] === 'fail'" class="red"><i aria-hidden="true" class="fas fa-times"></i></span>
+							<span v-show="entity.saves[n] === 'succes'" class="green"
+								><i aria-hidden="true" class="fas fa-check"></i
+							></span>
+							<span v-show="entity.saves[n] === 'fail'" class="red"
+								><i aria-hidden="true" class="fas fa-times"></i
+							></span>
 						</template>
-						<span v-show="!entity.saves || !entity.saves[n]" class="neutral-2"><i aria-hidden="true" class="fas fa-dot-circle"></i></span>
+						<span v-show="!entity.saves || !entity.saves[n]" class="neutral-2"
+							><i aria-hidden="true" class="fas fa-dot-circle"></i
+						></span>
 					</div>
 				</div>
-				<div v-if="!entity.saves || Object.keys(entity.saves).length < 6" class="d-flex justify-content-between">
-					<button class="btn save bg-green" @click="set_save('succes', !entity.saves ? 0 : Object.keys(entity.saves).length)">
+				<div
+					v-if="!entity.saves || Object.keys(entity.saves).length < 6"
+					class="d-flex justify-content-between"
+				>
+					<button
+						class="btn save bg-green"
+						@click="set_save('succes', !entity.saves ? 0 : Object.keys(entity.saves).length)"
+					>
 						<i aria-hidden="true" class="fas fa-check"></i>
 					</button>
-					<button class="btn save bg-red" @click="set_save('fail', !entity.saves ? 0 : Object.keys(entity.saves).length)">
+					<button
+						class="btn save bg-red"
+						@click="set_save('fail', !entity.saves ? 0 : Object.keys(entity.saves).length)"
+					>
 						<i aria-hidden="true" class="fas fa-times"></i>
 					</button>
 				</div>
-				<a v-if="death_fails >= 3" class="btn btn-block bg-red my-3" @click="kill()"><i aria-hidden="true" class="fas fa-skull"></i> Player died</a>
-				<a class="btn btn-block my-3" @click="stabilize()"><i aria-hidden="true" class="fas fa-heartbeat"></i> Stabilize</a>
+				<a v-if="death_fails >= 3" class="btn btn-block bg-red my-3" @click="kill()"
+					><i aria-hidden="true" class="fas fa-skull"></i> Player died</a
+				>
+				<a class="btn btn-block my-3" @click="stabilize()"
+					><i aria-hidden="true" class="fas fa-heartbeat"></i> Stabilize</a
+				>
 			</template>
-			<a v-else-if="entity.dead" class="btn bg-green btn-block my-3" @click="revive()"><i aria-hidden="true" class="fas fa-hand-holding-magic"></i> Revive</a>
-			
-			<!-- EDIT PLAYER -->	
+			<a v-else-if="entity.dead" class="btn bg-green btn-block my-3" @click="revive()"
+				><i aria-hidden="true" class="fas fa-hand-holding-magic"></i> Revive</a
+			>
+
+			<!-- EDIT PLAYER -->
 			<ValidationObserver v-slot="{ handleSubmit }">
 				<q-form @submit="handleSubmit(edit)">
-					<ValidationProvider 
-						v-if="location == 'encounter'" 
-						rules="between:0,99|required" 
-						name="Initiative" 
+					<ValidationProvider
+						v-if="location == 'encounter'"
+						rules="between:0,99|required"
+						name="Initiative"
 						v-slot="{ errors, invalid, validated }"
 					>
-						<q-input 
-							:dark="$store.getters.theme === 'dark'" filled square
+						<q-input
+							:dark="$store.getters.theme === 'dark'"
+							filled
+							square
 							label="initiative"
-							type="number" 
+							type="number"
 							min="0"
 							max="99"
 							v-model="initiative"
@@ -81,12 +100,18 @@
 					<h2>Temporary</h2>
 					<div class="row q-col-gutter-md mb-2">
 						<div class="col">
-							<ValidationProvider rules="between:-99,99" name="AC" v-slot="{ errors, invalid, validated }">
-								<q-input 
-									:dark="$store.getters.theme === 'dark'" filled square
+							<ValidationProvider
+								rules="between:-99,99"
+								name="AC"
+								v-slot="{ errors, invalid, validated }"
+							>
+								<q-input
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="AC bonus"
-									type="number" 
-									name="ac_bonus" 
+									type="number"
+									name="ac_bonus"
 									v-model="entity.ac_bonus"
 									clearable
 									no-error-icon
@@ -97,12 +122,18 @@
 						</div>
 
 						<div class="col">
-							<ValidationProvider rules="between:0,999" name="Temp HP" v-slot="{ errors, invalid, validated }">
-								<q-input 
-									:dark="$store.getters.theme === 'dark'" filled square
+							<ValidationProvider
+								rules="between:0,999"
+								name="Temp HP"
+								v-slot="{ errors, invalid, validated }"
+							>
+								<q-input
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Temp HP"
-									type="number" 
-									name="tempHp" 
+									type="number"
+									name="tempHp"
 									v-model="entity.tempHp"
 									clearable
 									no-error-icon
@@ -113,12 +144,18 @@
 						</div>
 
 						<div class="col" v-if="!entity.transformed">
-							<ValidationProvider rules="between:-999,999" name="Max Hp mod" v-slot="{ errors, invalid, validated }">
-								<q-input 
-									:dark="$store.getters.theme === 'dark'" filled square
+							<ValidationProvider
+								rules="between:-999,999"
+								name="Max Hp mod"
+								v-slot="{ errors, invalid, validated }"
+							>
+								<q-input
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Max HP Mod"
-									type="number" 
-									name="maxHpMod" 
+									type="number"
+									name="maxHpMod"
 									v-model="maxHpMod"
 									clearable
 									no-error-icon
@@ -129,16 +166,22 @@
 						</div>
 					</div>
 
-					<hr>
+					<hr />
 					<h2 class="mb-0">Override</h2>
 					<div class="row q-col-gutter-md my-2">
 						<div class="col">
-							<ValidationProvider rules="min_value:0|required" name="Current HP" v-slot="{ errors, invalid, validated }">
-								<q-input 
+							<ValidationProvider
+								rules="min_value:0|required"
+								name="Current HP"
+								v-slot="{ errors, invalid, validated }"
+							>
+								<q-input
 									v-if="entity.transformed"
-									:dark="$store.getters.theme === 'dark'" filled square
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Cur HP"
-									type="number" 
+									type="number"
 									class="text-center"
 									min="0"
 									v-model="entity.transformed.curHp"
@@ -147,17 +190,17 @@
 									:error-message="errors[0]"
 								>
 									<q-icon slot="prepend" name="fas fa-paw-claws green">
-										<q-tooltip anchor="top middle" self="center middle">
-											Transformed
-										</q-tooltip>
+										<q-tooltip anchor="top middle" self="center middle"> Transformed </q-tooltip>
 									</q-icon>
 								</q-input>
-								<q-input 
+								<q-input
 									v-else
-									:dark="$store.getters.theme === 'dark'" filled square
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Cur HP"
 									class="text-center"
-									type="number" 
+									type="number"
 									min="0"
 									v-model="entity.curHp"
 									:error="invalid && validated"
@@ -167,13 +210,19 @@
 						</div>
 
 						<div class="col">
-							<ValidationProvider rules="between:1,9999|required" name="Max HP" v-slot="{ errors, invalid, validated }">
-								<q-input 	
+							<ValidationProvider
+								rules="between:1,9999|required"
+								name="Max HP"
+								v-slot="{ errors, invalid, validated }"
+							>
+								<q-input
 									v-if="entity.transformed"
-									:dark="$store.getters.theme === 'dark'" filled square
-									label="Max HP"	
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
+									label="Max HP"
 									class="text-center"
-									type="number" 
+									type="number"
 									min="1"
 									max="9999"
 									v-model="entity.transformed.maxHp"
@@ -181,17 +230,17 @@
 									:error-message="errors[0]"
 								>
 									<q-icon slot="prepend" name="fas fa-paw-claws green">
-										<q-tooltip anchor="top middle" self="center middle">
-											Transformed
-										</q-tooltip>
+										<q-tooltip anchor="top middle" self="center middle"> Transformed </q-tooltip>
 									</q-icon>
 								</q-input>
-								<q-input 
+								<q-input
 									v-else
-									:dark="$store.getters.theme === 'dark'" filled square
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Max HP"
 									class="text-center"
-									type="number" 
+									type="number"
 									min="1"
 									max="9999"
 									v-model="playerBase.maxHp"
@@ -203,13 +252,19 @@
 					</div>
 					<div class="row q-col-gutter-md">
 						<div class="col">
-							<ValidationProvider rules="between:1,99|required" name="Armor class" v-slot="{ errors, invalid, validated }">
-								<q-input 
+							<ValidationProvider
+								rules="between:1,99|required"
+								name="Armor class"
+								v-slot="{ errors, invalid, validated }"
+							>
+								<q-input
 									v-if="entity.transformed"
-									:dark="$store.getters.theme === 'dark'" filled square
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Armor class"
 									class="text-center"
-									type="number" 
+									type="number"
 									min="1"
 									max="99"
 									v-model="entity.transformed.ac"
@@ -217,18 +272,18 @@
 									:error-message="errors[0]"
 								>
 									<q-icon slot="prepend" name="fas fa-paw-claws green">
-										<q-tooltip anchor="top middle" self="center middle">
-											Transformed
-										</q-tooltip>
+										<q-tooltip anchor="top middle" self="center middle"> Transformed </q-tooltip>
 									</q-icon>
 								</q-input>
-								<q-input 
+								<q-input
 									v-else
-									:dark="$store.getters.theme === 'dark'" filled square
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Armor class"
 									class="text-center"
-									type="number" 
-									name="ac" 
+									type="number"
+									name="ac"
 									min="1"
 									max="99"
 									v-model="playerBase.ac"
@@ -239,12 +294,20 @@
 							</ValidationProvider>
 						</div>
 						<div class="col">
-							<ValidationProvider :rules="isXpAdvancement() ? 'numeric|between:1,20' : 'required|numeric|between:1,20'" name="Level" v-slot="{ errors, invalid, validated }">
-								<q-input 
-									:dark="$store.getters.theme === 'dark'" filled square
+							<ValidationProvider
+								:rules="
+									isXpAdvancement() ? 'numeric|between:1,20' : 'required|numeric|between:1,20'
+								"
+								name="Level"
+								v-slot="{ errors, invalid, validated }"
+							>
+								<q-input
+									:dark="$store.getters.theme === 'dark'"
+									filled
+									square
 									label="Level"
 									class="text-center"
-									type="number" 
+									type="number"
 									min="1"
 									max="20"
 									v-model="playerBase.level"
@@ -252,11 +315,9 @@
 									:error="invalid && validated"
 									:error-message="errors[0]"
 								>
-									<span slot="append" v-if="isXpAdvancement()" :class="{ red: playerBase.level  }">
+									<span slot="append" v-if="isXpAdvancement()" :class="{ red: playerBase.level }">
 										{{ calculatedLevel(playerBase.experience) }}
-										<q-tooltip anchor="top left" self="center left">
-											Level based on XP
-										</q-tooltip>
+										<q-tooltip anchor="top left" self="center left"> Level based on XP </q-tooltip>
 									</span>
 								</q-input>
 							</ValidationProvider>
@@ -267,7 +328,7 @@
 				</q-form>
 			</ValidationObserver>
 			<div v-if="isXpAdvancement() && playerBase.experience !== undefined" class="pt-2">
-				<hr>
+				<hr />
 				<h2>Experience Points</h2>
 				<h2 class="text-center xp">
 					<hk-animated-integer :value="playerBase.experience" />
@@ -275,21 +336,29 @@
 
 				<div class="level">
 					<div class="current">{{ calculatedLevel(playerBase.experience) }}</div>
-					<q-linear-progress size="25px" :value="levelAdvancement(playerBase.experience)" color="primary">
+					<q-linear-progress
+						size="25px"
+						:value="levelAdvancement(playerBase.experience)"
+						color="primary"
+					>
 						<div class="absolute-full flex flex-center">
 							<div class="white">
 								{{ Math.floor(levelAdvancement(playerBase.experience) * 100) }}%
 							</div>
 						</div>
 					</q-linear-progress>
-					<div class="next" v-if="calculatedLevel(playerBase.experience) < 20">{{ calculatedLevel(playerBase.experience) + 1 }}</div>
+					<div class="next" v-if="calculatedLevel(playerBase.experience) < 20">
+						{{ calculatedLevel(playerBase.experience) + 1 }}
+					</div>
 				</div>
 
-				<q-input 
-					:dark="$store.getters.theme === 'dark'" square filled
+				<q-input
+					:dark="$store.getters.theme === 'dark'"
+					square
+					filled
 					class="text-center"
-					type="number" 
-					name="xp" 
+					type="number"
+					name="xp"
 					v-model="xp"
 					label="Award XP"
 				/>
@@ -300,291 +369,310 @@
 	</div>
 	<div v-else-if="demo">
 		<h2>Edit Player</h2>
-		<p>In the demo you can't edit players. Sign up to get access to all the features our app has to offer, like creating players and monsters and of course your own encounters.</p>
+		<p>
+			In the demo you can't edit players. Sign up to get access to all the features our app has to
+			offer, like creating players and monsters and of course your own encounters.
+		</p>
 
 		<router-link to="/sign-up" class="btn btn-block btn-lg bg-green">Create Account</router-link>
 	</div>
 </template>
 
 <script>
-	import { mapGetters, mapActions } from 'vuex';
-	import { experience } from 'src/mixins/experience.js';
-	import Transform from './party/Transform.vue';
+import { mapGetters, mapActions } from "vuex";
+import { experience } from "src/mixins/experience.js";
+import Transform from "./party/Transform.vue";
 
-	export default {
-		name: 'EditPlayer',
-		mixins: [experience],
-		components: {
-			Transform
-		},
-		props: [
-			'data',
-		],
-		data() {
-			return {
-				demo: this.$route.name === "Demo",
-				userId: this.$store.getters.user.uid,
-				campaignId: this.$route.params.campid,
-				encounterId: this.$route.params.encid,
-				entityKey: this.data.key,
-				location: this.data.location,
-				entity: {},
-				playerBase: {},
-				maxHpMod: undefined,
-				xp: undefined,
-				setTransform: false,
-				advancement: undefined,
-				initiative: 0,
-			}
-		},
-		async mounted() {
-			await this.get_campaign({ uid: this.userId, id: this.campaignId }).then(result => {
-				const entity = result.players[this.entityKey];
-				this.entity = {...entity};
-				this.maxHpMod = entity.maxHpMod;
-				this.advancement = result.advancement;
-			});
+export default {
+	name: "EditPlayer",
+	mixins: [experience],
+	components: {
+		Transform,
+	},
+	props: ["data"],
+	data() {
+		return {
+			demo: this.$route.name === "Demo",
+			userId: this.$store.getters.user.uid,
+			campaignId: this.$route.params.campid,
+			encounterId: this.$route.params.encid,
+			entityKey: this.data.key,
+			location: this.data.location,
+			entity: {},
+			playerBase: {},
+			maxHpMod: undefined,
+			xp: undefined,
+			setTransform: false,
+			advancement: undefined,
+			initiative: 0,
+		};
+	},
+	async mounted() {
+		await this.get_campaign({ uid: this.userId, id: this.campaignId }).then((result) => {
+			const entity = result.players[this.entityKey];
+			this.entity = { ...entity };
+			this.maxHpMod = entity.maxHpMod;
+			this.advancement = result.advancement;
+		});
 
-			await this.get_player({ uid: this.userId, id: this.entityKey }).then(result => {
-				this.playerBase = result;
-				if(this.isXpAdvancement() && this.playerBase.experience === undefined) {
-					this.set_player_prop({ uid: this.userId, id: this.entityKey, property: "experience", value: 0 });
-				}
-			});
-
-			// Get the initiative of the player when in an encounter
-			if(this.location === "encounter") {
-				await this.get_encounter({ uid: this.userId, campaignId: this.campaignId, id: this.encounterId }).then(result => {
-					this.initiative = result.entities[this.entityKey].initiative;
+		await this.get_player({ uid: this.userId, id: this.entityKey }).then((result) => {
+			this.playerBase = result;
+			if (this.isXpAdvancement() && this.playerBase.experience === undefined) {
+				this.set_player_prop({
+					uid: this.userId,
+					id: this.entityKey,
+					property: "experience",
+					value: 0,
 				});
 			}
+		});
+
+		// Get the initiative of the player when in an encounter
+		if (this.location === "encounter") {
+			await this.get_encounter({
+				uid: this.userId,
+				campaignId: this.campaignId,
+				id: this.encounterId,
+			}).then((result) => {
+				this.initiative = result.entities[this.entityKey].initiative;
+			});
+		}
+	},
+	computed: {
+		...mapGetters(["broadcast"]),
+		share() {
+			return (this.broadcast.shares && this.broadcast.shares.includes("xp")) || false;
 		},
-		computed: {
-			...mapGetters(["broadcast"]),
-			share() {
-				return (this.broadcast.shares && this.broadcast.shares.includes("xp")) || false;
-			},
-			death_fails() {
-				let fails = 0;
-				for(let key in this.entity.saves) {
-					if(this.entity.saves[key] === 'fail') {
-						fails++
-					}
+		death_fails() {
+			let fails = 0;
+			for (let key in this.entity.saves) {
+				if (this.entity.saves[key] === "fail") {
+					fails++;
 				}
-				return fails;
-			},
+			}
+			return fails;
 		},
-		methods: {
-			...mapActions([
-				'setSlide',
-				'edit_player',
-			]),
-			...mapActions("players", ["get_player", "edit_player", "set_player_prop"]),
-			...mapActions("campaigns", [
-				"get_campaign", 
-				"stabilize_entity", 
-				"kill_entity", 
-				"revive_entity", 
-				"update_campaign_entity",
-				"edit_campaign_player",
-				"set_share",
-				"set_death_save"
-			]),
-			addXp() {
-				if(this.xp) {
-					let newXp = parseInt(this.playerBase.experience) + parseInt(this.xp);
+	},
+	methods: {
+		...mapActions(["setSlide", "edit_player"]),
+		...mapActions("players", ["get_player", "edit_player", "set_player_prop"]),
+		...mapActions("campaigns", [
+			"get_campaign",
+			"stabilize_entity",
+			"kill_entity",
+			"revive_entity",
+			"update_campaign_entity",
+			"edit_campaign_player",
+			"set_share",
+			"set_death_save",
+		]),
+		addXp() {
+			if (this.xp) {
+				let newXp = parseInt(this.playerBase.experience) + parseInt(this.xp);
 
-					if(newXp < 0) { newXp = 0; }
-					if(newXp > 355000) { newXp = 355000; }
+				if (newXp < 0) {
+					newXp = 0;
+				}
+				if (newXp > 355000) {
+					newXp = 355000;
+				}
 
-					if(this.share) {
-						const key = Date.now() + Math.random().toString(36).substring(4);
-						let share = {
-							key,
-							type: "xp",
-							notification: {
-								amount: this.xp,
-								targets: [this.entityKey]
-							}
-						};
-						if(this.$route.name === 'RunEncounter') share.encounter_id = this.encounterId;
-						this.set_share({ id: this.broadcast.live, share });
-					}
-					this.set_player_prop({ uid: this.userId, id: this.entityKey, property: "experience", value: newXp });
-					this.xp = undefined;
+				if (this.share) {
+					const key = Date.now() + Math.random().toString(36).substring(4);
+					let share = {
+						key,
+						type: "xp",
+						notification: {
+							amount: this.xp,
+							targets: [this.entityKey],
+						},
+					};
+					if (this.$route.name === "RunEncounter") share.encounter_id = this.encounterId;
+					this.set_share({ id: this.broadcast.live, share });
 				}
-			},
-			isXpAdvancement() {
-				return this.advancement !== 'milestone';
-			},
-			set_save(value, index) {
-				index = (value) ? index + 1 : index;
-				this.set_death_save({
-					campaignId: this.campaignId,
-					type: "players",
+				this.set_player_prop({
+					uid: this.userId,
 					id: this.entityKey,
-					index,
-					value
-				});
-			},
-			closeTransform() {
-				this.setTransform = false;
-			},
-			removeTransform() {
-				this.update_campaign_entity({ 
-					uid: this.userId, 
-					campaignId: this.campaignId, 
-					type: "players",
-					id: this.entityKey,
-					property: "transformed",
-					value: null
-				});
-			},
-			stabilize() {
-				this.stabilize_entity({ 
-					uid: this.userId, 
-					campaignId: this.campaignId, 
-					type: "players",
-					id: this.entityKey
+					property: "experience",
+					value: newXp,
 				});
-			},
-			kill() {
-				this.kill_entity({ 
-					uid: this.userId, 
-					campaignId: this.campaignId, 
-					type: "players",
-					id: this.entityKey
-				});
-			},
-			revive() {
-				this.revive_entity({ 
-					uid: this.userId, 
-					campaignId: this.campaignId, 
-					type: "players",
-					id: this.entityKey, 
-					curHp: 1
-				});
-			},
-			edit() {
-				if(this.location === 'encounter') {
-					this.initiative = Number(this.initiative);
-				}
+				this.xp = undefined;
+			}
+		},
+		isXpAdvancement() {
+			return this.advancement !== "milestone";
+		},
+		set_save(value, index) {
+			index = value ? index + 1 : index;
+			this.set_death_save({
+				campaignId: this.campaignId,
+				type: "players",
+				id: this.entityKey,
+				index,
+				value,
+			});
+		},
+		closeTransform() {
+			this.setTransform = false;
+		},
+		removeTransform() {
+			this.update_campaign_entity({
+				uid: this.userId,
+				campaignId: this.campaignId,
+				type: "players",
+				id: this.entityKey,
+				property: "transformed",
+				value: null,
+			});
+		},
+		stabilize() {
+			this.stabilize_entity({
+				uid: this.userId,
+				campaignId: this.campaignId,
+				type: "players",
+				id: this.entityKey,
+			});
+		},
+		kill() {
+			this.kill_entity({
+				uid: this.userId,
+				campaignId: this.campaignId,
+				type: "players",
+				id: this.entityKey,
+			});
+		},
+		revive() {
+			this.revive_entity({
+				uid: this.userId,
+				campaignId: this.campaignId,
+				type: "players",
+				id: this.entityKey,
+				curHp: 1,
+			});
+		},
+		edit() {
+			if (this.location === "encounter") {
+				this.initiative = Number(this.initiative);
+			}
 
-				//Parse to INT
-				this.entity.ac_bonus = (this.entity.ac_bonus) ? parseInt(this.entity.ac_bonus) : 0;
-				this.entity.tempHp = (this.entity.tempHp) ? parseInt(this.entity.tempHp) : 0;
-				this.entity.maxHpMod = (this.entity.maxHpMod) ? parseInt(this.entity.maxHpMod) : 0;
-				this.playerBase.ac = parseInt(this.playerBase.ac);
-				this.playerBase.maxHp = parseInt(this.playerBase.maxHp);
-				this.entity.curHp = parseInt(this.entity.curHp);
-				let maxHpMod = (this.maxHpMod) ? parseInt(this.maxHpMod) : 0;
+			console.log("EDIT");
+			//Parse to INT
+			this.entity.ac_bonus = this.entity.ac_bonus ? parseInt(this.entity.ac_bonus) : 0;
+			this.entity.tempHp = this.entity.tempHp ? parseInt(this.entity.tempHp) : 0;
+			this.entity.maxHpMod = this.entity.maxHpMod ? parseInt(this.entity.maxHpMod) : 0;
+			this.playerBase.ac = parseInt(this.playerBase.ac);
+			this.playerBase.maxHp = parseInt(this.playerBase.maxHp);
+			this.entity.curHp = parseInt(this.entity.curHp);
+			let maxHpMod = this.maxHpMod ? parseInt(this.maxHpMod) : 0;
 
-				// If the MaxHpMod is negative and larger than the maxHp
-				if(maxHpMod < 0 && Math.abs(maxHpMod) > this.playerBase.maxHp) {
-					maxHpMod = -this.playerBase.maxHp;
-				}
+			// If the MaxHpMod is negative and larger than the maxHp
+			if (maxHpMod < 0 && Math.abs(maxHpMod) > this.playerBase.maxHp) {
+				maxHpMod = -this.playerBase.maxHp;
+			}
 
-				//Modify curHP with maxHpMod
-				if(this.entity.maxHpMod === 0) {
-					//If the there was no current mod
-					//only modify curHp if maxHpMod = positive
-					if(maxHpMod > 0) {
-						this.entity.curHp = parseInt(this.entity.curHp + maxHpMod);
-					}
-				} else if(maxHpMod === 0) {
-					//if the new mod is 0, check if the old mod was positive
-					//If so, remove it from the curHp
-					if(this.entity.maxHpMod > 0) {
-						this.entity.curHp = parseInt(this.entity.curHp - this.entity.maxHpMod);
-					}
-				} else {
-					//If the new mod is positive
-					if(maxHpMod > 0) {
-						//check if the current mod was positive too
-						if(this.entity.maxHpMod > 0) {
-							//if so, first substract current mod, then add new
-							this.entity.curHp = parseInt(parseInt(this.entity.curHp) - this.entity.maxHpMod + maxHpMod);
-						} else {
-							//else only add the new mod
-							this.entity.curHp = parseInt(parseInt(this.entity.curHp) + maxHpMod);
-						}
-					} else if(maxHpMod < 0) {
-						//if the new mod is negative,
-						//but the current is positive, still substract current
-						if(this.entity.maxHpMod > 0) {
-							this.entity.curHp = parseInt(parseInt(this.entity.curHp) - this.entity.maxHpMod);
-						}
-					}
+			//Modify curHP with maxHpMod
+			if (this.entity.maxHpMod === 0) {
+				//If the there was no current mod
+				//only modify curHp if maxHpMod = positive
+				if (maxHpMod > 0) {
+					this.entity.curHp = parseInt(this.entity.curHp + maxHpMod);
 				}
-				this.entity.maxHpMod = maxHpMod;
-
-				//CurHp can never be > maxHp
-				if(this.entity.curHp > (this.playerBase.maxHp + this.entity.maxHpMod)) {
-					this.entity.curHp = parseInt(this.playerBase.maxHp + this.entity.maxHpMod);
+			} else if (maxHpMod === 0) {
+				//if the new mod is 0, check if the old mod was positive
+				//If so, remove it from the curHp
+				if (this.entity.maxHpMod > 0) {
+					this.entity.curHp = parseInt(this.entity.curHp - this.entity.maxHpMod);
 				}
-				if(this.entity.transformed) {
-					if(this.entity.transformed.curHp > this.entity.transformed.maxHp) {
-						this.entity.transformed.curHp = this.entity.transformed.maxHp;
+			} else {
+				//If the new mod is positive
+				if (maxHpMod > 0) {
+					//check if the current mod was positive too
+					if (this.entity.maxHpMod > 0) {
+						//if so, first subtract current mod, then add new
+						this.entity.curHp = parseInt(
+							parseInt(this.entity.curHp) - this.entity.maxHpMod + maxHpMod
+						);
+					} else {
+						//else only add the new mod
+						this.entity.curHp = parseInt(parseInt(this.entity.curHp) + maxHpMod);
 					}
-					if(this.entity.transformed.curHp <= 0) {
-						this.$delete(this.entity, 'transformed');
+				} else if (maxHpMod < 0) {
+					//if the new mod is negative,
+					//but the current is positive, still subtract current
+					if (this.entity.maxHpMod > 0) {
+						this.entity.curHp = parseInt(parseInt(this.entity.curHp) - this.entity.maxHpMod);
 					}
-				}				
-
-				// Update the player in the campaign
-				this.edit_campaign_player({
-					id: this.campaignId,
-					playerId: this.entityKey,
-					player: this.entity
-				});
-				// Update the player
-				this.edit_player({ 
-					uid: this.userId, 
-					id: this.entityKey, 
-					player: this.playerBase
-				});
+				}
+			}
+			this.entity.maxHpMod = maxHpMod;
 
-				//If the new curHp > 0, revive a player and set the new curHp 
-				if(this.entity.curHp > 0) {
-					this.revive_entity({ 
-						uid: this.userId, 
-						campaignId: this.campaignId, 
-						type: "players",
-						id: this.entityKey, 
-						curHp: this.entity.curHp
-					});
+			//CurHp can never be > maxHp
+			if (this.entity.curHp > this.playerBase.maxHp + this.entity.maxHpMod) {
+				this.entity.curHp = parseInt(this.playerBase.maxHp + this.entity.maxHpMod);
+			}
+			if (this.entity.transformed) {
+				if (this.entity.transformed.curHp > this.entity.transformed.maxHp) {
+					this.entity.transformed.curHp = this.entity.transformed.maxHp;
+				}
+				if (this.entity.transformed.curHp <= 0) {
+					this.$delete(this.entity, "transformed");
 				}
+			}
+
+			// Update the player in the campaign
+			this.edit_campaign_player({
+				id: this.campaignId,
+				playerId: this.entityKey,
+				player: this.entity,
+			});
+			// Update the player
+			this.edit_player({
+				uid: this.userId,
+				id: this.entityKey,
+				player: this.playerBase,
+			});
 
-				this.setSlide(false);
+			//If the new curHp > 0, revive a player and set the new curHp
+			if (this.entity.curHp > 0) {
+				this.revive_entity({
+					uid: this.userId,
+					campaignId: this.campaignId,
+					type: "players",
+					id: this.entityKey,
+					curHp: this.entity.curHp,
+				});
 			}
-		}
-	};
+
+			this.setSlide(false);
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
-	label {
-		font-size: 12px;
-	}
-	h2.xp {
-		font-weight: bold;
-		font-size: 28px;
-	}
-	.level {
-		display: grid;
-		grid-template-columns: 25px auto 25px;
-		height: 25px;
-		line-height: 25px;
-		margin-bottom: 20px;
+label {
+	font-size: 12px;
+}
+h2.xp {
+	font-weight: bold;
+	font-size: 28px;
+}
+.level {
+	display: grid;
+	grid-template-columns: 25px auto 25px;
+	height: 25px;
+	line-height: 25px;
+	margin-bottom: 20px;
 
-		.next {
-			text-align: right;
-		}
-		.q-linear-progress {
-			font-size: 15px !important;
-			height: 25px;
-		}
+	.next {
+		text-align: right;
 	}
-	.btn.save {
-		width: 49.5%;
+	.q-linear-progress {
+		font-size: 15px !important;
+		height: 25px;
 	}
+}
+.btn.save {
+	width: 49.5%;
+}
 </style>
diff --git a/src/components/slides/encounter/reminders/TargetReminders.vue b/src/components/slides/encounter/reminders/TargetReminders.vue
index b818afd8..5e67ae00 100644
--- a/src/components/slides/encounter/reminders/TargetReminders.vue
+++ b/src/components/slides/encounter/reminders/TargetReminders.vue
@@ -115,7 +115,7 @@
 				</q-tab-panel>
 				<q-tab-panel name="custom">
 					<ValidationObserver v-slot="{ handleSubmit, valid }">
-						<q-form @submit="handleSubmit(valid ? addReminder('custom') : null)">
+						<q-form @submit="handleSubmit(valid ? addReminder('custom') : invalidReminder)">
 							<reminder-form v-model="customReminder" :variables="false" />
 							<q-btn color="blue" class="full-width" no-caps type="submit" :disabled="!valid"
 								>Set reminder</q-btn
@@ -176,7 +176,7 @@ export default {
 	methods: {
 		...mapActions(["set_targetReminder"]),
 		...mapActions("reminders", ["get_full_reminders"]),
-		async addReminder(type, reminder = false, selectedVars = undefined, key = undefined) {
+		addReminder(type, reminder = false, selectedVars = undefined, key = undefined) {
 			if (type === "premade") {
 				for (const target of this.reminder_targets) {
 					key = key || reminder[".key"] || reminder.key;
@@ -187,7 +187,7 @@ export default {
 						reminder.selectedVars = selectedVars;
 					}
 
-					await this.set_targetReminder({
+					this.set_targetReminder({
 						action: "add",
 						entity: target,
 						key,
@@ -198,7 +198,7 @@ export default {
 				}
 			} else if (type === "custom") {
 				for (const target of this.reminder_targets) {
-					await this.set_targetReminder({
+					this.set_targetReminder({
 						action: "add",
 						entity: target,
 						type: "custom",
@@ -220,6 +220,9 @@ export default {
 			}
 			return title;
 		},
+		invalidReminder(obj) {
+			console.warn(obj);
+		},
 	},
 };
 </script>
diff --git a/src/components/userContent/ExportUserContent.vue b/src/components/userContent/ExportUserContent.vue
index e2e073a2..c4dc2beb 100644
--- a/src/components/userContent/ExportUserContent.vue
+++ b/src/components/userContent/ExportUserContent.vue
@@ -216,11 +216,13 @@ export default {
 						delete entity.tempHp;
 						delete entity.maxHpMod;
 						delete entity.ac_bonus;
+						delete entity.conditions;
 						delete entity.reminders;
 						delete entity.settings;
-						delete entity.surprised;
 						delete entity.tempHp;
 						delete entity.meters;
+						delete entity.limited_uses;
+
 						return [entity_id, entity];
 					});
 				encounter.entities = Object.fromEntries(entities);
diff --git a/src/components/userContent/ImportUserContent.vue b/src/components/userContent/ImportUserContent.vue
index 2ee1408e..aebecb2b 100644
--- a/src/components/userContent/ImportUserContent.vue
+++ b/src/components/userContent/ImportUserContent.vue
@@ -118,7 +118,24 @@
 								{{ props.row.name.capitalizeEach() }}
 							</td>
 						</template>
-
+						<template v-slot:body-cell-linked="props">
+							<td>
+								<hk-popover
+									v-if="import_type !== 'spells' && hasLinkedEntities(import_type, props.row)"
+									:header="`Linked ${linked_entity_map[import_type]}`"
+								>
+									<span>
+										{{ getLinkedEntities(import_type, props.row).length }}
+										{{ linked_entity_map[import_type] }}
+									</span>
+									<div slot="content">
+										<p v-for="item in getLinkedEntities(import_type, props.row)" :key="item.key">
+											{{ item.name.capitalize() }}
+										</p>
+									</div>
+								</hk-popover>
+							</td>
+						</template>
 						<template v-slot:body-cell-duplicate="props">
 							<td class="py-0 px-1">
 								<hk-popover
@@ -188,39 +205,41 @@
 					:key="`failed-${failed_type}`"
 					class="bg-neutral-8 px-3 py-2"
 				>
-					<p>Import failed for following {{ failed_type }}</p>
-					<q-list dense class="mb-2">
-						<q-item v-for="(failed, i) in failed_list" :key="`failed-${i}`" class="bg-neutral-9">
-							<q-item-section>
-								{{ failed.name.capitalizeEach() }}
-							</q-item-section>
-							<q-item-section avatar>
-								<hk-popover v-if="failed.errors" header="Validation errors">
-									<q-icon name="error" class="red" />
-									<div slot="content">
-										<ol class="px-3">
-											<li
-												v-for="(error, index) in failed.errors"
-												:key="`${i}-error-${index}`"
-												class="red"
-											>
-												<strong v-if="error.instancePath" class="neutral-1">
-													{{ error.instancePath }}
-												</strong>
-												{{ error.message.capitalize() }}
-											</li>
-										</ol>
-									</div>
-								</hk-popover>
-							</q-item-section>
-						</q-item>
-					</q-list>
-					<p>
-						Make sure there are no validation errors.<br />
-						<a @click="showSchemaDialog(failed_type)"
-							>Compare with our {{ failed_type.substring(0, failed_type.length - 1) }} schema.</a
-						>
-					</p>
+					<template v-if="failed_list.length">
+						<p>Import failed for following {{ failed_type }}</p>
+						<q-list dense class="mb-2">
+							<q-item v-for="(failed, i) in failed_list" :key="`failed-${i}`" class="bg-neutral-9">
+								<q-item-section>
+									{{ failed.name.capitalizeEach() }}
+								</q-item-section>
+								<q-item-section avatar>
+									<hk-popover v-if="failed.errors" header="Validation errors">
+										<q-icon name="error" class="red" />
+										<div slot="content">
+											<ol class="px-3">
+												<li
+													v-for="(error, index) in failed.errors"
+													:key="`${i}-error-${index}`"
+													class="red"
+												>
+													<strong v-if="error.instancePath" class="neutral-1">
+														{{ error.instancePath }}
+													</strong>
+													{{ error.message.capitalize() }}
+												</li>
+											</ol>
+										</div>
+									</hk-popover>
+								</q-item-section>
+							</q-item>
+						</q-list>
+						<p>
+							Make sure there are no validation errors.<br />
+							<a @click="showSchemaDialog(failed_type)"
+								>Compare with our {{ failed_type.substring(0, failed_type.length - 1) }} schema.</a
+							>
+						</p>
+					</template>
 				</div>
 			</q-expansion-item>
 
@@ -299,22 +318,32 @@ export default {
 			schema: undefined,
 			import_state: "start",
 			failed_imports: {
+				campaigns: [],
+				encounters: [],
 				npcs: [],
 				spells: [],
 			},
 			imported: {
+				campaigns: 0,
+				encounters: 0,
 				npcs: 0,
 				spells: 0,
 			},
 			import_key_map: {
+				campaigns: {},
+				encounters: {},
 				npcs: {},
 				spells: {},
 			},
 			parsed_data: {
+				campaigns: [],
+				encounters: [],
 				npcs: [],
 				spells: [],
 			},
 			selected: {
+				campaigns: [],
+				encounters: [],
 				npcs: [],
 				spells: [],
 			},
@@ -327,15 +356,28 @@ export default {
 					align: "left",
 					format: (val) => val.capitalizeEach(),
 				},
+				{
+					name: "linked",
+					label: "Linked",
+					field: "linked",
+					align: "right",
+					style: "width: 140px",
+					headerStyle: "width: 140px",
+				},
 				{
 					name: "duplicate",
 					label: "Duplicate",
 					field: "duplicate",
 					align: "right",
-					style: "width: 0px",
-					headerStyle: "width: 0px",
+					style: "width: 100px",
+					headerStyle: "width: 100px",
 				},
 			],
+			linked_entity_map: {
+				campaigns: "encounters",
+				encounters: "npcs",
+				npcs: "spells",
+			},
 			duplicate_icon: {
 				overwrite: "fas fa-pen",
 				duplicate: "fas fa-copy",
@@ -378,8 +420,18 @@ export default {
 		},
 	},
 	methods: {
-		...mapActions("campaigns", ["add_campaign", "get_campaign", "get_campaigns"]),
-		...mapActions("encounters", ["add_encounter", "get_encounter", "get_encounters"]),
+		...mapActions("campaigns", [
+			"add_campaign",
+			"get_campaign",
+			"get_campaigns",
+			"reserve_campaign_id",
+		]),
+		...mapActions("encounters", [
+			"add_encounter",
+			"get_encounter",
+			"get_campaign_encounters",
+			"reserve_encounter_id",
+		]),
 		...mapActions("npcs", ["add_npc", "edit_npc", "get_npcs", "get_npc", "reserve_npc_id"]),
 		...mapActions("spells", [
 			"add_spell",
@@ -482,17 +534,34 @@ export default {
 					this.parseNPC(key, npc);
 				});
 			}
-			// if (data.campaigns && data.encounters) {
-			// 	Object.entries(data.campaigns).forEach(([key, campaign]) => {
-			// 		this.parseCampaign(key, campaign);
-			// 	});
-			// 	Object.entries(data.encounters).forEach(([key, encounter]) => {
-			// 		this.parseEncounter(key, encounter);
-			// 	});
-			// }
+			if (data.campaigns && data.encounters) {
+				Object.entries(data.campaigns).forEach(([campaign_key, campaign]) => {
+					this.parseCampaign(campaign_key, campaign);
+					Object.entries(data.encounters[campaign_key]).forEach(([encounter_key, encounter]) => {
+						this.parseEncounter(encounter_key, campaign_key, encounter);
+					});
+				});
+			}
 		},
 
-		async parseCampaign(key, campaign) {},
+		async parseCampaign(key, campaign) {
+			delete campaign.key;
+			this.removeTimestamps(campaign);
+
+			const valid = ajv.validate(campaignSchema, campaign);
+
+			campaign.meta = { key };
+			// Always duplicate an imported campaign
+			campaign.meta.duplicate = false;
+			campaign.meta.overwrite = undefined;
+
+			if (!valid) {
+				campaign.meta.errors = ajv.errors;
+			}
+
+			this.parsed_data.campaigns.push(campaign);
+			console.log("parsed Campaign", campaign.name);
+		},
 		async parseEncounter(key, campaign_key, encounter) {
 			delete encounter.key;
 			this.removeTimestamps(encounter);
@@ -500,12 +569,16 @@ export default {
 			const valid = ajv.validate(encounterSchema, encounter);
 
 			encounter.meta = { key, campaign_key };
-			encounter.meta.duplicate = await this.checkIfDuplicateEncounter(encounter);
-			encounter.meta.overwrite = encounter.meta.duplicate ? "duplicate" : undefined;
+			// Always duplicate encounters and campaigns
+			encounter.meta.duplicate = false;
+			encounter.meta.overwrite = undefined;
 
 			if (!valid) {
 				encounter.meta.errors = ajv.errors;
 			}
+
+			this.parsed_data.encounters.push(encounter);
+			console.log("parsed Encounter", encounter.name);
 		},
 		async parseNPC(key, npc) {
 			/**
@@ -565,8 +638,10 @@ export default {
 
 		async getKey(item, item_type) {
 			const keyGenFnMap = {
-				spells: this.reserve_spell_id,
+				campaigns: this.reserve_campaign_id,
+				encounters: this.reserve_encounter_id,
 				npcs: this.reserve_npc_id,
+				spells: this.reserve_spell_id,
 			};
 
 			switch (item.meta.overwrite) {
@@ -633,7 +708,7 @@ export default {
 			 *    - Update NPCs in encounter to correct keys
 			 */
 
-			this.selected.spells.forEach(async (spell) => {
+			for (const spell of this.selected.spells) {
 				const key = this.import_key_map.spells[spell.meta.key];
 				const meta = { ...spell.meta };
 				delete spell.meta;
@@ -649,7 +724,7 @@ export default {
 						console.log("Failed SPELL import", error, spell);
 					}
 				}
-			});
+			}
 
 			for (const npc of this.selected.npcs) {
 				const key = this.import_key_map.npcs[npc.meta.key];
@@ -670,6 +745,31 @@ export default {
 					}
 				}
 			}
+
+			for (const campaign of this.selected.campaigns) {
+				const key = this.import_key_map.campaigns[campaign.meta.key];
+				delete campaign.meta;
+				campaign.timestamp = Date.now();
+				try {
+					await this.add_campaign({ campaign, predefined_key: key });
+					this.imported.campaigns++;
+				} catch (error) {
+					this.failed_imports.campaigns.push(campaign);
+					console.log("Failed Campaign import", error, campaign, key);
+				}
+			}
+
+			for (const encounter of this.selected.encounters) {
+				const key = this.import_key_map.encounters[encounter.meta.key];
+				const campaign_key = this.import_key_map.campaigns[encounter.meta.campaign_key];
+				delete encounter.meta;
+				try {
+					await this.add_encounter({ campaignId: campaign_key, encounter, predefined_key: key });
+					this.imported.encounters++;
+				} catch (error) {
+					this.failed_imports.encounters.push(encounter);
+				}
+			}
 		},
 		copySchema() {
 			try {
@@ -806,6 +906,64 @@ export default {
 				).length > 0
 			);
 		},
+		hasLinkedEntities(import_type, entity) {
+			return this.getLinkedEntities(import_type, entity).length > 0;
+		},
+		getLinkedEntities(import_type, entity) {
+			switch (import_type) {
+				case "campaigns":
+					return this.selected.encounters
+						.filter((encounter) => encounter.meta.campaign_key === entity.meta.key)
+						.map((encounter) => ({
+							name:
+								encounter.meta.overwrite === "skip"
+									? encounter.meta.duplicate.name
+									: encounter.name,
+							key:
+								encounter.meta.overwrite === "duplicate"
+									? encounter.meta.key
+									: encounter.meta.duplicate.key,
+						}));
+				case "encounters":
+					if (!entity.entities) {
+						return [];
+					}
+					return this.selected.npcs
+						.filter((npc) => {
+							return Object.values(entity.entities)
+								.filter((enc_npc) => enc_npc?.npc === "custom" && enc_npc.id === npc.meta.key)
+								.map((enc_npc) => enc_npc.id)
+								.includes(npc.meta.key);
+						})
+						.map((npc) => ({
+							name: npc.meta.overwrite === "skip" ? npc.meta.duplicate.name : npc.name,
+							key: npc.meta.overwrite === "duplicate" ? npc.meta.key : npc.meta.duplicate.key,
+						}));
+				case "npcs":
+					const spell_lists = ["caster_spells", "innate_spells"];
+					return this.selected.spells
+						.filter((spell) =>
+							spell_lists
+								.reduce((acc, spell_type) => {
+									if (entity[spell_type]) {
+										return acc.concat(
+											Object.entries(entity[spell_type])
+												.filter(([_, s]) => s.custom)
+												.map(([sk, _]) => sk)
+										);
+									}
+									return acc;
+								}, [])
+								.includes(spell.meta.key)
+						)
+						.map((spell) => ({
+							name: spell.meta.overwrite === "skip" ? spell.meta.duplicate.name : spell.name,
+							key: spell.meta.overwrite === "duplicate" ? spell.meta.key : spell.meta.duplicate.key,
+						}));
+				default:
+					return [];
+			}
+		},
 	},
 };
 </script>
diff --git a/src/services/campaigns.js b/src/services/campaigns.js
index e78b7009..67d0d4d3 100644
--- a/src/services/campaigns.js
+++ b/src/services/campaigns.js
@@ -5,184 +5,239 @@ const SEARCH_CAMPAIGNS_REF = db.ref("search_campaigns");
 const USERS_REF = db.ref("users");
 
 export class campaignServices {
-
-  async getCampaigns(uid) {
-    try {   
-      const campaigns = await SEARCH_CAMPAIGNS_REF.child(`${uid}/results`).once('value', snapshot => {
-        return snapshot;
-      });
-      return campaigns.val();
-    } catch(error) {
-      throw error;
-    }
-  }
-
-  async getCampaignCount(uid) {
-    try {
-      const path = `${uid}/metadata/count`;
-      const count = await SEARCH_CAMPAIGNS_REF.child(path).once('value', snapshot => {
-        return snapshot;
-      });
-      return count.val();
-    } catch(error) {
-      throw error;
-    }
-  }
-
-  async getCampaign(uid, id) {
-    try {
-      const campaign = await CAMPAIGNS_REF.child(uid).child(id).once('value', snapshot => {
-        return snapshot;
-      });
-      return campaign.val();
-    } catch(error) {
-      throw error;
-    }
-  }
-
-  async setActiveCampaign(uid, id) {
-    USERS_REF.child(uid).child("active_campaign").set(id).then(() => {
-      return;
-    }).catch((error) => {
-      throw error;
-    });
-  }
-
-  async addCampaign(uid, campaign, search_campaign) {
-    try {
-      const newCampaign = await CAMPAIGNS_REF.child(uid).push(campaign);
-
-      // Update search_campaigns
-      SEARCH_CAMPAIGNS_REF.child(`${uid}/results/${newCampaign.key}`).set(search_campaign);
-
-      return newCampaign.key;
-    } catch(error) {
-      throw error;
-    }
-  }
-
-  async editCampaign(uid, id, campaign) {
-    CAMPAIGNS_REF.child(uid).child(id).set(campaign).then(() => {
-      return;
-    }).catch((error) => {
-      throw error;
-    });
-  }
-
-  /**
-   * Updates a specific property in an existing campaign
-   * 
-   * @param {String} uid ID of active user
-   * @param {String} id ID of campaign to edit
-   * @param {string} path Path to parent the property that must be updated (Only needed of the value is nested)
-   * @param {object} value Object with { property: value }
-   * @param {boolean} update_search Wether or not search_campaigns must be updated
-   */
-  async updateCampaign(uid, id, path, value, update_search=false) {
-    CAMPAIGNS_REF.child(`${uid}/${id}${path}`).update(value).then(() => {
-      if(update_search) {
-        SEARCH_CAMPAIGNS_REF.child(`${uid}/results/${id}${path}`).update(value);
-      }
-    }).catch((error) => {
-      throw error;
-    });
-  }
-
-  async updateSearchCampaign(uid, id, path, value) {
-    path = `${uid}/results/${id}${path}`
-    SEARCH_CAMPAIGNS_REF.child(path).update(value).then(() => {
-      return;
-    }).catch((error) => {
-      throw error;
-    });
-  }
-
-  async setPlayer(uid, id, playerId, player) {
-    CAMPAIGNS_REF.child(uid).child(id).child(`players/${playerId}`).set(player).then(() => {
-      return;
-    }).catch((error) => {
-      throw error;
-    });
-  }
-
-  async deletePlayer(uid, id, playerId) {
-    CAMPAIGNS_REF.child(uid).child(id).child(`players/${playerId}`).remove().then(() => {
-      return;
-    }).catch((error) => {
-      throw error;
-    });
-  }
-  
-  async deleteCompanion(uid, id, companionId) {
-    CAMPAIGNS_REF.child(uid).child(id).child(`companions/${companionId}`).remove().then(() => {
-      return;
-    }).catch((error) => {
-      throw error;
-    });
-  }
-
-  async deleteCampaign(uid, id) {
-    try {
-      CAMPAIGNS_REF.child(uid).child(id).remove();
-
-      //Update search_campaigns
-      SEARCH_CAMPAIGNS_REF.child(`${uid}/results`).child(id).remove();
-      return;
-    } catch(error){
-      throw error;
-    }
-  }
-
-  async setShare(uid, id, share) {
-    CAMPAIGNS_REF.child(uid).child(id).child("shares").set(share).then(() => {
-      return;
-    }).catch((error) => {
-      throw error;
-    });
-  }
-
-  /**
-   * Adds an item to the inventory of a campaign
-   * 
-   * @param {String} uid User ID
-   * @param {String} campaignId Campaing ID
-   * @param {String} encounterId Encounter ID
-   * @param {object} item
-   */
-   async addItem(uid, campaignId, item) {
-    try {
-      const path = `${uid}/${campaignId}/inventory/items`;
-      const newItem = await CAMPAIGNS_REF.child(path).push(item);
-      return newItem.key;
-    } catch(error) {
-      throw error;
-    }
-  }
-
-  /**
-   * Update campaign_count in the search table of search_campaigns
-   * 
-   * @param {String} uid User ID
-   * @param {Int} diff Difference to add or subtract from campaign count
-   */
-  async updateCampaignCount(uid, diff) {
-    const campaign_count_path = `${uid}/metadata/count`;
-    let campaign_count = await this.getCampaignCount(uid);
-    await SEARCH_CAMPAIGNS_REF.child(campaign_count_path).set(campaign_count + diff);
-    return campaign_count + diff;
-  }
-
-  /**
-   * Update player_count in the search table of search_campaigns
-   * 
-   * @param {String} uid User ID
-   * @param {String} campaignId Campaing ID
-   * @param {Int} diff Difference to add or subtract from player count
-   */
-   async updatePlayerCount(uid, campaignId, diff) {
-    const player_count_path = `${uid}/results/${campaignId}/player_count`;
-    let player_count = await SEARCH_CAMPAIGNS_REF.child(player_count_path).once('value');
-    await SEARCH_CAMPAIGNS_REF.child(player_count_path).set(player_count.val() + diff);
-    return player_count.val() + diff;
-  }
-}
\ No newline at end of file
+	async getCampaigns(uid) {
+		try {
+			const campaigns = await SEARCH_CAMPAIGNS_REF.child(`${uid}/results`).once(
+				"value",
+				(snapshot) => {
+					return snapshot;
+				}
+			);
+			return campaigns.val();
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	async getCampaignCount(uid) {
+		try {
+			const path = `${uid}/metadata/count`;
+			const count = await SEARCH_CAMPAIGNS_REF.child(path).once("value", (snapshot) => {
+				return snapshot;
+			});
+			return count.val();
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	async getCampaign(uid, id) {
+		try {
+			const campaign = await CAMPAIGNS_REF.child(uid)
+				.child(id)
+				.once("value", (snapshot) => {
+					return snapshot;
+				});
+			return campaign.val();
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	async setActiveCampaign(uid, id) {
+		USERS_REF.child(uid)
+			.child("active_campaign")
+			.set(id)
+			.then(() => {
+				return;
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	async addCampaign(uid, campaign, search_campaign, predefined_key = undefined) {
+		try {
+			let campaign_key = predefined_key;
+			if (predefined_key) {
+				await CAMPAIGNS_REF.child(uid).child(predefined_key).set(campaign);
+			} else {
+				const newCampaign = await CAMPAIGNS_REF.child(uid).push(campaign);
+				campaign_key = newCampaign.key;
+			}
+
+			// Update search_campaigns
+			SEARCH_CAMPAIGNS_REF.child(`${uid}/results/${campaign_key}`).set(search_campaign);
+
+			return campaign_key;
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	async editCampaign(uid, id, campaign) {
+		CAMPAIGNS_REF.child(uid)
+			.child(id)
+			.set(campaign)
+			.then(() => {
+				return;
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	/**
+	 * Updates a specific property in an existing campaign
+	 *
+	 * @param {String} uid ID of active user
+	 * @param {String} id ID of campaign to edit
+	 * @param {string} path Path to parent the property that must be updated (Only needed of the value is nested)
+	 * @param {object} value Object with { property: value }
+	 * @param {boolean} update_search Wether or not search_campaigns must be updated
+	 */
+	async updateCampaign(uid, id, path, value, update_search = false) {
+		CAMPAIGNS_REF.child(`${uid}/${id}${path}`)
+			.update(value)
+			.then(() => {
+				if (update_search) {
+					SEARCH_CAMPAIGNS_REF.child(`${uid}/results/${id}${path}`).update(value);
+				}
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	async updateSearchCampaign(uid, id, path, value) {
+		path = `${uid}/results/${id}${path}`;
+		SEARCH_CAMPAIGNS_REF.child(path)
+			.update(value)
+			.then(() => {
+				return;
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	async setPlayer(uid, id, playerId, player) {
+		CAMPAIGNS_REF.child(uid)
+			.child(id)
+			.child(`players/${playerId}`)
+			.set(player)
+			.then(() => {
+				return;
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	async deletePlayer(uid, id, playerId) {
+		CAMPAIGNS_REF.child(uid)
+			.child(id)
+			.child(`players/${playerId}`)
+			.remove()
+			.then(() => {
+				return;
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	async deleteCompanion(uid, id, companionId) {
+		CAMPAIGNS_REF.child(uid)
+			.child(id)
+			.child(`companions/${companionId}`)
+			.remove()
+			.then(() => {
+				return;
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	async deleteCampaign(uid, id) {
+		try {
+			CAMPAIGNS_REF.child(uid).child(id).remove();
+
+			//Update search_campaigns
+			SEARCH_CAMPAIGNS_REF.child(`${uid}/results`).child(id).remove();
+			return;
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	async setShare(uid, id, share) {
+		CAMPAIGNS_REF.child(uid)
+			.child(id)
+			.child("shares")
+			.set(share)
+			.then(() => {
+				return;
+			})
+			.catch((error) => {
+				throw error;
+			});
+	}
+
+	/**
+	 * Adds an item to the inventory of a campaign
+	 *
+	 * @param {String} uid User ID
+	 * @param {String} campaignId Campaing ID
+	 * @param {String} encounterId Encounter ID
+	 * @param {object} item
+	 */
+	async addItem(uid, campaignId, item) {
+		try {
+			const path = `${uid}/${campaignId}/inventory/items`;
+			const newItem = await CAMPAIGNS_REF.child(path).push(item);
+			return newItem.key;
+		} catch (error) {
+			throw error;
+		}
+	}
+
+	/**
+	 * Reserve an ID for a campaign that might be stored in the future
+	 * Useful when you don't know yet if you want to store a campaign, but want to be able to link to it
+	 * from different db entries
+	 * @param {String} uid ID of active user
+	 * @returns Generated key
+	 */
+	async reserveCampaignId(uid) {
+		return (await CAMPAIGNS_REF.child(uid).push()).key;
+	}
+
+	/**
+	 * Update campaign_count in the search table of search_campaigns
+	 *
+	 * @param {String} uid User ID
+	 * @param {Int} diff Difference to add or subtract from campaign count
+	 */
+	async updateCampaignCount(uid, diff) {
+		const campaign_count_path = `${uid}/metadata/count`;
+		let campaign_count = await this.getCampaignCount(uid);
+		await SEARCH_CAMPAIGNS_REF.child(campaign_count_path).set(campaign_count + diff);
+		return campaign_count + diff;
+	}
+
+	/**
+	 * Update player_count in the search table of search_campaigns
+	 *
+	 * @param {String} uid User ID
+	 * @param {String} campaignId Campaing ID
+	 * @param {Int} diff Difference to add or subtract from player count
+	 */
+	async updatePlayerCount(uid, campaignId, diff) {
+		const player_count_path = `${uid}/results/${campaignId}/player_count`;
+		let player_count = await SEARCH_CAMPAIGNS_REF.child(player_count_path).once("value");
+		await SEARCH_CAMPAIGNS_REF.child(player_count_path).set(player_count.val() + diff);
+		return player_count.val() + diff;
+	}
+}
diff --git a/src/services/encounters.js b/src/services/encounters.js
index 98379a49..c4431f32 100644
--- a/src/services/encounters.js
+++ b/src/services/encounters.js
@@ -58,16 +58,26 @@ export class encounterServices {
 		}
 	}
 
-	async addEncounter(uid, campaignId, encounter, search_encounter) {
+	async reserveEncounterId(uid) {
+		return (await ENCOUNTERS_REF.child(uid).push()).key;
+	}
+
+	async addEncounter(uid, campaignId, encounter, search_encounter, predefined_key = undefined) {
 		try {
-			const newEncounter = await ENCOUNTERS_REF.child(uid).child(campaignId).push(encounter);
+			let encounter_key = predefined_key;
+			if (predefined_key) {
+				await ENCOUNTERS_REF.child(uid).child(campaignId).child(predefined_key).set(encounter);
+			} else {
+				const newEncounter = await ENCOUNTERS_REF.child(uid).child(campaignId).push(encounter);
+				encounter_key = newEncounter.key;
+			}
 
 			// Update search_encounters
-			SEARCH_ENCOUNTERS_REF.child(`${uid}/results/${campaignId}/${newEncounter.key}`).set(
+			SEARCH_ENCOUNTERS_REF.child(`${uid}/results/${campaignId}/${encounter_key}`).set(
 				search_encounter
 			);
 
-			return newEncounter.key;
+			return encounter_key;
 		} catch (error) {
 			throw error;
 		}
diff --git a/src/services/npcs.js b/src/services/npcs.js
index af12b48f..aaba0529 100644
--- a/src/services/npcs.js
+++ b/src/services/npcs.js
@@ -220,6 +220,7 @@ export class npcServices {
 	 * E.g. Reserve a key for an npc during importing so it can be linked to an encounter.
 	 *
 	 * @param {String} uid ID of active user
+	 * @returns Generated key
 	 */
 	async reserveNpcId(uid) {
 		return (await NPCS_REF.child(uid).push()).key;
diff --git a/src/store/modules/runEncounter.js b/src/store/modules/runEncounter.js
index 4b88cb18..50dbbee1 100644
--- a/src/store/modules/runEncounter.js
+++ b/src/store/modules/runEncounter.js
@@ -693,7 +693,7 @@ const run_encounter_actions = {
 		let maxHp = maxHpMod > 0 ? entity.maxHp - maxHpMod : entity.maxHp + Math.abs(maxHpMod);
 		let curHp = entity.curHp;
 
-		if (value === undefined) value = null;
+		if (value === undefined || value === "") value = null;
 		if (
 			value &&
 			[
diff --git a/src/store/modules/userContent/campaigns.js b/src/store/modules/userContent/campaigns.js
index 37236d3a..db058db8 100644
--- a/src/store/modules/userContent/campaigns.js
+++ b/src/store/modules/userContent/campaigns.js
@@ -64,11 +64,11 @@ const campaign_actions = {
 	 * Fetches all the search_campaigns for a user
 	 * and stores them in campaigns
 	 */
-	async get_campaigns({ state, rootGetters, dispatch, commit }) {
+	async get_campaigns({ state, rootGetters, getters, dispatch, commit }) {
 		const uid = rootGetters.user ? rootGetters.user.uid : undefined;
 		let campaigns = state.campaigns ? state.campaigns : undefined;
 
-		if (!campaigns && uid) {
+		if ((!campaigns || getters.campaign_count > Object.keys(campaigns)) && uid) {
 			const services = await dispatch("get_campaign_services");
 			try {
 				campaigns = await services.getCampaigns(uid);
@@ -98,6 +98,24 @@ const campaign_actions = {
 		}
 	},
 
+	async update_campaign_count({ rootGetters, state, commit, dispatch }) {
+		const uid = rootGetters.user ? rootGetters.user.uid : undefined;
+		if (uid) {
+			const services = await dispatch("get_campaign_services");
+			try {
+				const current_count = state.campaign_count;
+				const table_length = Object.keys(state.campaigns).length;
+				const count_diff = table_length - current_count;
+
+				const new_count = await services.updateCampaignCount(uid, count_diff);
+				commit("SET_CAMPAIGN_COUNT", new_count);
+				dispatch("checkEncumbrance", "", { root: true });
+			} catch (error) {
+				throw error;
+			}
+		}
+	},
+
 	/**
 	 * Get a single campaign
 	 * - first try to find it in the store, then fetch if wasn't present
@@ -240,7 +258,7 @@ const campaign_actions = {
 	 * @param {object} campaign
 	 * @returns {string} the id of the newly added campaign
 	 */
-	async add_campaign({ rootGetters, commit, dispatch }, campaign) {
+	async add_campaign({ rootGetters, commit, dispatch, state }, { campaign, predefined_key }) {
 		const uid = rootGetters.user ? rootGetters.user.uid : undefined;
 		const available_slots = rootGetters.tier.benefits.campaigns;
 		if (uid) {
@@ -252,14 +270,14 @@ const campaign_actions = {
 			}
 			try {
 				const search_campaign = convert_campaign(campaign);
-				const id = await services.addCampaign(uid, campaign, search_campaign);
+				const id = await services.addCampaign(uid, campaign, search_campaign, predefined_key);
 				commit("SET_CAMPAIGN", { uid, id, search_campaign });
+				commit("SET_CACHED_CAMPAIGN", { uid, id, campaign });
 
-				const new_count = await services.updateCampaignCount(uid, 1);
-				commit("SET_CAMPAIGN_COUNT", new_count);
-				dispatch("checkEncumbrance", "", { root: true });
+				dispatch("update_campaign_count");
 				return id;
 			} catch (error) {
+				console.log("caught error", error);
 				throw error;
 			}
 		}
@@ -293,6 +311,21 @@ const campaign_actions = {
 		}
 	},
 
+	/**
+	 * Reserve campaign id for future usage
+	 */
+	async reserve_campaign_id({ rootGetters, dispatch }) {
+		const uid = rootGetters.user ? rootGetters.user.uid : undefined;
+		if (uid) {
+			const services = await dispatch("get_campaign_services");
+			try {
+				return await services.reserveCampaignId(uid);
+			} catch (error) {
+				throw error;
+			}
+		}
+	},
+
 	/**
 	 * Deletes a campaign
 	 * - Deletes all encounters for this campaign
@@ -323,10 +356,8 @@ const campaign_actions = {
 				commit("REMOVE_CAMPAIGN", id);
 				commit("REMOVE_CACHED_CAMPAIGN", { uid, id });
 
-				// Update campaign count
-				const new_count = await services.updateCampaignCount(uid, -1);
-				commit("SET_CAMPAIGN_COUNT", new_count);
-				dispatch("checkEncumbrance", "", { root: true });
+				dispatch("update_campaign_count");
+
 				return;
 			} catch (error) {
 				throw error;
diff --git a/src/store/modules/userContent/encounters.js b/src/store/modules/userContent/encounters.js
index 07723f14..4e8d11da 100644
--- a/src/store/modules/userContent/encounters.js
+++ b/src/store/modules/userContent/encounters.js
@@ -123,6 +123,24 @@ const encounter_actions = {
 		}
 	},
 
+	async update_encounter_count({ rootGetters, state, commit, dispatch }, { campaignId }) {
+		const uid = rootGetters.user ? rootGetters.user.uid : undefined;
+		if (uid) {
+			const services = await dispatch("get_encounter_services");
+			try {
+				const current_count = state.encounter_count[campaignId] || 0;
+				const table_length = Object.keys(state.encounters[campaignId]).length;
+				const count_diff = table_length - current_count;
+
+				const new_count = await services.updateEncounterCount(uid, campaignId, count_diff);
+				commit("SET_ENCOUNTER_COUNT", { campaignId, count: new_count });
+				dispatch("checkEncumbrance", "", { root: true });
+			} catch (error) {
+				throw error;
+			}
+		}
+	},
+
 	/**
 	 * Get a single encounter
 	 * first try to find it in the store, then fetch if wasn't present
@@ -130,7 +148,7 @@ const encounter_actions = {
 	 * - Remove ghost NPCs
 	 * - Remove ghost Players
 	 * - Remove ghost Companions
-	 * - Remove gost item links
+	 * - Remove ghost item links
 	 *
 	 * @param {string} uid userId
 	 * @param {string} campaignId campaignId
@@ -234,6 +252,18 @@ const encounter_actions = {
 		return encounter;
 	},
 
+	async reserve_encounter_id({ rootGetters, dispatch }) {
+		const uid = rootGetters.user ? rootGetters.user.uid : undefined;
+		if (uid) {
+			const services = await dispatch("get_encounter_services");
+			try {
+				return await services.reserveEncounterId(uid);
+			} catch (error) {
+				throw error;
+			}
+		}
+	},
+
 	/**
 	 * Adds a newly created encounter for a user
 	 * A user can only add encounters for themselves so we use the uid from the store
@@ -242,7 +272,10 @@ const encounter_actions = {
 	 * @param {object} encounter
 	 * @returns {string} the id of the newly added encounter
 	 */
-	async add_encounter({ rootGetters, dispatch, commit }, { campaignId, encounter }) {
+	async add_encounter(
+		{ rootGetters, dispatch, commit },
+		{ campaignId, encounter, predefined_key }
+	) {
 		const uid = rootGetters.user ? rootGetters.user.uid : undefined;
 		const available_slots = rootGetters.tier.benefits.encounters;
 
@@ -255,12 +288,16 @@ const encounter_actions = {
 			}
 			try {
 				const search_encounter = convert_encounter(encounter);
-				const id = await services.addEncounter(uid, campaignId, encounter, search_encounter);
+				const id = await services.addEncounter(
+					uid,
+					campaignId,
+					encounter,
+					search_encounter,
+					predefined_key
+				);
 				commit("SET_ENCOUNTER", { uid, campaignId, id, encounter: search_encounter });
-
-				const new_count = await services.updateEncounterCount(uid, campaignId, 1);
-				commit("SET_ENCOUNTER_COUNT", { campaignId, count: new_count });
-				dispatch("checkEncumbrance", "", { root: true });
+				commit("SET_CACHED_ENCOUNTER", { uid, campaignId, encounterId: id, encounter });
+				await dispatch("update_encounter_count", { campaignId });
 				return id;
 			} catch (error) {
 				throw error;
@@ -988,9 +1025,7 @@ const encounter_actions = {
 				commit("REMOVE_ENCOUNTER", { campaignId, id });
 				commit("REMOVE_CACHED_ENCOUNTER", { uid, id });
 
-				const new_count = await services.updateEncounterCount(uid, campaignId, -1);
-				commit("SET_ENCOUNTER_COUNT", { campaignId, count: new_count });
-				dispatch("checkEncumbrance", "", { root: true });
+				await dispatch("update_encounter_count", { campaignId });
 			} catch (error) {
 				throw error;
 			}
@@ -1018,8 +1053,7 @@ const encounter_actions = {
 					}
 
 					const diff = Object.keys(encounters).length;
-					const new_count = await services.updateEncounterCount(uid, campaignId, -diff);
-					commit("SET_ENCOUNTER_COUNT", { campaignId, count: new_count });
+					await dispatch("update_encounter_count", { campaignId });
 				}
 			} catch (error) {
 				throw error;
diff --git a/src/views/Admin/GenerateSearchTable.vue b/src/views/Admin/GenerateSearchTable.vue
index ceb2fe51..9a307314 100644
--- a/src/views/Admin/GenerateSearchTable.vue
+++ b/src/views/Admin/GenerateSearchTable.vue
@@ -2,16 +2,11 @@
 	<hk-card header="Generate Search Tables for Firebase">
 		<div class="card-body">
 			<p>
-				Updates monster values to their correct types. A lot of numbers were saved as strings, but now need to be changed to numbers.
+				Updates monster values to their correct types. A lot of numbers were saved as strings, but
+				now need to be changed to numbers.
 			</p>
 
-			<q-select
-				dark filled square
-				class="select"
-				label="Reference"
-				v-model="ref"
-				:options="refs"
-			/>
+			<q-select dark filled square class="select" label="Reference" v-model="ref" :options="refs" />
 			<a class="btn bnt-large" @click="update()" :disabled="!ref || loading">
 				<i aria-hidden="true" class="fas fa-file-edit" />
 				{{ ref ? `Update ${ref}` : "Select a reference" }}
@@ -24,193 +19,207 @@
 </template>
 
 <script>
-	import { db } from 'src/firebase';
-	import { monsterMixin } from "src/mixins/monster";
-
-	export default {
-		name: 'GenerateSearchTable',
-		mixins: [monsterMixin],
-		data() {
-			return {
-				loading: false,
-				ref: undefined,
-				refs: [
-					'npcs',
-					'custom_items',
-					'reminders',
-					'players',
-					'encounters',
-					'campaigns',
+import { db } from "src/firebase";
+import { monsterMixin } from "src/mixins/monster";
+
+export default {
+	name: "GenerateSearchTable",
+	mixins: [monsterMixin],
+	data() {
+		return {
+			loading: false,
+			ref: undefined,
+			refs: ["npcs", "custom_items", "reminders", "players", "encounters", "campaigns"],
+			search_ref: {
+				npcs: "search_npcs",
+				custom_items: "search_custom_items",
+				reminders: "search_reminders",
+				spells: "search_spells",
+				conditions: "search_conditions",
+				players: "search_players",
+				encounters: "search_encounters",
+				campaigns: "search_campaigns",
+			},
+			search_fields: {
+				npcs: ["name->lower", "challenge_rating", "type", "avatar"],
+				custom_items: ["name", "image"],
+				reminders: ["title"],
+				players: ["character_name", "campaign_id", "companions", "avatar"],
+				// remove encounter:name and campaign:name after db name field conversion
+				encounters: [
+					"encounter:name",
+					"finished",
+					"name",
+					"round",
+					"turn",
+					"entities:entity_count->count",
 				],
-				search_ref: {
-					'npcs': 'search_npcs',
-					'custom_items': 'search_custom_items',
-					'reminders': 'search_reminders',
-					'spells': 'search_spells',
-					'conditions': 'search_conditions',
-					'players': 'search_players',
-					'encounters': 'search_encounters',
-					'campaigns': 'search_campaigns',
-				},
-				search_fields: {
-					'npcs': ['name->lower', 'challenge_rating', 'type', 'avatar'],
-					'custom_items': ['name', 'image'],
-					'reminders': ['title'],
-					'players': ['character_name', 'campaign_id', 'companions', 'avatar'],
-					// remove encounter:name and campaign:name after db name field conversion
-					'encounters': ['encounter:name', 'finished', 'name', 'round', 'turn', 'entities:entity_count->count'],
-					'campaigns': ['campaign:name', 'name', 'timestamp', 'advancement', 'background', 'players:player_count->count', 'private']
-
-				}
+				campaigns: [
+					"campaign:name",
+					"name",
+					"timestamp",
+					"advancement",
+					"background",
+					"players:player_count->count",
+					"private",
+				],
+			},
+		};
+	},
+	methods: {
+		async update() {
+			if (this.ref === undefined) {
+				return;
 			}
-		},
-		methods: {
-			async update() {
-				if (this.ref === undefined) {
-					return
-				}
-				this.loading = true;
-
-				//Fetch the data
-				const ref = db.ref(this.ref);
-				await ref.once('value', async (snapshot) => {
-					const users = snapshot.val();
+			this.loading = true;
 
-					for(let uid in users) {
+			//Fetch the data
+			const ref = db.ref(this.ref);
+			await ref.once("value", async (snapshot) => {
+				const users = snapshot.val();
 
-						if (this.ref === 'encounters') {
-							const campaigns = users[uid];
-							console.group(`%cUser: ${uid}`, "color: #2c97de; font-weight: bold;")
+				for (let uid in users) {
+					if (this.ref === "encounters") {
+						const campaigns = users[uid];
+						console.group(`%cUser: ${uid}`, "color: #2c97de; font-weight: bold;");
 
-							for (const cid in campaigns) {
-								const entries = campaigns[cid]
+						for (const cid in campaigns) {
+							const entries = campaigns[cid];
 
-								for (const key in entries) {
-									let entry = entries[key];
+							for (const key in entries) {
+								let encounter = entries[key];
 
-									// USE THIS TO CHANGE KEY FOR CAMPAIGN NAME FROM CAMPAING TO NAME
-									if (encounter.encounter !== undefined) {
-										if (encounter.name === undefined) {
-											// Encounter name stored in .encounter should be in .name
-											await db.ref(`encounters/${uid}/${cid}/${key}/name`).set(entry.encounter);
-										}
-										// .encounter should be removed
-										await db.ref(`encounters/${uid}/${cid}/${key}/encounter`).remove();
+								// USE THIS TO CHANGE KEY FOR CAMPAIGN NAME FROM CAMPAING TO NAME
+								if (encounter.encounter !== undefined) {
+									if (encounter.name === undefined) {
+										// Encounter name stored in .encounter should be in .name
+										await db.ref(`encounters/${uid}/${cid}/${key}/name`).set(encounter.encounter);
+										encounter.name = encounter.encounter;
 									}
+									// .encounter should be removed
+									await db.ref(`encounters/${uid}/${cid}/${key}/encounter`).remove();
+									delete encounter.encounter;
+								}
 
-									// const search_entry = this.extractFields(entry, this.search_fields[this.ref]);
-									// const search_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/results/${cid}/${key}`);
-									// try {
-									// 	// await search_ref.set(search_entry)
-									// } catch(error) {
-									// 	console.error(`Couldn't update ${this.search_ref[this.ref]} table`, key, entry.name, error, search_entry)
-									// }
+								const search_entry = this.extractFields(encounter, this.search_fields[this.ref]);
+								const search_ref = db.ref(
+									`${this.search_ref[this.ref]}/${uid}/results/${cid}/${key}`
+								);
+								try {
+									await search_ref.set(search_entry);
+								} catch (error) {
+									console.error(
+										`Couldn't update ${this.search_ref[this.ref]} table`,
+										key,
+										encounter.name,
+										error,
+										search_entry
+									);
 								}
-								// const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/${cid}/count`);
-								// await count_ref.set(Object.keys(entries).length);
 							}
-							console.groupEnd();
+							const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/${cid}/count`);
+							await count_ref.set(Object.keys(entries).length);
 						}
-
-						else if (this.ref === 'campaigns') {
-							const campaigns = users[uid];
-							console.group(`%cUser: ${uid}`, "color: #2c97de; font-weight: bold;")
-							for (const cid in campaigns) {
-								const campaign = campaigns[cid]
-								console.log("camp obj",campaign);
-
-								// USE THIS TO CHANGE KEY FOR CAMPAIGN NAME FROM CAMPAING TO NAME
-								if (campaign.campaign !== undefined) {
-									// A campaign key was found so db needs update
-									if (campaign.name === undefined) {
-										// campaign has old campaign key and NO name key. Name needs to be generated
-										await db.ref(`campaigns/${uid}/${cid}/name`).set(campaign.campaign);
-									}
-									// campaign has old campaign key so needs to be removed
-									await db.ref(`campaigns/${uid}/${cid}/campaign`).remove();
+						console.groupEnd();
+					} else if (this.ref === "campaigns") {
+						const campaigns = users[uid];
+						console.group(`%cUser: ${uid}`, "color: #2c97de; font-weight: bold;");
+						for (const cid in campaigns) {
+							const campaign = campaigns[cid];
+							console.log("camp obj", campaign);
+
+							// USE THIS TO CHANGE KEY FOR CAMPAIGN NAME FROM CAMPAING TO NAME
+							if (campaign.campaign !== undefined) {
+								// A campaign key was found so db needs update
+								if (campaign.name === undefined) {
+									// campaign has old campaign key and NO name key. Name needs to be generated
+									await db.ref(`campaigns/${uid}/${cid}/name`).set(campaign.campaign);
 								}
-								// If no campaign key found, no update needed.
-
-
-								// const search_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/results/${cid}`);
-								// const search_entry = this.extractFields(campaign, this.search_fields[this.ref]);
-								// const camp_enc_ref = db.ref(`encounters/${uid}/${cid}`)
-								// const camp_encs = await camp_enc_ref.once('value');
-
-								// // Campaign has no encounters yet
-								// if (camp_encs.val() !== null) {
-								// 	search_entry.encounter_count = Object.keys(camp_encs.val()).length;
-								// }
-								
-								// try {
-								// 	await search_ref.set(search_entry)
-								// } catch(error) {
-								// 	console.error(`Couldn't update ${this.search_ref[this.ref]} table`, cid, campaign.campaign, error, search_entry)
-								// }
-
-								// const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/count`);
-								// await count_ref.set(Object.keys(campaigns).length);
+								// campaign has old campaign key so needs to be removed
+								await db.ref(`campaigns/${uid}/${cid}/campaign`).remove();
 							}
-							console.groupEnd();
-							// const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/count`);
-							// await count_ref.set(Object.keys(campaigns).length);
-						}
+							// If no campaign key found, no update needed.
 
+							// const search_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/results/${cid}`);
+							// const search_entry = this.extractFields(campaign, this.search_fields[this.ref]);
+							// const camp_enc_ref = db.ref(`encounters/${uid}/${cid}`)
+							// const camp_encs = await camp_enc_ref.once('value');
 
-						else {
-							const entries = users[uid];
-							console.group(`%cUser: ${uid}`, "color: #2c97de; font-weight: bold;")
+							// // Campaign has no encounters yet
+							// if (camp_encs.val() !== null) {
+							// 	search_entry.encounter_count = Object.keys(camp_encs.val()).length;
+							// }
 
-							for(let key in entries) {
-								let entry = entries[key];
-								const search_entry = this.extractFields(entry, this.search_fields[this.ref]);
-								const search_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/results/${key}`);
-								try {
-									await search_ref.set(search_entry)
-								} catch(error) {
-									console.error(`Couldn't update ${this.search_ref[this.ref]} table`, key, entry.name, error, search_entry)
-								}	
-							}
-							console.groupEnd();
-							const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/count`);
-							await count_ref.set(Object.keys(entries).length);
-						}
-					}
-				})
-				
-				this.loading = false;
-				console.log(`%cFINISHED.`, "color: #83b547;");
-			},
-			extractFields(entry, fields) {
-				let searchable_entry = {}
-				for (const field of fields) {
-					const [field_name, func] = field.split('->')
-					let [og_field, s_field] = field_name.split(':')
-					if (s_field === undefined) {
-						s_field = og_field;
-					}
-					if (entry.hasOwnProperty(og_field)) {
-						if (func === 'count') {
-							searchable_entry[s_field] = Object.keys(entry[og_field]).length
-						}
-						else if (func === 'lower') {
-							searchable_entry[s_field] = entry[og_field].toLowerCase()
+							// try {
+							// 	await search_ref.set(search_entry)
+							// } catch(error) {
+							// 	console.error(`Couldn't update ${this.search_ref[this.ref]} table`, cid, campaign.campaign, error, search_entry)
+							// }
+
+							// const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/count`);
+							// await count_ref.set(Object.keys(campaigns).length);
 						}
-						else {
-							searchable_entry[s_field] = entry[og_field]
+						console.groupEnd();
+						// const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/count`);
+						// await count_ref.set(Object.keys(campaigns).length);
+					} else {
+						const entries = users[uid];
+						console.group(`%cUser: ${uid}`, "color: #2c97de; font-weight: bold;");
+
+						for (let key in entries) {
+							let entry = entries[key];
+							const search_entry = this.extractFields(entry, this.search_fields[this.ref]);
+							const search_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/results/${key}`);
+							try {
+								await search_ref.set(search_entry);
+							} catch (error) {
+								console.error(
+									`Couldn't update ${this.search_ref[this.ref]} table`,
+									key,
+									entry.name,
+									error,
+									search_entry
+								);
+							}
 						}
+						console.groupEnd();
+						const count_ref = db.ref(`${this.search_ref[this.ref]}/${uid}/metadata/count`);
+						await count_ref.set(Object.keys(entries).length);
 					}
 				}
+			});
 
-				return searchable_entry;
+			this.loading = false;
+			console.log(`%cFINISHED.`, "color: #83b547;");
+		},
+		extractFields(entry, fields) {
+			let searchable_entry = {};
+			for (const field of fields) {
+				const [field_name, func] = field.split("->");
+				let [og_field, s_field] = field_name.split(":");
+				if (s_field === undefined) {
+					s_field = og_field;
+				}
+				if (entry.hasOwnProperty(og_field)) {
+					if (func === "count") {
+						searchable_entry[s_field] = Object.keys(entry[og_field]).length;
+					} else if (func === "lower") {
+						searchable_entry[s_field] = entry[og_field].toLowerCase();
+					} else {
+						searchable_entry[s_field] = entry[og_field];
+					}
+				}
 			}
-		}
-	}
+
+			return searchable_entry;
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
-	.select {
-		max-width: 400px;
-		margin-bottom: 20px;
-	}
-</style>
\ No newline at end of file
+.select {
+	max-width: 400px;
+	margin-bottom: 20px;
+}
+</style>
diff --git a/src/views/UserContent/Campaigns/Campaigns.vue b/src/views/UserContent/Campaigns/Campaigns.vue
index dd371fb3..c27003fc 100644
--- a/src/views/UserContent/Campaigns/Campaigns.vue
+++ b/src/views/UserContent/Campaigns/Campaigns.vue
@@ -320,7 +320,7 @@ export default {
 					timestamp: Date.now(),
 				};
 
-				await this.add_campaign(campaign);
+				await this.add_campaign({ campaign });
 
 				this.newCampaign = "";
 				this.$snotify.success("Campaign added.", "Critical hit!", {