Moved inline cacultion regex to a constant to ensure constistency

Fixed missing import
Notes now have a summary and a description, some data migration my be needed
2021-02-16 10:14:26 +02:00 · 2021-02-12 11:45:32 +02:00 · 2021-02-12 11:44:03 +02:00 · 2021-02-12 11:43:13 +02:00 · 2021-02-12 11:11:12 +02:00 · 2021-02-12 11:00:44 +02:00
201 changed files with 3121 additions and 1847 deletions
--- a/app/.meteor/packages
+++ b/app/.meteor/packages
@@ -53,3 +53,4 @@ peerlibrary:reactive-publish
 simple:rest
 simple:rest-method-mixin
 mikowals:batch-insert
+peerlibrary:subscription-data
--- a/app/.meteor/versions
+++ b/app/.meteor/versions
@@ -95,11 +95,15 @@ ongoworks:speakingurl@9.0.0
 ordered-dict@1.1.0
 patreon-oauth@0.1.0
 peerlibrary:assert@0.3.0
+peerlibrary:check-extension@0.7.0
+peerlibrary:computed-field@0.10.0
+peerlibrary:data-lookup@0.3.0
 peerlibrary:extend-publish@0.6.0
 peerlibrary:fiber-utils@0.10.0
 peerlibrary:reactive-mongo@0.4.0
 peerlibrary:reactive-publish@0.10.0
 peerlibrary:server-autorun@0.8.0
+peerlibrary:subscription-data@0.8.0
 percolate:migrations@0.9.8
 percolate:synced-cron@1.3.2
 promise@0.11.2
--- a/app/client/main.js
+++ b/app/client/main.js
@@ -1,3 +1,3 @@
 import '/imports/ui/vueSetup.js';
 import '/imports/ui/styles/stylesIndex.js';
-import '/imports/ui/styles/stylesIndex.js';
+import '/imports/client/config.js';
--- a/app/grammar.js
+++ b/app/grammar.js
--- a/app/imports/api/creature/CreatureProperties.js
+++ b/app/imports/api/creature/CreatureProperties.js
@@ -1,599 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Mongo } from 'meteor/mongo';
-import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import SimpleSchema from 'simpl-schema';
-import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
-import ChildSchema, { RefSchema } from '/imports/api/parenting/ChildSchema.js';
-import { recomputeCreature } from '/imports/api/creature/computation/recomputeCreature.js';
-import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import Creatures from '/imports/api/creature/Creatures.js';
-import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import { softRemove, restore } from '/imports/api/parenting/softRemove.js';
-import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
-import propertySchemasIndex from '/imports/api/properties/computedPropertySchemasIndex.js';
-import {
-	setLineageOfDocs,
-	getAncestry,
-	renewDocIds
-} from '/imports/api/parenting/parenting.js';
-import {setDocToLastOrder} from '/imports/api/parenting/order.js';
-import { storedIconsSchema } from '/imports/api/icons/Icons.js';
-import { reorderDocs } from '/imports/api/parenting/order.js';
-
-import '/imports/api/creature/actions/doAction.js';
-import '/imports/api/creature/actions/castSpellWithSlot.js';
-import '/imports/api/creature/creatureProperties/manageEquipment.js';
-
-let CreatureProperties = new Mongo.Collection('creatureProperties');
-
-let CreaturePropertySchema = new SimpleSchema({
-	type: {
-    type: String,
-    allowedValues: Object.keys(propertySchemasIndex),
-  },
-	tags: {
-		type: Array,
-		defaultValue: [],
-	},
-	'tags.$': {
-		type: String,
-	},
-	disabled: {
-		type: Boolean,
-		optional: true,
-	},
-  icon: {
-    type: storedIconsSchema,
-    optional: true,
-  },
-  // Denormalised flag if this property is inactive on the sheet for any reason
-  // Including being disabled, or a decendent of a disabled property
-  inactive: {
-    type: Boolean,
-    optional: true,
-    index: 1,
-  },
-  // Denormalised flag if this property was made inactive by an inactive
-  // ancestor. True if this property has an inactive ancestor even if this
-  // property is itself inactive
-  deactivatedByAncestor: {
-    type: Boolean,
-    optional: true,
-    index: 1,
-  },
-});
-
-for (let key in propertySchemasIndex){
-	let schema = new SimpleSchema({});
-	schema.extend(propertySchemasIndex[key]);
-	schema.extend(CreaturePropertySchema);
-  schema.extend(ColorSchema);
-	schema.extend(ChildSchema);
-	schema.extend(SoftRemovableSchema);
-	CreatureProperties.attachSchema(schema, {
-		selector: {type: key}
-	});
-}
-
-export function getCreature(property){
-  if (!property) throw new Meteor.Error('No property provided');
-  let creature = Creatures.findOne(property.ancestors[0].id);
-  if (!creature) throw new Meteor.Error('Creature does not exist');
-  return creature;
-}
-
-function assertPropertyEditPermission(property, userId){
-  let creature = getCreature(property);
-  return assertEditPermission(creature, userId);
-}
-
-function recomputeCreatures(property){
-	for (let ref of property.ancestors){
-		if (ref.collection === 'creatures') {
-      reorderDocs({collection: CreatureProperties, ancestorId: ref.id});
-			recomputeCreature.call({charId: ref.id});
-		}
-	}
-}
-
-const insertProperty = new ValidatedMethod({
-  name: 'creatureProperties.insert',
-	validate: null,
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-  run({creatureProperty}) {
-    delete creatureProperty._id;
-    assertPropertyEditPermission(creatureProperty, this.userId);
-		let _id = CreatureProperties.insert(creatureProperty);
-		let property = CreatureProperties.findOne(_id);
-		recomputeCreatures(property);
-  },
-});
-
-const duplicateProperty = new ValidatedMethod({
-  name: 'creatureProperties.duplicate',
-  validate: new SimpleSchema({
-    _id: {
-      type: String,
-      regEx: SimpleSchema.RegEx.Id,
-    }
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-  run({_id}) {
-    let creatureProperty = CreatureProperties.findOne(_id);
-    assertPropertyEditPermission(creatureProperty, this.userId);
-    delete creatureProperty._id;
-		CreatureProperties.insert(creatureProperty);
-    recomputeCreatures(creatureProperty);
-  },
-});
-
-const insertPropertyFromLibraryNode = new ValidatedMethod({
-	name: 'creatureProperties.insertPropertyFromLibraryNode',
-	validate: new SimpleSchema({
-		nodeId: {
-			type: String,
-			regEx: SimpleSchema.RegEx.Id,
-		},
-		parentRef: {
-			type: RefSchema,
-		},
-	}).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-	run({nodeId, parentRef}) {
-		// get the new ancestry for the properties
-		let {parentDoc, ancestors} = getAncestry({parentRef});
-
-		// Check permission to edit
-		if (parentRef.collection === 'creatures'){
-			assertEditPermission(parentDoc, this.userId);
-		} else if (parentRef.collection === 'creatureProperties'){
-			assertPropertyEditPermission(parentDoc, this.userId);
-		} else {
-			throw `${parentRef.collection} is not a valid parent collection`
-		}
-
-		// Fetch the library node and its decendents, provided they have not been
-		// removed
-		let node = LibraryNodes.findOne({
-			_id: nodeId,
-			removed: {$ne: true},
-		});
-		if (!node) throw `Node not found for nodeId: ${nodeId}`;
-		let oldParent = node.parent;
-		let nodes = LibraryNodes.find({
-			'ancestors.id': nodeId,
-			removed: {$ne: true},
-		}).fetch();
-    // The root node is last in the array of nodes
-		nodes.push(node);
-
-		// re-map all the ancestors
-		setLineageOfDocs({
-			docArray: nodes,
-			newAncestry: ancestors,
-			oldParent,
-		});
-
-		// Give the docs new IDs without breaking internal references
-		renewDocIds({
-			docArray: nodes,
-			collectionMap: {'libraryNodes': 'creatureProperties'}
-		});
-
-		// Order the root node
-		setDocToLastOrder({
-			collection: CreatureProperties,
-			doc: node,
-		});
-
-		// Insert the creature properties
-    let insertedDocIds = CreatureProperties.batchInsert(nodes);
-
-    // get the root inserted doc
-    let rootId = insertedDocIds[insertedDocIds.length - 1];
-
-		// Recompute the creatures doc was attached to
-		recomputeCreatures(node);
-
-		// Return the docId of the last property, the inserted root property
-		return rootId;
-	},
-})
-
-const updateProperty = new ValidatedMethod({
-  name: 'creatureProperties.update',
-  validate({_id, path}){
-		if (!_id) throw new Meteor.Error('No _id', '_id is required');
-		// We cannot change these fields with a simple update
-		switch (path[0]){
-			case 'type':
-      case 'order':
-      case 'parent':
-      case 'ancestors':
-			case 'damage':
-				throw new Meteor.Error('Permission denied',
-				'This property can\'t be updated directly');
-		}
-  },
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-  run({_id, path, value}) {
-    let property = CreatureProperties.findOne(_id);
-    assertPropertyEditPermission(property, this.userId);
-    let pathString = path.join('.');
-    let modifier;
-    // unset empty values
-    if (value === null || value === undefined){
-      modifier = {$unset: {[pathString]: 1}};
-    } else {
-      modifier = {$set: {[pathString]: value}};
-    }
-		CreatureProperties.update(_id, modifier, {
-			selector: {type: property.type},
-		});
-		recomputeCreatures(property);
-  },
-});
-
-export function damagePropertyWork({property, operation, value}){
-  if (operation === 'set'){
-    let currentValue = property.value;
-    // Set represents what we want the value to be after damage
-    // So we need the actual damage to get to that value
-    let damage = currentValue - value;
-    // Damage can't exceed total value
-    if (damage > currentValue) damage = currentValue;
-    // Damage must be positive
-    if (damage < 0) damage = 0;
-    CreatureProperties.update(property._id, {
-      $set: {damage}
-    }, {
-      selector: property
-    });
-    return currentValue - damage;
-  } else if (operation === 'increment'){
-    let currentValue = property.value - (property.damage || 0);
-    let currentDamage = property.damage;
-    let increment = value;
-    // Can't increase damage above the remaining value
-    if (increment > currentValue) increment = currentValue;
-    // Can't decrease damage below zero
-    if (-increment > currentDamage) increment = -currentDamage;
-    CreatureProperties.update(property._id, {
-      $inc: {damage: increment}
-    }, {
-      selector: property
-    });
-    return increment;
-  }
-}
-
-const damagePropertiesByName = new ValidatedMethod({
-  name: 'CreatureProperties.damagePropertiesByName',
-  validate: new SimpleSchema({
-    creatureId: SimpleSchema.RegEx.Id,
-    variableName: {
-      type: String,
-    },
-    operation: {
-      type: String,
-      allowedValues: ['set', 'increment']
-    },
-    value: Number,
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 20,
-    timeInterval: 5000,
-  },
-  run({creatureId, variableName, operation, value}) {
-		// Check permissions
-    let creature = Creatures.findOne(creatureId, {
-      fields: {
-        damageMultipliers: 1,
-        owner: 1,
-        readers: 1,
-        writers: 1,
-      },
-    });
-    assertEditPermission(creature, this.userId);
-    CreatureProperties.find({
-      'ancestors.id': creatureId,
-      variableName,
-      removed: {$ne: false},
-      inactive: {$ne: true},
-    }).forEach(property => {
-      // Check if property can take damage
-      let schema = CreatureProperties.simpleSchema(property);
-      if (!schema.allowsKey('damage')) return;
-      // Damage the property
-      damagePropertyWork({property: property, operation, value})
-    });
-    recomputeCreature.call({charId: creatureId});
-  }
-})
-
-const damageProperty = new ValidatedMethod({
-  name: 'creatureProperties.damage',
-  validate: new SimpleSchema({
-    _id: SimpleSchema.RegEx.Id,
-    operation: {
-      type: String,
-      allowedValues: ['set', 'increment']
-    },
-    value: Number,
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 20,
-    timeInterval: 5000,
-  },
-  run({_id, operation, value}) {
-		let currentProperty = CreatureProperties.findOne(_id);
-		// Check permissions
-		assertPropertyEditPermission(currentProperty, this.userId);
-		// Check if property can take damage
-		let schema = CreatureProperties.simpleSchema(currentProperty);
-		if (!schema.allowsKey('damage')){
-			throw new Meteor.Error(
-				'Damage property failed',
-				`Property of type "${currentProperty.type}" can't be damaged`
-			);
-		}
-		damagePropertyWork({property: currentProperty, operation, value})
-		recomputeCreatures(currentProperty);
-  },
-});
-
-const dealDamage = new ValidatedMethod({
-  name: 'creatureProperties.dealDamage',
-  validate: new SimpleSchema({
-    creatureId: SimpleSchema.RegEx.Id,
-    damageType: {
-      type: String,
-    },
-    amount: Number,
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 20,
-    timeInterval: 5000,
-  },
-  run({creatureId, damageType, amount}) {
-    let creature = Creatures.findOne(creatureId, {
-      fields: {
-        damageMultipliers: 1,
-        owner: 1,
-        readers: 1,
-        writers: 1,
-      },
-    });
-		// Check permissions
-    assertEditPermission(creature, this.userId);
-    let healthBars = CreatureProperties.find({
-      'ancestors.id': creatureId,
-      type: 'attribute',
-      attributeType:'healthBar',
-      removed: {$ne: true},
-      inactive: {$ne: true},
-    }, {
-      sort: {order: -1},
-    });
-    let multiplier = creature.damageMultipliers[damageType];
-    if (multiplier === undefined) multiplier = 1;
-    let totalDamage = Math.floor(amount * multiplier);
-    let damageLeft = totalDamage;
-    if (damageType === 'healing') damageLeft = -totalDamage;
-    healthBars.forEach(healthBar => {
-      if (damageLeft === 0) return;
-      let damageAdded = damagePropertyWork({
-        property: healthBar,
-        operation: 'increment',
-        value: damageLeft,
-      });
-      damageLeft -= damageAdded;
-    });
-    recomputeCreature.call({charId: creatureId});
-    return totalDamage;
-  },
-});
-
-export function adjustQuantityWork({property, operation, value}){
-  // Check if property has quantity
-  let schema = CreatureProperties.simpleSchema(property);
-  if (!schema.allowsKey('quantity')){
-    throw new Meteor.Error(
-      'Adjust quantity failed',
-      `Property of type "${property.type}" doesn't have a quantity`
-    );
-  }
-  if (operation === 'set'){
-    CreatureProperties.update(property._id, {
-      $set: {quantity: value}
-    }, {
-      selector: property
-    });
-  } else if (operation === 'increment'){
-    // value here is 'damage'
-    value = -value;
-    let currentQuantity = property.quantity;
-    if (currentQuantity + value < 0) value = -currentQuantity;
-    CreatureProperties.update(property._id, {
-      $inc: {quantity: value}
-    }, {
-      selector: property
-    });
-  }
-}
-
-const adjustQuantity = new ValidatedMethod({
-  name: 'creatureProperties.adjustQuantity',
-  validate: new SimpleSchema({
-    _id: SimpleSchema.RegEx.Id,
-    operation: {
-      type: String,
-      allowedValues: ['set', 'increment']
-    },
-    value: Number,
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-  run({_id, operation, value}) {
-		let currentProperty = CreatureProperties.findOne(_id);
-		// Check permissions
-		assertPropertyEditPermission(currentProperty, this.userId);
-    adjustQuantityWork({property: currentProperty, operation, value});
-    recomputeCreatures(currentProperty);
-  },
-});
-
-const selectAmmoItem = new ValidatedMethod({
-  name: 'creatureProperties.selectAmmoItem',
-  validate: new SimpleSchema({
-    actionId: SimpleSchema.RegEx.Id,
-    itemId: SimpleSchema.RegEx.Id,
-    itemConsumedIndex: Number,
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-  run({actionId, itemId, itemConsumedIndex}) {
-		let action = CreatureProperties.findOne(actionId);
-		// Check permissions
-		assertPropertyEditPermission(action, this.userId);
-    // Check that this index has a document to edit
-    let itemConsumed = action.resources.itemsConsumed[itemConsumedIndex];
-    if (!itemConsumed){
-      throw new Meteor.Error('Resouce not found',
-        'Could not set ammo, because the ammo document was not found');
-    }
-    let itemToLink = CreatureProperties.findOne(itemId);
-    if (!itemToLink){
-      throw new Meteor.Error('Item not found',
-        'Could not set ammo: the item was not found');
-    }
-    let path = `resources.itemsConsumed.${itemConsumedIndex}.itemId`;
-    CreatureProperties.update(actionId, {
-      $set: {[path]: itemId}
-    }, {
-      selector: action,
-    });
-    recomputeCreatures(action);
-  },
-});
-
-const pushToProperty = new ValidatedMethod({
-	name: 'creatureProperties.push',
-	validate: null,
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-	run({_id, path, value}){
-		let property = CreatureProperties.findOne(_id);
-    assertPropertyEditPermission(property, this.userId);
-		CreatureProperties.update(_id, {
-			$push: {[path.join('.')]: value},
-		}, {
-			selector: {type: property.type},
-		});
-		recomputeCreatures(property);
-	}
-});
-
-const pullFromProperty = new ValidatedMethod({
-	name: 'creatureProperties.pull',
-	validate: null,
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-	run({_id, path, itemId}){
-		let property = CreatureProperties.findOne(_id);
-    assertPropertyEditPermission(property, this.userId);
-		CreatureProperties.update(_id, {
-			$pull: {[path.join('.')]: {_id: itemId}},
-		}, {
-			selector: {type: property.type},
-			getAutoValues: false,
-		});
-		recomputeCreatures(property);
-	}
-});
-
-const softRemoveProperty = new ValidatedMethod({
-	name: 'creatureProperties.softRemove',
-	validate: new SimpleSchema({
-		_id: SimpleSchema.RegEx.Id
-	}).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-	run({_id}){
-		let property = CreatureProperties.findOne(_id);
-    assertPropertyEditPermission(property, this.userId);
-		softRemove({_id, collection: CreatureProperties});
-		recomputeCreatures(property);
-	}
-});
-
-const restoreProperty = new ValidatedMethod({
-	name: 'creatureProperties.restore',
-	validate: new SimpleSchema({
-		_id: SimpleSchema.RegEx.Id
-	}).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 5,
-    timeInterval: 5000,
-  },
-	run({_id}){
-		let property = CreatureProperties.findOne(_id);
-    assertPropertyEditPermission(property, this.userId);
-		restore({_id, collection: CreatureProperties});
-		recomputeCreatures(property);
-	}
-});
-
-export default CreatureProperties;
-export {
-	CreaturePropertySchema,
-	insertProperty,
-  duplicateProperty,
-	insertPropertyFromLibraryNode,
-	updateProperty,
-  dealDamage,
-  damagePropertiesByName,
-	damageProperty,
-  adjustQuantity,
-  selectAmmoItem,
-	pushToProperty,
-	pullFromProperty,
-  softRemoveProperty,
-	restoreProperty,
-};
--- a/app/imports/api/creature/Creatures.js
+++ b/app/imports/api/creature/Creatures.js
@@ -4,7 +4,7 @@ import SimpleSchema from 'simpl-schema';
 import deathSaveSchema from '/imports/api/properties/subSchemas/DeathSavesSchema.js'
 import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
 import SharingSchema from '/imports/api/sharing/SharingSchema.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
 import { assertUserHasPaidBenefits } from '/imports/api/users/patreon/tiers.js';

--- a/app/imports/api/creature/actions/applyAction.js
+++ b/app/imports/api/creature/actions/applyAction.js
@@ -1,11 +1,24 @@
 import spendResources from '/imports/api/creature/actions/spendResources.js'
-import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
+import embedInlineCalculations from '/imports/api/creature/computation/afterComputation/embedInlineCalculations.js';

-export default function applyAction({prop, creature}){
+export default function applyAction({prop, log}){
  spendResources(prop);
-  insertCreatureLog.call({
-    log: {
-      text: prop.name,
-      creatureId: creature._id},
-  });
+  // If this is not the top level action, we can add its name to the log
+  if (log.content.length){
+    log.content.push({name: prop.name});
+  }
+  if (prop.summary){
+    log.content.push({
+      description: embedInlineCalculations(
+        prop.summary, prop.summaryCalculations
+      ),
+    });
+  }
+  if (prop.description){
+    log.content.push({
+      description: embedInlineCalculations(
+        prop.description, prop.descriptionCalculations
+      ),
+    });
+  }
 }
--- a/app/imports/api/creature/actions/applyAdjustment.js
+++ b/app/imports/api/creature/actions/applyAdjustment.js
@@ -1,12 +1,12 @@
 import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
-import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
-import { damagePropertiesByName } from '/imports/api/creature/CreatureProperties.js';
+import damagePropertiesByName from '/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js';

 export default function applyAdjustment({
  prop,
  creature,
  targets,
-  actionContext
+  actionContext,
+  log
 }){
  let damageTargets = prop.target === 'self' ? [creature] : targets;
  let scope = {
@@ -16,16 +16,10 @@ export default function applyAdjustment({
  try {
    var {result, errors} = evaluateString(prop.amount, scope, 'reduce');
    if (typeof result !== 'number') {
-      return insertCreatureLog.call({ log: {
-        text: errors.join(', ') || 'Something went wrong',
-        creatureId: creature._id,
-      }});
+      log.content.push({error: errors.join(', ') || 'Something went wrong'});
    }
  } catch (e){
-    return insertCreatureLog.call({ log: {
-      text: e.toString(),
-      creatureId: creature._id,
-    }});
+    log.content.push({error: e.toString()});
  }
  if (damageTargets) {
    damageTargets.forEach(target => {
@@ -38,19 +32,15 @@ export default function applyAdjustment({
        operation: prop.operation || 'increment',
        value: result
      });
-      insertCreatureLog.call({
-        log: {
-          text: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''} ${-result}`,
-          creatureId: target._id,
-        }
+      log.content.push({
+        resultPrefix: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''}`,
+        result: `${-result}`,
      });
    });
  } else {
-    insertCreatureLog.call({
-      log: {
-        text: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''} ${-result}`,
-        creatureId: creature._id,
-      }
+    log.content.push({
+      resultPrefix: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''}`,
+      result: `${-result}`,
    });
  }
 }
--- a/app/imports/api/creature/actions/applyAttack.js
+++ b/app/imports/api/creature/actions/applyAttack.js
@@ -1,18 +1,14 @@
 import roll from '/imports/parser/roll.js';
-import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';

 export default function applyAttack({
  prop,
-  //children,
-  creature,
-  //targets,
-  //actionContext
+  log,
 }){
  let result = roll(1, 20)[0] + prop.rollBonusResult;
-  insertCreatureLog.call({
-    log: {
-      text: `${prop.name} attack. ${result} to hit`,
-      creatureId: creature._id,
-    }
+  log.content.push({
+    // If this is not the first item in the log content, give it a name
+    name: log.content.length ? prop.name + ' attack' : undefined,
+    result,
+    details: 'to hit',
  });
 }
--- a/app/imports/api/creature/actions/applyBuff.js
+++ b/app/imports/api/creature/actions/applyBuff.js
@@ -3,7 +3,7 @@ import {
 	renewDocIds
 } from '/imports/api/parenting/parenting.js';
 import {setDocToLastOrder} from '/imports/api/parenting/order.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';

 export default function applyBuff({
  prop,
--- a/app/imports/api/creature/actions/applyDamage.js
+++ b/app/imports/api/creature/actions/applyDamage.js
@@ -1,12 +1,13 @@
 import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+import dealDamage from '/imports/api/creature/creatureProperties/methods/dealDamage.js';
 import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
-import { dealDamage } from '/imports/api/creature/CreatureProperties.js';

 export default function applyDamage({
  prop,
  creature,
  targets,
-  actionContext
+  actionContext,
+  log,
 }){
  let damageTargets = prop.target === 'self' ? [creature] : targets;
  let scope = {
@@ -16,18 +17,16 @@ export default function applyDamage({
  try {
    var {result, errors} = evaluateString(prop.amount, scope, 'reduce');
    if (typeof result !== 'number') {
-      return insertCreatureLog.call({ log: {
-        text: errors.join(', '),
-        creatureId: creature._id,
-      }});
+      log.content.push({
+        error: errors.join(', '),
+      });
    }
  } catch (e){
-    return insertCreatureLog.call({ log: {
-      text: e.toString(),
-      creatureId: creature._id,
-    }});
+    log.content.push({
+      error: e.toString(),
+    });
  }
-  if (damageTargets) {
+  if (damageTargets && damageTargets.length) {
    damageTargets.forEach(target => {
      if (prop.target === 'each'){
        result = evaluateString(prop.amount, scope, 'reduce');
@@ -37,27 +36,37 @@ export default function applyDamage({
        damageType: prop.damageType,
        amount: result,
      });
-      insertCreatureLog.call({
-        log: {
-          text: `Recieved ${damageDealt} ${prop.damageType}${prop.damageType !== 'healing'? ' damage': ''}`,
-          creatureId: target._id,
-        }
-      });
-      if (target._id !== creature._id){
+      if (target._id === creature._id){
+        log.content.push({
+          result: damageDealt,
+          details: `${prop.damageType}`+
+            `${prop.damageType !== 'healing' ? ' damage': ''} to self`,
+        });
+      } else {
+        log.content.push({
+          resultPrefix: 'Dealt ',
+          result: damageDealt,
+          details: `${prop.damageType}` +
+            `${prop.damageType !== 'healing'? ' damage': ''}` +
+            `${target.name && ' to '}${target.name}`,
+        });
        insertCreatureLog.call({
          log: {
-            text: `Dealt ${damageDealt} ${prop.damageType}${prop.damageType !== 'healing'? ' damage': ''}`,
-            creatureId: creature._id,
+            content: [{
+              resultPrefix: 'Recieved ',
+              result: damageDealt,
+              details: `${prop.damageType}` +
+                `${prop.damageType !== 'healing'? ' damage': ''}`
+            }],
+            creatureId: target._id,
          }
        });
      }
    });
  } else {
-    insertCreatureLog.call({
-      log: {
-        text: `${result} ${prop.damageType}${prop.damageType !== 'healing'? ' damage': ''}`,
-        creatureId: creature._id,
-      }
+    log.content.push({
+      result,
+      details: `${prop.damageType}${prop.damageType !== 'healing'? ' damage': ''}`,
    });
  }
 }
--- a/app/imports/api/creature/actions/applyProperties.js
+++ b/app/imports/api/creature/actions/applyProperties.js
@@ -6,46 +6,49 @@ import applyBuff from '/imports/api/creature/actions/applyBuff.js';

 function applyProperty(options){
  let prop = options.prop;
-  if (
-    prop.disabled === true || // ignore disabled props
-    prop.equipped === false || // ignore unequipped items
-    prop.toggleResult === false || // ignore untoggled toggles
-    prop.applied === true // ignore buffs that are already applied
-  ){
+  if (prop.type === 'buff'){
+    // ignore only applied buffs
+    if (prop.applied === true){
+      return false;
+    }
+  // Ignore inactive props of other types
+  } else if (prop.inactive === true){
    return false;
  }
  switch (prop.type){
    case 'action':
    case 'spell':
      applyAction(options);
-      return true;
+      break;
    case 'attack':
      applyAction(options);
      applyAttack(options);
-      return true;
+      break;
    case 'damage':
      applyDamage(options);
-      return true;
+      break;
    case 'adjustment':
      applyAdjustment(options);
-      return true;
+      break;
    case 'buff':
      applyBuff(options);
-      return false;
+      break;
    case 'roll':
      // applyRoll(options);
-      return true;
+      break;
    case 'savingThrow':
      // applySavingThrow(options);
-      return false;
+      break;
  }
+  return true;
 }

 export default function applyProperties({
  forest,
  creature,
  targets,
-  actionContext
+  actionContext,
+  log,
 }){
  forest.forEach(child => {
    let walkChildren = applyProperty({
@@ -53,14 +56,16 @@ export default function applyProperties({
      children: child.children,
      creature,
      targets,
-      actionContext
+      actionContext,
+      log,
    });
    if (walkChildren){
      applyProperties({
        forest: child.children,
        creature,
        targets,
-        actionContext
+        actionContext,
+        log,
      });
    }
  });
--- a/app/imports/api/creature/actions/castSpellWithSlot.js
+++ b/app/imports/api/creature/actions/castSpellWithSlot.js
@@ -1,10 +1,13 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import CreatureProperties, { getCreature, damagePropertyWork } from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
-import { recomputeCreatureByDoc } from '/imports/api/creature/computation/recomputeCreature.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 import { doActionWork } from '/imports/api/creature/actions/doAction.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';

 const castSpellWithSlot = new ValidatedMethod({
  name: 'creatureProperties.castSpellWithSlot',
@@ -29,11 +32,11 @@ const castSpellWithSlot = new ValidatedMethod({
  run({spellId, slotId, targetId}) {
    let spell = CreatureProperties.findOne(spellId);
 		// Check permissions
-    let creature = getCreature(spell);
+    let creature = getRootCreatureAncestor(spell);
    assertEditPermission(creature, this.userId);
    let target = undefined;
    if (targetId) {
-      target = getCreature(targetId);
+      target = Creatures.findOne(targetId);
      assertEditPermission(target, this.userId);
    }
    let slotLevel = spell.level || 0;
@@ -63,6 +66,7 @@ const castSpellWithSlot = new ValidatedMethod({
      context: {slotLevel},
      creature,
      target,
+      method: this,
    });
    // Note this only recomputes the top-level creature, not the nearest one
 		recomputeCreatureByDoc(creature);
--- a/app/imports/api/creature/actions/doAction.js
+++ b/app/imports/api/creature/actions/doAction.js
@@ -1,9 +1,12 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import CreatureProperties, { getCreature } from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureLogs, { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
-import { recomputeCreatureByDoc } from '/imports/api/creature/computation/recomputeCreature.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 import { nodesToTree } from '/imports/api/parenting/parenting.js';
 import applyProperties from '/imports/api/creature/actions/applyProperties.js';

@@ -11,10 +14,15 @@ const doAction = new ValidatedMethod({
  name: 'creatureProperties.doAction',
  validate: new SimpleSchema({
    actionId: SimpleSchema.RegEx.Id,
-    targetId: {
+    targetIds: {
+      type: Array,
+      defaultValue: [],
+      maxCount: 10,
+      optional: true,
+    },
+    'targetIds.$': {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
-      optional: true,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
@@ -22,26 +30,41 @@ const doAction = new ValidatedMethod({
    numRequests: 10,
    timeInterval: 5000,
  },
-  run({actionId, targetId}) {
+  run({actionId, targetIds = []}) {
    let action = CreatureProperties.findOne(actionId);
 		// Check permissions
-    let creature = getCreature(action);
+    let creature = getRootCreatureAncestor(action);
    assertEditPermission(creature, this.userId);
-    let target = undefined;
-    if (targetId) {
-      target = getCreature(targetId);
+    let targets = [];
+    targetIds.forEach(targetId => {
+      let target = Creatures.findOne(targetId);
      assertEditPermission(target, this.userId);
-    }
-		doActionWork({action, creature, target});
-    // Note this only recomputes the top-level creature, not the nearest one
+      targets.push(target);
+    });
+		doActionWork({action, creature, targets, method: this});
+
+    // recompute creatures
 		recomputeCreatureByDoc(creature);
-    if (target){
+    targets.forEach(target => {
      recomputeCreatureByDoc(target);
-    }
+    });
  },
 });

-export function doActionWork({action, creature, target, context = {}}){
+export function doActionWork({
+  action,
+  creature,
+  targets,
+  context = {},
+  method
+}){
+  // Create the log
+  let log = CreatureLogSchema.clean({
+    name: action.name,
+    creatureId: creature._id,
+    creatureName: creature.name,
+  });
+
  let decendantForest = nodesToTree({
    collection: CreatureProperties,
    ancestorId: action._id,
@@ -54,8 +77,10 @@ export function doActionWork({action, creature, target, context = {}}){
    forest: startingForest,
    actionContext: context,
    creature,
-    target,
+    targets,
+    log,
  });
+  insertCreatureLogWork({log, creature, method});
 }

 export default doAction;
--- a/app/imports/api/creature/actions/spendResources.js
+++ b/app/imports/api/creature/actions/spendResources.js
@@ -1,4 +1,6 @@
-import CreatureProperties, { damagePropertyWork, adjustQuantityWork } from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';

 export default function spendResources(action){
  // Check Uses
--- a/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js
+++ b/app/imports/api/creature/computation/afterComputation/embedInlineCalculations.js
@@ -0,0 +1,11 @@
+import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js';
+
+export default function embedInlineCalculations(string, calculations){
+  if (!string) return '';
+  if (!calculations) return string;
+  let index = 0;
+  return string.replace(INLINE_CALCULATION_REGEX, () => {
+    let comp = calculations && calculations[index++];
+    return comp && comp.result ? comp.result : string;
+  });
+}
--- a/app/imports/api/creature/computation/afterComputation/evaluateString.js
+++ b/app/imports/api/creature/computation/afterComputation/evaluateString.js
@@ -18,7 +18,6 @@ export default function evaluateString(string, scope, fn = 'compile'){
    errors.push(e);
    return {result: string, errors};
  }
-
  let context = new CompilationContext();
  let result = node[fn](scope, context);
  if (result instanceof ConstantNode){
--- a/app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js
+++ b/app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js
@@ -2,6 +2,8 @@ import evaluateString from '/imports/api/creature/computation/afterComputation/e

 // Strings can have computations in bracers like so: {computation}
 export default function evalutateStringWithEmbeddedCalculations(string, scope){
+  console.warn('evalutateStringWithEmbeddedCalculations should be replaced with ' +
+  'fetching the result from the compuations on the property doc');
 	if (!string) return string;
  // Compute everything inside bracers
 	return string.replace(/\{([^{}]*)\}/g, function(match, p1){
--- a/app/imports/api/creature/computation/engine/ComputationMemo.js
+++ b/app/imports/api/creature/computation/engine/ComputationMemo.js
@@ -1,10 +1,12 @@
 import { includes, cloneDeep } from 'lodash';
+import findAncestorByType from '/imports/api/creature/computation/engine/findAncestorByType.js';

 // The computation memo is an in-memory data structure used only during the
 // computation process
 export default class ComputationMemo {
  constructor(props, creature){
    this.statsByVariableName = {};
+    this.constantsByVariableName = {};
    this.extraStatsByVariableName = {};
    this.statsById = {};
    this.originalPropsById = {};
@@ -50,13 +52,15 @@ export default class ComputationMemo {
        return true;
      }
    }).forEach((prop) => {
-      // Now add all effects and proficiencies
+      // Now add everything else
      if (prop.type === 'effect'){
        this.addEffect(prop);
      } else if (prop.type === 'proficiency') {
        this.addProficiency(prop);
      } else if (prop.type === 'classLevel'){
        this.addClassLevel(prop);
+      } else if (prop.type === 'constant'){
+        this.addConstant(prop);
      } else {
        this.addEndStepProp(prop);
      }
@@ -71,9 +75,18 @@ export default class ComputationMemo {
      }
    }
  }
+  addConstant(prop){
+    prop = this.registerProperty(prop);
+    if (
+      !this.constantsByVariableName[prop.variableName]
+    ){
+      this.constantsByVariableName[prop.variableName] = prop
+    }
+  }
  registerProperty(prop){
    this.originalPropsById[prop._id] = cloneDeep(prop);
    this.propsById[prop._id] = prop;
+    prop.dependencies = [];
    prop.computationDetails = propDetails(prop);
    prop.ancestors.forEach(ancestor => {
      if (this.toggleIds.has(ancestor.id)){
@@ -104,6 +117,7 @@ export default class ComputationMemo {
          stats: [variableName],
          computationDetails: propDetailsByType.effect(),
          statBase: true,
+          dependencies: [],
        });
      }
      if (prop.baseProficiency){
@@ -113,6 +127,7 @@ export default class ComputationMemo {
          computationDetails: propDetailsByType.proficiency(),
          type: 'proficiency',
          statBase: true,
+          dependencies: [],
        });
      }
    } else {
@@ -138,7 +153,7 @@ export default class ComputationMemo {
    prop = this.registerProperty(prop);
    let targets = this.getEffectTargets(prop);
    targets.forEach(target => {
-      if (target.computationDetails.effects){
+      if (target.computationDetails && target.computationDetails.effects){
        target.computationDetails.effects.push(prop);
      }
    });
@@ -150,7 +165,16 @@ export default class ComputationMemo {
    let targets = new Set();
    if (!prop.stats) return targets;
    prop.stats.forEach((statName) => {
-      let target = this.statsByVariableName[statName];
+      let target;
+      if (statName[0] === '#'){
+        target = findAncestorByType({
+          type: statName.slice(1),
+          prop,
+          memo: this
+        });
+      } else {
+        target = this.statsByVariableName[statName];
+      }
      if (!target) return;
      targets.add(target);
      if (isSkillOperation(prop) && isAbility(target)){
--- a/app/imports/api/creature/computation/engine/EffectAggregator.js
+++ b/app/imports/api/creature/computation/engine/EffectAggregator.js
@@ -1,11 +1,24 @@
-import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import { union } from 'lodash';

 export default class EffectAggregator{
  constructor(stat, memo){
    delete this.baseValueErrors;
    if (stat.baseValueCalculation){
-      let {result, context} = evaluateCalculation(stat.baseValueCalculation, memo);
+      let {
+        result,
+        context,
+        dependencies
+      } = evaluateCalculation({
+        string: stat.baseValueCalculation,
+        prop: stat,
+        memo
+      });
      this.statBaseValue = result.value;
+      stat.dependencies = union(
+        stat.dependencies,
+        dependencies,
+      );
      if (context.errors.length){
        this.baseValueErrors = context.errors;
      }
@@ -19,7 +32,7 @@ export default class EffectAggregator{
    this.max = Number.POSITIVE_INFINITY;
    this.advantage = 0;
    this.disadvantage = 0;
-    this.passiveAdd = 0;
+    this.passiveAdd = undefined;
    this.fail = 0;
    this.set = undefined;
    this.conditional = [];
@@ -69,6 +82,7 @@ export default class EffectAggregator{
        break;
      case 'passiveAdd':
        // Add all passive adds together
+        if (this.passiveAdd === undefined) this.passiveAdd = 0;
        this.passiveAdd += result;
        break;
      case 'fail':
--- a/app/imports/api/creature/computation/engine/applyToggles.js
+++ b/app/imports/api/creature/computation/engine/applyToggles.js
@@ -1,9 +1,15 @@
-import computeToggle from '/imports/api/creature/computation/computeToggle.js';
+import computeToggle from '/imports/api/creature/computation/engine/computeToggle.js';
+import { union } from 'lodash';

 export default function applyToggles(prop, memo){
  prop.computationDetails.toggleAncestors.forEach(toggleId => {
    let toggle = memo.togglesById[toggleId];
    computeToggle(toggle, memo);
+    prop.dependencies = union(
+      prop.dependencies,
+      [toggle._id],
+      toggle.dependencies,
+    );
    if (!toggle.toggleResult){
      prop.computationDetails.disabledByToggle = true;
    }
--- a/app/imports/api/creature/computation/engine/combineStat.js
+++ b/app/imports/api/creature/computation/engine/combineStat.js
@@ -1,6 +1,7 @@
-import computeStat from '/imports/api/creature/computation/computeStat.js';
-import applyToggles from '/imports/api/creature/computation/applyToggles.js';
-import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+import computeStat from '/imports/api/creature/computation/engine/computeStat.js';
+import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import { union } from 'lodash';

 export default function combineStat(stat, aggregator, memo){
  if (stat.type === 'attribute'){
@@ -34,14 +35,40 @@ function combineAttribute(stat, aggregator, memo){
  stat.baseValue = aggregator.statBaseValue;
  stat.baseValueErrors = aggregator.baseValueErrors;
  if (stat.attributeType === 'spellSlot'){
-    let {result, context} = evaluateCalculation(stat.spellSlotLevelCalculation, memo);
+    let {
+      result,
+      context,
+      dependencies
+    } = evaluateCalculation({
+      string: stat.spellSlotLevelCalculation,
+      memo,
+      prop: stat,
+    });
    stat.spellSlotLevelValue = result.value;
    stat.spellSlotLevelErrors = context.errors;
+    stat.dependencies = union(stat.dependencies, dependencies);
  }
  stat.currentValue = stat.value - (stat.damage || 0);
+  // Ability scores get modifiers
  if (stat.attributeType === 'ability') {
    stat.modifier = Math.floor((stat.currentValue - 10) / 2);
+  } else {
+    stat.modifier = undefined;
  }
+  // Hit dice get constitution modifiers
+  stat.constitutionMod = undefined;
+  if (stat.attributeType === 'hitDice') {
+    let conStat = memo.statsByVariableName['constitution'];
+    if (conStat && 'modifier' in conStat){
+      stat.constitutionMod = conStat.modifier;
+      stat.dependencies = union(
+        stat.dependencies,
+        [conStat._id],
+        conStat.dependencies,
+      );
+    }
+  }
+  // Stats that have no effects can be hidden based on a sheet setting
  stat.hide = aggregator.hasNoEffects &&
    stat.baseValue === undefined ||
    undefined
@@ -55,6 +82,11 @@ function combineSkill(stat, aggregator, memo){
      computeStat(ability, memo);
    }
    stat.abilityMod = ability.modifier;
+    stat.dependencies = union(
+      stat.dependencies,
+      [ability._id],
+      ability.dependencies,
+    );
  }
  // Combine all the child proficiencies
  stat.proficiency = stat.baseProficiency || 0;
@@ -66,6 +98,11 @@ function combineSkill(stat, aggregator, memo){
      prof.value > stat.proficiency
    ){
      stat.proficiency = prof.value;
+      stat.dependencies = union(
+        stat.dependencies,
+        [prof._id],
+        prof.dependencies,
+      );
    }
  }
  // Get the character's proficiency bonus to apply
@@ -75,6 +112,18 @@ function combineSkill(stat, aggregator, memo){
  if (typeof profBonus !== 'number' && memo.statsByVariableName['level']){
    let level = memo.statsByVariableName['level'].value;
    profBonus = Math.ceil(level / 4) + 1;
+    if (level._id){
+      stat.dependencies = union(stat.dependencies, [level._id]);
+    }
+    if (level.dependencies){
+      stat.dependencies = union(stat.dependencies, level.dependencies);
+    }
+  } else {
+    stat.dependencies = union(
+      stat.dependencies,
+      [profBonusStat._id],
+      profBonusStat.dependencies,
+    );
  }
  // Multiply the proficiency bonus by the actual proficiency
  profBonus *= stat.proficiency;
--- a/app/imports/api/creature/computation/engine/computeEffect.js
+++ b/app/imports/api/creature/computation/engine/computeEffect.js
@@ -1,5 +1,6 @@
-import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
-import applyToggles from '/imports/api/creature/computation/applyToggles.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+import { union } from 'lodash';

 export default function computeEffect(effect, memo){
  if (effect.computationDetails.computed) return;
@@ -34,8 +35,17 @@ export default function computeEffect(effect, memo){
  } else if(_.contains(['advantage', 'disadvantage', 'fail'], effect.operation)){
    effect.result = 1;
  } else {
-    let {result, context} = evaluateCalculation(effect.calculation, memo);
+    let {
+      result,
+      context,
+      dependencies,
+    } = evaluateCalculation({
+      string: effect.calculation,
+      prop: effect,
+      memo
+    });
    effect.result = result.value;
+    effect.dependencies = union(effect.dependencies, dependencies);
    if (context.errors.length){
      effect.errors = context.errors;
    }
--- a/app/imports/api/creature/computation/engine/computeEndStepProperty.js
+++ b/app/imports/api/creature/computation/engine/computeEndStepProperty.js
@@ -1,4 +1,6 @@
-import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
+import { union } from 'lodash';

 export default function computeEndStepProperty(prop, memo){
  switch (prop.type){
@@ -6,6 +8,10 @@ export default function computeEndStepProperty(prop, memo){
    case 'spell':
      computeAction(prop, memo);
      break;
+    case 'adjustment':
+    case 'damage':
+      computePropertyField(prop, memo, 'amount', 'compile');
+      break;
    case 'attack':
      computeAction(prop, memo);
      computeAttack(prop, memo);
@@ -18,13 +24,19 @@ export default function computeEndStepProperty(prop, memo){
      break;
    case 'propertySlot':
      computeSlot(prop, memo);
+      break;
  }
 }

 function computeAction(prop, memo){
  // Uses
-  let {result, context} = evaluateCalculation(prop.uses, memo);
+  let {
+    result,
+    context,
+    dependencies,
+  } = evaluateCalculation({ string: prop.uses, prop, memo});
  prop.usesResult = result.value;
+  prop.dependencies = union(prop.dependencies, dependencies);
  if (context.errors.length){
    prop.usesErrors = context.errors;
  } else {
@@ -46,6 +58,13 @@ function computeAction(prop, memo){
      if (available < attConsumed.quantity){
        prop.insufficientResources = true;
      }
+      if (stat){
+        prop.dependencies = union(
+          prop.dependencies,
+          [stat._id],
+          stat.dependencies
+        );
+      }
    }
  });
  // Items consumed
@@ -64,12 +83,28 @@ function computeAction(prop, memo){
    if (!item || available < itemConsumed.quantity){
      prop.insufficientResources = true;
    }
+    if (item){
+      prop.dependencies = union(
+        prop.dependencies,
+        [item._id],
+        item.dependencies
+      );
+    }
  });
 }

 function computePropertyField(prop, memo, fieldName, fn){
-  let {result, context} = evaluateCalculation(prop[fieldName], memo, fn);
-  prop[`${fieldName}Result`] = result.value;
+  let {
+    result,
+    context,
+    dependencies,
+  } = evaluateCalculation({string: prop[fieldName], prop, memo, fn});
+  if (result instanceof ConstantNode){
+    prop[`${fieldName}Result`] = result.value;
+  } else {
+    prop[`${fieldName}Result`] = result.toString();
+  }
+  prop.dependencies = union(prop.dependencies, dependencies);
  if (context.errors.length){
    prop[`${fieldName}Errors`] = context.errors;
  } else {
--- a/app/imports/api/creature/computation/engine/computeInlineCalculations.js
+++ b/app/imports/api/creature/computation/engine/computeInlineCalculations.js
@@ -0,0 +1,40 @@
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js';
+import ErrorNode from '/imports/parser/parseTree/ErrorNode.js';
+import { union } from 'lodash';
+
+export default function computeInlineCalculations(prop, memo){
+  if (prop.summary){
+    computeInlineCalcsForField(prop, memo, 'summary');
+  }
+  if (prop.description){
+    computeInlineCalcsForField(prop, memo, 'description');
+  }
+}
+
+function computeInlineCalcsForField(prop, memo, field){
+  let string = prop[field];
+  let inlineComputations = [];
+  let matches = string.matchAll(INLINE_CALCULATION_REGEX);
+  for (let match of matches){
+    let calculation = match[1];
+    let {
+      result,
+      context,
+      dependencies,
+    } = evaluateCalculation({string: calculation, prop, memo, fn: 'compile'});
+    if (result instanceof ErrorNode){
+      result = '`Calculation Error`';
+    }
+    let computation = {
+      calculation,
+      result: result && result.toString(),
+    };
+    if (context.errors.length){
+      computation.errors = context.errors;
+    }
+    inlineComputations.push(computation);
+    prop.dependencies = union(prop.dependencies, dependencies);
+  }
+  prop[`${field}Calculations`] = inlineComputations;
+}
--- a/app/imports/api/creature/computation/engine/computeLevels.js
+++ b/app/imports/api/creature/computation/engine/computeLevels.js
@@ -1,4 +1,4 @@
-import { forOwn, has } from 'lodash';
+import { forOwn, has, union } from 'lodash';

 export default function computeLevels(memo){
  computeClassLevels(memo);
@@ -7,6 +7,11 @@ export default function computeLevels(memo){

 function computeClassLevels(memo){
  forOwn(memo.classLevelsById, classLevel => {
+    //  class levels are mutually dependent
+    classLevel.dependencies = union(
+      classLevel.dependencies,
+      Object.keys(memo.classLevelsById)
+    );
    let name = classLevel.variableName;
    let stat = memo.statsByVariableName[name];
    if (!stat){
@@ -27,6 +32,7 @@ function computeTotalLevel(memo){
  if (!currentLevel){
    currentLevel = {
      value: 0,
+      dependencies: [],
      computationDetails: {
        builtIn: true,
        computed: true,
@@ -38,7 +44,20 @@ function computeTotalLevel(memo){
  if (!currentLevel.computationDetails.builtIn) return;
  let level = 0;
  for (let name in memo.classes){
-    level += memo.classes[name].level || 0;
+    let cls = memo.classes[name];
+    level += cls.level || 0;
+    if (cls._id){
+      currentLevel.dependencies = union(
+        currentLevel.dependencies,
+        [cls._id]
+      )
+    }
+    if (cls.dependencies){
+      currentLevel.dependencies = union(
+        currentLevel.dependencies,
+        cls.dependencies,
+      )
+    }
  }
-  memo.statsByVariableName['level'].value = level;
+  currentLevel.value = level;
 }
--- a/app/imports/api/creature/computation/engine/computeMemo.js
+++ b/app/imports/api/creature/computation/engine/computeMemo.js
@@ -1,9 +1,10 @@
 import { each, forOwn } from 'lodash';
-import computeLevels from '/imports/api/creature/computation/computeLevels.js';
-import computeStat from '/imports/api/creature/computation/computeStat.js';
-import computeEffect from '/imports/api/creature/computation/computeEffect.js';
-import computeToggle from '/imports/api/creature/computation/computeToggle.js';
-import computeEndStepProperty from '/imports/api/creature/computation/computeEndStepProperty.js';
+import computeLevels from '/imports/api/creature/computation/engine/computeLevels.js';
+import computeStat from '/imports/api/creature/computation/engine/computeStat.js';
+import computeEffect from '/imports/api/creature/computation/engine/computeEffect.js';
+import computeToggle from '/imports/api/creature/computation/engine/computeToggle.js';
+import computeEndStepProperty from '/imports/api/creature/computation/engine/computeEndStepProperty.js';
+import computeInlineCalculations from '/imports/api/creature/computation/engine/computeInlineCalculations.js';

 export default function computeMemo(memo){
  // Compute level
@@ -24,4 +25,8 @@ export default function computeMemo(memo){
  forOwn(memo.endStepPropsById, prop => {
    computeEndStepProperty(prop, memo);
  });
+  // Compute inline calculations
+  forOwn(memo.propsById, prop => {
+    computeInlineCalculations(prop, memo);
+  });
 }
--- a/app/imports/api/creature/computation/engine/computeStat.js
+++ b/app/imports/api/creature/computation/engine/computeStat.js
@@ -1,8 +1,8 @@
-import combineStat from '/imports/api/creature/computation/combineStat.js';
-import computeEffect from '/imports/api/creature/computation/computeEffect.js';
-import EffectAggregator from '/imports/api/creature/computation/EffectAggregator.js';
-import applyToggles from '/imports/api/creature/computation/applyToggles.js';
-import { each } from 'lodash';
+import combineStat from '/imports/api/creature/computation/engine/combineStat.js';
+import computeEffect from '/imports/api/creature/computation/engine/computeEffect.js';
+import EffectAggregator from '/imports/api/creature/computation/engine/EffectAggregator.js';
+import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+import { each, union } from 'lodash';

 export default function computeStat(stat, memo){
  // If the stat is already computed, skip it
@@ -27,6 +27,16 @@ export default function computeStat(stat, memo){
    let aggregator = new EffectAggregator(stat, memo)
    each(stat.computationDetails.effects, (effect) => {
      computeEffect(effect, memo);
+      if (effect._id){
+        stat.dependencies = union(
+          stat.dependencies,
+          [effect._id]
+        );
+      }
+      stat.dependencies = union(
+        stat.dependencies,
+        effect.dependencies
+      )
      if (!effect.computationDetails.disabledByToggle){
        aggregator.addEffect(effect);
      }
--- a/app/imports/api/creature/computation/engine/computeToggle.js
+++ b/app/imports/api/creature/computation/engine/computeToggle.js
@@ -1,4 +1,5 @@
-import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import { union } from 'lodash';

 export default function computeToggle(toggle, memo){
  if (toggle.computationDetails.computed) return;
@@ -26,8 +27,16 @@ export default function computeToggle(toggle, memo){
  } else if (Number.isFinite(+toggle.condition)){
    toggle.toggleResult = !!+toggle.condition;
  } else {
-    let {result, context} = evaluateCalculation(toggle.condition, memo);
+    let {
+      result,
+      context,
+      dependencies,
+    } = evaluateCalculation({string: toggle.condition, prop: toggle, memo});
    toggle.toggleResult = !!result.value;
+    toggle.dependencies = union(
+      toggle.dependencies,
+      dependencies,
+    );
    if (context.errors.length){
      toggle.errors = context.errors;
    }
--- a/app/imports/api/creature/computation/engine/evaluateCalculation.js
+++ b/app/imports/api/creature/computation/engine/evaluateCalculation.js
@@ -0,0 +1,130 @@
+import computeStat from '/imports/api/creature/computation/engine/computeStat.js';
+import { prettifyParseError, parse, CompilationContext } from '/imports/parser/parser.js';
+import SymbolNode from '/imports/parser/parseTree/SymbolNode.js';
+import AccessorNode from '/imports/parser/parseTree/AccessorNode.js';
+import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
+import ErrorNode from '/imports/parser/parseTree/ErrorNode.js';
+import findAncestorByType from '/imports/api/creature/computation/engine/findAncestorByType.js';
+import { union } from 'lodash';
+
+/* Convert a calculation into a constant output and errors*/
+export default function evaluateCalculation({
+  string,
+  prop,
+  memo,
+  fn = 'reduce',
+}){
+  let dependencies = [];
+  let context = new CompilationContext();
+  if (!string) return {
+    result: new ConstantNode({value: string, type: 'string'}),
+    context,
+    dependencies,
+  };
+  // Parse the string
+  let calc;
+  try {
+    calc = parse(string);
+  } catch (e) {
+    let error = prettifyParseError(e);
+    return {
+      result: new ErrorNode({context, error}),
+      context,
+      dependencies,
+    };
+  }
+
+  // Replace constants with their parsed constant
+  let replaceResults = replaceConstants({
+    calc, memo, prop, dependencies, context
+  });
+  dependencies = replaceResults.dependencies;
+  calc = replaceResults.calc;
+  if (replaceResults.failed){
+    return {
+      result: new ConstantNode({value: string, type: 'string'}),
+      context,
+      dependencies,
+    };
+  }
+
+  // Ensure all symbol nodes are defined and computed
+  dependencies = computeSymbols({calc, memo, prop, dependencies})
+
+  // Evaluate
+  let result = calc[fn](memo.statsByVariableName, context);
+  return {result, context, dependencies};
+}
+
+// Replace constants in the calc with the right ParseNodes
+function replaceConstants({calc, memo, prop, dependencies, context}){
+  let constFailed = [];
+  calc = calc.replaceNodes(node => {
+    if (!(node instanceof SymbolNode)) return;
+    let stat, constant;
+    if (node.name[0] !== '#'){
+      stat = memo.statsByVariableName[node.name]
+      constant = memo.constantsByVariableName[node.name];
+    } else if (node.name === '#constant'){
+      constant = findAncestorByType({type: 'constant', prop, memo});
+    }
+    // replace constants that aren't overridden by stats
+    if (constant && !stat){
+      dependencies = union(dependencies, [
+        constant._id,
+        ...constant.dependencies
+      ]);
+      // Fail if the constant has errors
+      if (constant.errors && constant.errors.length){
+        constFailed.push(node.name);
+        return;
+      }
+      let parsedConstantNode;
+      try {
+        parsedConstantNode = parse(constant.calculation);
+      } catch(e){
+        constFailed.push(node.name);
+        return;
+      }
+      if (!parsedConstantNode) constFailed.push(node.name);
+      return parsedConstantNode;
+    }
+  });
+  constFailed.forEach(name => {
+    context.storeError({
+      type: 'error',
+      message: `${name} is a constant property with parsing errors`
+    });
+  });
+  let failed = !!constFailed.length;
+  if (failed){
+    calc = new ErrorNode({error: 'Failed to replace constants'});
+  }
+  return { failed, dependencies, calc };
+}
+
+  // Ensure all symbol nodes are defined and computed
+function computeSymbols({calc, memo, prop, dependencies}){
+  calc.traverse(node => {
+    if (node instanceof SymbolNode || node instanceof AccessorNode){
+      let stat;
+      // References up the tree start with #
+      if (node.name[0] === '#'){
+        stat = findAncestorByType({type: node.name.slice(1), prop, memo});
+        memo.statsByVariableName[node.name] = stat;
+      } else {
+        stat = memo.statsByVariableName[node.name];
+      }
+      if (stat && stat.computationDetails && !stat.computationDetails.computed){
+        computeStat(stat, memo);
+      }
+      if (stat){
+        dependencies = union(dependencies, [
+          stat._id || node.name,
+          ...stat.dependencies
+        ]);
+      }
+    }
+  });
+  return dependencies;
+}
--- a/app/imports/api/creature/computation/engine/findAncestorByType.js
+++ b/app/imports/api/creature/computation/engine/findAncestorByType.js
@@ -0,0 +1,10 @@
+export default function findAncestorByType({type, prop, memo}){
+  if (!prop || !prop.ancestors) return;
+  let ancestor;
+  for (let i = prop.ancestors.length - 1; i >= 0; i--){
+    ancestor = memo.propsById[prop.ancestors[i].id];
+    if (ancestor && ancestor.type === type){
+      return ancestor;
+    }
+  }
+}
--- a/app/imports/api/creature/computation/engine/getComputationProperties.js
+++ b/app/imports/api/creature/computation/engine/getComputationProperties.js
@@ -0,0 +1,35 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+
+export default function getComputationProperties(creatureId){
+  // find ids of all toggles that have conditions, even if they are inactive
+  let toggleIds = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    type: 'toggle',
+    removed: {$ne: true},
+    condition: { $exists: true },
+  }, {
+    fields: {_id: 1},
+  }).map(t => t._id);
+  // Find all the relevant properties
+  return CreatureProperties.find({
+    'ancestors.id': creatureId,
+    removed: {$ne: true},
+    $or: [
+      // All active properties
+      {inactive: {$ne: true}},
+      // All active and inactive toggles with conditions
+      // Same as {$in: toggleIds}, but should be slightly faster
+      {type: 'toggle', condition: { $exists: true }},
+      // All decendents of the above toggles
+      {'ancestors.id': {$in: toggleIds}},
+    ]
+  }, {
+    // Filter out fields never used by calculations
+    fields: {
+      icon: 0,
+    },
+    sort: {
+      order: 1,
+    }
+  }).fetch();
+}
--- a/app/imports/api/creature/computation/engine/getDependentProperties.js
+++ b/app/imports/api/creature/computation/engine/getDependentProperties.js
@@ -0,0 +1,51 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { union } from 'lodash';
+
+export default function getDependentProperties({
+  creatureId,
+  propertyIds,
+  propertiesDependedAponIds,
+ }){
+  // find ids of all dependant toggles that have conditions, even if inactive
+  let toggleIds = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    type: 'toggle',
+    removed: {$ne: true},
+    condition: { $exists: true },
+    dependencies: {$in: propertyIds},
+  }, {
+    fields: {_id: 1},
+  }).map(t => t._id);
+  // Find all the dependant properties
+  let props = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    removed: {$ne: true},
+    dependencies: {$in: propertyIds},
+    $or: [
+      // All active properties
+      {inactive: {$ne: true}},
+      // All active and inactive toggles with conditions
+      // Same as {$in: toggleIds}, but should be slightly faster
+      {type: 'toggle', condition: { $exists: true }},
+      // All decendents of the above toggles
+      {'ancestors.id': {$in: toggleIds}},
+    ]
+  }, { fields: {_id: 1, dependencies: 1} }).fetch();
+  // Add all the properties that changing props depend on, but haven't yet been
+  // included to make an array of every property we need
+  let allConnectedPropIds = [...propertyIds, ...propertiesDependedAponIds];
+  props.forEach(prop => {
+    allConnectedPropIds = union(
+      allConnectedPropIds,
+      prop.dependencies,
+      [prop._id]);
+  });
+  // Add on all the properties and the objects they depend apon
+  return CreatureProperties.find({
+    _id: {$in: allConnectedPropIds}
+  }, {
+    // Ignore fields not used in computations
+    fields: {icon: 0},
+    sort: {order: 1},
+  }).fetch();
+}
--- a/app/imports/api/creature/computation/engine/writeAlteredProperties.js
+++ b/app/imports/api/creature/computation/engine/writeAlteredProperties.js
@@ -1,38 +1,13 @@
 import { Meteor } from 'meteor/meteor'
 import { isEqual, forOwn } from 'lodash';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
-// Schemas
-// Calculated props
-import { ComputedOnlySkillSchema } from '/imports/api/properties/Skills.js';
-import { ComputedOnlyAttributeSchema } from '/imports/api/properties/Attributes.js';
-import { ComputedOnlyEffectSchema } from '/imports/api/properties/Effects.js';
-import { ComputedOnlyToggleSchema } from '/imports/api/properties/Toggles.js';
-// End step props
-import { ComputedOnlyActionSchema } from '/imports/api/properties/Actions.js';
-import { ComputedOnlyAttackSchema } from '/imports/api/properties/Attacks.js';
-import { ComputedOnlySavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
-import { ComputedOnlySpellListSchema } from '/imports/api/properties/SpellLists.js';
-import { ComputedOnlySpellSchema } from '/imports/api/properties/Spells.js';
-import { ComputedOnlySlotSchema } from '/imports/api/properties/Slots.js';
-
-const schemasByType = {
-  'skill': ComputedOnlySkillSchema,
-  'attribute': ComputedOnlyAttributeSchema,
-  'effect': ComputedOnlyEffectSchema,
-  'toggle': ComputedOnlyToggleSchema,
-  'action': ComputedOnlyActionSchema,
-  'attack': ComputedOnlyAttackSchema,
-  'savingThrow': ComputedOnlySavingThrowSchema,
-  'spellList': ComputedOnlySpellListSchema,
-  'spell': ComputedOnlySpellSchema,
-  'propertySlot': ComputedOnlySlotSchema,
-};
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import propertySchemasIndex from '/imports/api/properties/computedOnlyPropertySchemasIndex.js';

 export default function writeAlteredProperties(memo){
  let bulkWriteOperations = [];
  // Loop through all properties on the memo
  forOwn(memo.propsById, changed => {
-    let schema = schemasByType[changed.type];
+    let schema = propertySchemasIndex[changed.type];
    if (!schema) return;
    let extraIds = changed.computationDetails.idsOfSameName;
    let ids;
@@ -44,13 +19,14 @@ export default function writeAlteredProperties(memo){
    ids.forEach(id => {
      let op = undefined;
      let original = memo.originalPropsById[id];
-      op = addChangedKeysToOp(op, schema.objectKeys(), original, changed);
+      let keys = ['dependencies', ...schema.objectKeys()];
+      op = addChangedKeysToOp(op, keys, original, changed);
      if (op){
        bulkWriteOperations.push(op);
      }
    });
  });
-  bulkWriteProperties(bulkWriteOperations);
+  writePropertiesSequentially(bulkWriteOperations);
 }

 function addChangedKeysToOp(op, keys, original, changed) {
@@ -101,8 +77,27 @@ function addUnsetOp(op, key){
  }
 }

+// We use this instead of bulkWriteProperties because it functions with latency
+// compensation without needing to roll back changes, which causes multiple
+// expensive redraws of the character sheet
+function writePropertiesSequentially(bulkWriteOps){
+  bulkWriteOps.forEach(op => {
+    let updateOneOrMany = op.updateOne || op.updateMany;
+    CreatureProperties.update(updateOneOrMany.filter, updateOneOrMany.update, {
+      // The bulk code is bypassing validation, so do the same here
+      // selector: {type: op.type} // include this if bypass is off
+      bypassCollection2: true,
+    });
+  });
+}
+
+// This is more efficient on the database, but significantly less efficient
+// in the UI because of incompatibility with latency compensation. If the
+// duplicate redraws can be fixed, this is a strictly better way of processing
+// writes
 function bulkWriteProperties(bulkWriteOps){
  if (!bulkWriteOps.length) return;
+  // bulkWrite is only available on the server
  if (Meteor.isServer){
    CreatureProperties.rawCollection().bulkWrite(
      bulkWriteOps,
@@ -115,15 +110,6 @@ function bulkWriteProperties(bulkWriteOps){
      }
    );
  } else {
-    bulkWriteOps.forEach(op => {
-      let updateOneOrMany = op.updateOne || op.updateMany;
-      CreatureProperties.update(updateOneOrMany.filter, updateOneOrMany.update, {
-        // The server code is bypassing collection 2 validation, so do the same
-        // on the client
-        // include this if bypass is off:
-        // selector: {type: op.type}
-        bypassCollection2: true,
-      });
-    });
+    writePropertiesSequentially(bulkWriteOps);
  }
 }
--- a/app/imports/api/creature/computation/engine/writeCreatureVariables.js
+++ b/app/imports/api/creature/computation/engine/writeCreatureVariables.js
@@ -0,0 +1,49 @@
+import { pick, forOwn } from 'lodash';
+import Creatures from '/imports/api/creature/Creatures.js';
+import VERSION from '/imports/constants/VERSION.js';
+
+export default function writeCreatureVariables(memo, creatureId, fullRecompute = true) {
+  const fields = [
+    'name',
+    'attributeType',
+    'baseValue',
+    'spellSlotLevelValue',
+    'damage',
+    'decimal',
+    'reset',
+    'resetMultiplier',
+    'value',
+    'currentValue',
+    'modifier',
+    'ability',
+    'skillType',
+    'baseProficiency',
+    'abilityMod',
+    'advantage',
+    'passiveBonus',
+    'proficiency',
+    'conditionalBenefits',
+    'rollBonuses',
+    'fail',
+    'level',
+  ];
+
+  if (fullRecompute){
+    memo.creatureVariables = {};
+    forOwn(memo.statsByVariableName, (stat, variableName) => {
+      let condensedStat = pick(stat, fields);
+      memo.creatureVariables[variableName] = condensedStat;
+    });
+    Creatures.update(creatureId, {$set: {
+      variables: memo.creatureVariables,
+      computeVersion: VERSION,
+    }});
+  } else {
+    let $set = {};
+    forOwn(memo.statsByVariableName, (stat, variableName) => {
+      let condensedStat = pick(stat, fields);
+      $set[`variables.${variableName}`] = condensedStat;
+    });
+    Creatures.update(creatureId, {$set});
+  }
+}
--- a/app/imports/api/creature/computation/evaluateCalculation.js
+++ b/app/imports/api/creature/computation/evaluateCalculation.js
@@ -1,41 +0,0 @@
-import computeStat from '/imports/api/creature/computation/computeStat.js';
-import { parse, CompilationContext } from '/imports/parser/parser.js';
-import SymbolNode from '/imports/parser/parseTree/SymbolNode.js';
-import AccessorNode from '/imports/parser/parseTree/AccessorNode.js';
-import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
-
-/* Convert a calculation into a constant output and errors*/
-export default function evaluateCalculation(string, memo, fn = 'reduce'){
-  if (!string) return {
-    context: {errors: []},
-    result: new ConstantNode({value: string, type: 'string'}),
-  };
-  let errors = [];
-  // Parse the string
-  let calc;
-  try {
-    calc = parse(string);
-  } catch (e) {
-    errors.push({
-      type: 'parsing',
-      message: e.message || e
-    });
-    return {
-      context: {errors},
-      result: new ConstantNode({value: string, type: 'string'}),
-    };
-  }
-  // Ensure all symbol nodes are defined and coputed
-  calc.traverse(node => {
-    if (node instanceof SymbolNode || node instanceof AccessorNode){
-      let stat = memo.statsByVariableName[node.name];
-      if (stat && !stat.computationDetails.computed){
-        computeStat(stat, memo);
-      }
-    }
-  });
-  // Evaluate
-  let context = new CompilationContext();
-  let result = calc[fn](memo.statsByVariableName, context);
-  return {result, context};
-}
--- a/app/imports/api/creature/computation/methods/recomputeCreature.js
+++ b/app/imports/api/creature/computation/methods/recomputeCreature.js
@@ -2,15 +2,17 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
-import ComputationMemo from '/imports/api/creature/computation/ComputationMemo.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
-import computeMemo from '/imports/api/creature/computation/computeMemo.js';
-import writeAlteredProperties from '/imports/api/creature/computation/writeAlteredProperties.js';
-import writeCreatureVariables from '/imports/api/creature/computation/writeCreatureVariables.js';
+import ComputationMemo from '/imports/api/creature/computation/engine/ComputationMemo.js';
+import getComputationProperties from '/imports/api/creature/computation/engine/getComputationProperties.js';
+import computeMemo from '/imports/api/creature/computation/engine/computeMemo.js';
+import writeAlteredProperties from '/imports/api/creature/computation/engine/writeAlteredProperties.js';
+import writeCreatureVariables from '/imports/api/creature/computation/engine/writeCreatureVariables.js';
 import { recomputeDamageMultipliersById } from '/imports/api/creature/denormalise/recomputeDamageMultipliers.js';
-import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
 import recomputeSlotFullness from '/imports/api/creature/denormalise/recomputeSlotFullness.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import getDependentProperties from '/imports/api/creature/computation/engine/getDependentProperties.js';
 import Creatures from '/imports/api/creature/Creatures.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';

 export const recomputeCreature = new ValidatedMethod({

@@ -37,23 +39,6 @@ export const recomputeCreature = new ValidatedMethod({

 });

-const calculationPropertyTypes = [
-  'attribute',
-  'skill',
-  'effect',
-  'proficiency',
-  'classLevel',
-  'toggle',
-  'item',
-  // End step types
-  'action',
-  'attack',
-  'savingThrow',
-  'spellList',
-  'spell',
-  'propertySlot',
-];
-
 export function recomputeCreatureById(creatureId){
  let creature = Creatures.findOne(creatureId);
  recomputeCreatureByDoc(creature);
@@ -97,42 +82,40 @@ export function recomputeCreatureById(creatureId){
 */
 export function recomputeCreatureByDoc(creature){
  const creatureId = creature._id;
-  // find all toggles that have conditions, even if they are inactive
-  let toggleIds = CreatureProperties.find({
-    'ancestors.id': creatureId,
-    type: 'toggle',
-    removed: {$ne: true},
-    condition: { $exists: true },
-  }, {
-    fields: {_id: 1},
-  }).map(t => t._id);
-  // Find all the active properties
-  let props = CreatureProperties.find({
-    'ancestors.id': creatureId,
-    removed: {$ne: true},
-    type: {$in: calculationPropertyTypes},
-    $or: [
-      {inactive: {$ne: true}},
-      // But also the inactive computed toggles and their decendants
-      {'ancestors.id': {$in: toggleIds}},
-      {_id: {$in: toggleIds}},
-    ]
-  }, {
-    fields: { // Filter out potentially large fields
-      icon: 0,
-      summary: 0,
-      description: 0,
-    },
-    sort: {
-      order: 1,
-    }
-  }).fetch();
+  let props = getComputationProperties(creatureId);
  let computationMemo = new ComputationMemo(props, creature);
-  recomputeInactiveProperties(creatureId);
  computeMemo(computationMemo);
  writeAlteredProperties(computationMemo);
  writeCreatureVariables(computationMemo, creatureId);
  recomputeDamageMultipliersById(creatureId);
  recomputeSlotFullness(creatureId);
+  recomputeInactiveProperties(creatureId);
+  return computationMemo;
+}
+
+export function recomputePropertyDependencies(property){
+  let creature = getRootCreatureAncestor(property);
+  recomputeCreatureByDependencies({
+    creature,
+    propertyIds: [property._id],
+    propertiesDependedAponIds: property.dependencies,
+  });
+}
+
+export function recomputeCreatureByDependencies({
+  creature,
+  propertyIds,
+  propertiesDependedAponIds
+}){
+  let props = getDependentProperties({
+    creatureId: creature._id,
+    propertyIds,
+    propertiesDependedAponIds,
+  });
+  let computationMemo = new ComputationMemo(props, creature);
+  computeMemo(computationMemo);
+  writeAlteredProperties(computationMemo);
+  writeCreatureVariables(computationMemo, creature._id, false)
+  recomputeInactiveProperties(creature._id);
  return computationMemo;
 }
--- a/app/imports/api/creature/computation/writeCreatureVariables.js
+++ b/app/imports/api/creature/computation/writeCreatureVariables.js
@@ -1,40 +0,0 @@
-import { pick, forOwn } from 'lodash';
-import Creatures from '/imports/api/creature/Creatures.js';
-import VERSION from '/imports/constants/VERSION.js';
-
-export default function writeCreatureVariables(memo, creatureId) {
-  const fields = [
-    'name',
-    'attributeType',
-    'baseValue',
-    'spellSlotLevelValue',
-    'damage',
-    'decimal',
-    'reset',
-    'resetMultiplier',
-    'value',
-    'currentValue',
-    'modifier',
-    'ability',
-    'skillType',
-    'baseProficiency',
-    'abilityMod',
-    'advantage',
-    'passiveBonus',
-    'proficiency',
-    'conditionalBenefits',
-    'rollBonuses',
-    'fail',
-    'level',
-  ];
-
-  memo.creatureVariables = {};
-  forOwn(memo.statsByVariableName, (stat, variableName) => {
-    let condensedStat = pick(stat, fields);
-    memo.creatureVariables[variableName] = condensedStat;
-  });
-  Creatures.update(creatureId, {$set: {
-    variables: memo.creatureVariables,
-    computeVersion: VERSION,
-  }});
-}
--- a/app/imports/api/creature/creatureProperties/CreatureProperties.js
+++ b/app/imports/api/creature/creatureProperties/CreatureProperties.js
@@ -0,0 +1,77 @@
+import { Mongo } from 'meteor/mongo';
+import SimpleSchema from 'simpl-schema';
+import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
+import ChildSchema from '/imports/api/parenting/ChildSchema.js';
+import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
+import propertySchemasIndex from '/imports/api/properties/computedPropertySchemasIndex.js';
+import { storedIconsSchema } from '/imports/api/icons/Icons.js';
+
+let CreatureProperties = new Mongo.Collection('creatureProperties');
+
+let CreaturePropertySchema = new SimpleSchema({
+	type: {
+    type: String,
+    allowedValues: Object.keys(propertySchemasIndex),
+  },
+	tags: {
+		type: Array,
+		defaultValue: [],
+	},
+	'tags.$': {
+		type: String,
+	},
+	disabled: {
+		type: Boolean,
+		optional: true,
+	},
+  icon: {
+    type: storedIconsSchema,
+    optional: true,
+  },
+  // Denormalised flag if this property is inactive on the sheet for any reason
+  // Including being disabled, or a decendent of a disabled property
+  inactive: {
+    type: Boolean,
+    optional: true,
+    index: 1,
+  },
+  // Denormalised flag if this property was made inactive by an inactive
+  // ancestor. True if this property has an inactive ancestor even if this
+  // property is itself inactive
+  deactivatedByAncestor: {
+    type: Boolean,
+    optional: true,
+    index: 1,
+  },
+  // Denormalised list of all properties or creatures this property depends on
+  dependencies: {
+    type: Array,
+    defaultValue: [],
+    index: 1,
+  },
+  'dependencies.$': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+  },
+});
+
+for (let key in propertySchemasIndex){
+	let schema = new SimpleSchema({});
+	schema.extend(propertySchemasIndex[key]);
+	schema.extend(CreaturePropertySchema);
+  schema.extend(ColorSchema);
+	schema.extend(ChildSchema);
+	schema.extend(SoftRemovableSchema);
+	CreatureProperties.attachSchema(schema, {
+		selector: {type: key}
+	});
+}
+
+import '/imports/api/creature/creatureProperties/methods/index.js';
+import '/imports/api/creature/actions/doAction.js';
+import '/imports/api/creature/actions/castSpellWithSlot.js';
+
+export default CreatureProperties;
+export {
+	CreaturePropertySchema,
+};
--- a/app/imports/api/creature/creatureProperties/assertPropertyEditPermission.js
+++ b/app/imports/api/creature/creatureProperties/assertPropertyEditPermission.js
@@ -1,7 +0,0 @@
-import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import getClosestPropertyAncestorCreature from '/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js';
-
-export default function assertPropertyEditPermission(prop, userId){
-  let creature = getClosestPropertyAncestorCreature(prop);
-  assertEditPermission(creature, userId);
-}
--- a/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js
+++ b/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js
@@ -1,7 +0,0 @@
-import Creatures from '/imports/api/creature/Creatures.js';
-import getClosestPropertyAncestorCreatureId from '/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreatureId.js';
-
-export default function getClosestPropertyAncestorCreature(prop){
-  let creatureId = getClosestPropertyAncestorCreatureId(prop);
-  return Creatures.findOne(creatureId);
-}
--- a/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreatureId.js
+++ b/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreatureId.js
@@ -1,13 +0,0 @@
-export default function getClosestPropertyAncestorCreatureId(prop){
-  if (!prop.ancestors) throw 'Property has no ancestors';
-  let creatureId;
-  // Find the last ancestor in the creature collection
-  for (let i = prop.ancestors.length - 1; i >= 0; i--){
-    if (prop.ancestors[i].collection === 'creatures'){
-      creatureId = prop.ancestors[i].id;
-      break;
-    }
-  }
-  if (!creatureId) throw 'This property has no creature ancestors';
-  return creatureId;
-}
--- a/app/imports/api/creature/creatureProperties/getRootCreatureAncestor.js
+++ b/app/imports/api/creature/creatureProperties/getRootCreatureAncestor.js
@@ -0,0 +1,5 @@
+import Creatures from '/imports/api/creature/Creatures.js';
+
+export default function getRootCreatureAncestor(property){
+  return Creatures.findOne(property.ancestors[0].id);
+}
--- a/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js
+++ b/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js
@@ -0,0 +1,66 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { recomputePropertyDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const adjustQuantity = new ValidatedMethod({
+  name: 'creatureProperties.adjustQuantity',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id,
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, operation, value}) {
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+		assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+    adjustQuantityWork({property, operation, value});
+
+    // Changing quantity does not change dependencies, recompute deps
+    recomputePropertyDependencies(property);
+  },
+});
+
+export function adjustQuantityWork({property, operation, value}){
+  // Check if property has quantity
+  let schema = CreatureProperties.simpleSchema(property);
+  if (!schema.allowsKey('quantity')){
+    throw new Meteor.Error(
+      'Adjust quantity failed',
+      `Property of type "${property.type}" doesn't have a quantity`
+    );
+  }
+  if (operation === 'set'){
+    CreatureProperties.update(property._id, {
+      $set: {quantity: value}
+    }, {
+      selector: property
+    });
+  } else if (operation === 'increment'){
+    // value here is 'damage'
+    value = -value;
+    let currentQuantity = property.quantity;
+    if (currentQuantity + value < 0) value = -currentQuantity;
+    CreatureProperties.update(property._id, {
+      $inc: {quantity: value}
+    }, {
+      selector: property
+    });
+  }
+}
+
+export default adjustQuantity;
--- a/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
+++ b/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
@@ -0,0 +1,57 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import { recomputePropertyDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const damagePropertiesByName = new ValidatedMethod({
+  name: 'CreatureProperties.damagePropertiesByName',
+  validate: new SimpleSchema({
+    creatureId: SimpleSchema.RegEx.Id,
+    variableName: {
+      type: String,
+    },
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 20,
+    timeInterval: 5000,
+  },
+  run({creatureId, variableName, operation, value}) {
+		// Check permissions
+    let creature = Creatures.findOne(creatureId, {
+      fields: {
+        damageMultipliers: 1,
+        owner: 1,
+        readers: 1,
+        writers: 1,
+      },
+    });
+    assertEditPermission(creature, this.userId);
+    let lastProperty;
+    CreatureProperties.find({
+      'ancestors.id': creatureId,
+      variableName,
+      removed: {$ne: false},
+      inactive: {$ne: true},
+    }).forEach(property => {
+      // Check if property can take damage
+      let schema = CreatureProperties.simpleSchema(property);
+      if (!schema.allowsKey('damage')) return;
+      // Damage the property
+      damagePropertyWork({property, operation, value});
+      lastProperty = property;
+    });
+    recomputePropertyDependencies(lastProperty);
+  }
+});
+
+export default damagePropertiesByName;
--- a/app/imports/api/creature/creatureProperties/methods/damageProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
@@ -0,0 +1,76 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { recomputePropertyDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const damageProperty = new ValidatedMethod({
+  name: 'creatureProperties.damage',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id,
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 20,
+    timeInterval: 5000,
+  },
+  run({_id, operation, value}) {
+    // Check permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+		// Check if property can take damage
+		let schema = CreatureProperties.simpleSchema(property);
+		if (!schema.allowsKey('damage')){
+			throw new Meteor.Error(
+				'Damage property failed',
+				`Property of type "${property.type}" can't be damaged`
+			);
+		}
+		damagePropertyWork({property, operation, value});
+    // Dependencies can't be changed through damage, only recompute deps
+    recomputePropertyDependencies(property);
+  },
+});
+
+export function damagePropertyWork({property, operation, value}){
+  if (operation === 'set'){
+    let currentValue = property.value;
+    // Set represents what we want the value to be after damage
+    // So we need the actual damage to get to that value
+    let damage = currentValue - value;
+    // Damage can't exceed total value
+    if (damage > currentValue) damage = currentValue;
+    // Damage must be positive
+    if (damage < 0) damage = 0;
+    CreatureProperties.update(property._id, {
+      $set: {damage}
+    }, {
+      selector: property
+    });
+    return currentValue - damage;
+  } else if (operation === 'increment'){
+    let currentValue = property.value - (property.damage || 0);
+    let currentDamage = property.damage;
+    let increment = value;
+    // Can't increase damage above the remaining value
+    if (increment > currentValue) increment = currentValue;
+    // Can't decrease damage below zero
+    if (-increment > currentDamage) increment = -currentDamage;
+    CreatureProperties.update(property._id, {
+      $inc: {damage: increment}
+    }, {
+      selector: property
+    });
+    return increment;
+  }
+}
+
+export default damageProperty;
--- a/app/imports/api/creature/creatureProperties/methods/dealDamage.js
+++ b/app/imports/api/creature/creatureProperties/methods/dealDamage.js
@@ -0,0 +1,73 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import { recomputeCreatureByDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const dealDamage = new ValidatedMethod({
+  name: 'creatureProperties.dealDamage',
+  validate: new SimpleSchema({
+    creatureId: SimpleSchema.RegEx.Id,
+    damageType: {
+      type: String,
+    },
+    amount: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 20,
+    timeInterval: 5000,
+  },
+  run({creatureId, damageType, amount}) {
+    // permissions
+    let creature = Creatures.findOne(creatureId, {
+      fields: {
+        damageMultipliers: 1,
+        owner: 1,
+        readers: 1,
+        writers: 1,
+      },
+    });
+    assertEditPermission(creature, this.userId);
+
+    // Get all the health bars and do damage to them
+    let healthBars = CreatureProperties.find({
+      'ancestors.id': creatureId,
+      type: 'attribute',
+      attributeType:'healthBar',
+      removed: {$ne: true},
+      inactive: {$ne: true},
+    }, {
+      sort: {order: -1},
+    });
+    let multiplier = creature.damageMultipliers[damageType];
+    if (multiplier === undefined) multiplier = 1;
+    let totalDamage = Math.floor(amount * multiplier);
+    let damageLeft = totalDamage;
+    if (damageType === 'healing') damageLeft = -totalDamage;
+    let propertyIds = [];
+    let propertiesDependedAponIds = [];
+    healthBars.forEach(healthBar => {
+      if (damageLeft === 0) return;
+      let damageAdded = damagePropertyWork({
+        property: healthBar,
+        operation: 'increment',
+        value: damageLeft,
+      });
+      damageLeft -= damageAdded;
+      propertyIds.push(healthBar._id);
+      propertiesDependedAponIds.push(...healthBar.dependencies);
+    });
+    recomputeCreatureByDependencies({
+      creature,
+      propertyIds,
+      propertiesDependedAponIds,
+    });
+    return totalDamage;
+  },
+});
+
+export default dealDamage;
--- a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
@@ -0,0 +1,33 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { insertPropertyWork } from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
+
+const duplicateProperty = new ValidatedMethod({
+  name: 'creatureProperties.duplicate',
+  validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    }
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id}) {
+    let creatureProperty = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(creatureProperty);
+    assertEditPermission(rootCreature, this.userId);
+    insertPropertyWork({
+      property: creatureProperty,
+      creature: rootCreature,
+    });
+  },
+});
+
+export default duplicateProperty;
--- a/app/imports/api/creature/creatureProperties/methods/equipItem.js
+++ b/app/imports/api/creature/creatureProperties/methods/equipItem.js
@@ -1,12 +1,12 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
-import getClosestPropertyAncestorCreature from '/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import INVENTORY_TAGS from '/imports/constants/INVENTORY_TAGS.js';

-function getParentRefByTag(creatureId, tag){
+export function getParentRefByTag(creatureId, tag){
  let prop = CreatureProperties.findOne({
    'ancestors.id': creatureId,
    removed: {$ne: true},
@@ -40,7 +40,7 @@ const equipItem = new ValidatedMethod({
    let item = CreatureProperties.findOne(_id);
    if (item.type !== 'item') throw new Meteor.Error('wrong type',
    'Equip and unequip can only be performed on items');
-    let creature = getClosestPropertyAncestorCreature(item);
+    let creature = getRootCreatureAncestor(item);
    assertEditPermission(creature, this.userId);
    CreatureProperties.update(_id, {
      $set: {equipped},
@@ -61,4 +61,4 @@ const equipItem = new ValidatedMethod({
  },
 });

-export { equipItem, getParentRefByTag }
+export default equipItem;
--- a/app/imports/api/creature/creatureProperties/methods/index.js
+++ b/app/imports/api/creature/creatureProperties/methods/index.js
@@ -0,0 +1,14 @@
+import '//imports/api/creature/creatureProperties/methods/adjustQuantity.js';
+import '/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js';
+import '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import '/imports/api/creature/creatureProperties/methods/dealDamage.js';
+import '/imports/api/creature/creatureProperties/methods/duplicateProperty.js';
+import '/imports/api/creature/creatureProperties/methods/equipItem.js';
+import '/imports/api/creature/creatureProperties/methods/insertProperty.js';
+import '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+import '/imports/api/creature/creatureProperties/methods/pullFromProperty.js';
+import '/imports/api/creature/creatureProperties/methods/pushToProperty.js';
+import '/imports/api/creature/creatureProperties/methods/restoreProperty.js';
+import '/imports/api/creature/creatureProperties/methods/selectAmmoItem.js';
+import '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
+import '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
--- a/app/imports/api/creature/creatureProperties/methods/insertProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/insertProperty.js
@@ -0,0 +1,43 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { reorderDocs } from '/imports/api/parenting/order.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const insertProperty = new ValidatedMethod({
+  name: 'creatureProperties.insert',
+	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({creatureProperty}) {
+    let rootCreature = getRootCreatureAncestor(creatureProperty);
+    assertEditPermission(rootCreature, this.userId);
+		insertPropertyWork({
+      property: creatureProperty,
+      creature: rootCreature,
+    });
+  },
+});
+
+export function insertPropertyWork({property, creature}){
+  delete property._id;
+  let _id = CreatureProperties.insert(property);
+  // Tree structure changed by insert, reorder the tree
+  reorderDocs({
+    collection: CreatureProperties,
+    ancestorId: creature._id,
+  });
+  // Inserting the active status of the property needs to be denormalised
+  recomputeInactiveProperties(creature._id);
+  // Inserting a creature property invalidates dependencies: full recompute
+  recomputeCreatureByDoc(creature);
+  return _id;
+}
+
+export default insertProperty;
--- a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
+++ b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
@@ -0,0 +1,107 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import {
+	setLineageOfDocs,
+	getAncestry,
+	renewDocIds
+} from '/imports/api/parenting/parenting.js';
+import { reorderDocs } from '/imports/api/parenting/order.js';
+import { setDocToLastOrder } from '/imports/api/parenting/order.js';
+
+const insertPropertyFromLibraryNode = new ValidatedMethod({
+	name: 'creatureProperties.insertPropertyFromLibraryNode',
+	validate: new SimpleSchema({
+		nodeId: {
+			type: String,
+			regEx: SimpleSchema.RegEx.Id,
+		},
+		parentRef: {
+			type: RefSchema,
+		},
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({nodeId, parentRef}) {
+		// get the new ancestry for the properties
+		let {parentDoc, ancestors} = getAncestry({parentRef});
+
+		// Check permission to edit
+    let rootCreature;
+		if (parentRef.collection === 'creatures'){
+      rootCreature = parentDoc;
+		} else if (parentRef.collection === 'creatureProperties'){
+      rootCreature = getRootCreatureAncestor(parentDoc);
+		} else {
+			throw `${parentRef.collection} is not a valid parent collection`
+		}
+    assertEditPermission(rootCreature, this.userId);
+
+		// Fetch the library node and its decendents, provided they have not been
+		// removed
+		let node = LibraryNodes.findOne({
+			_id: nodeId,
+			removed: {$ne: true},
+		});
+		if (!node) throw `Node not found for nodeId: ${nodeId}`;
+		let oldParent = node.parent;
+		let nodes = LibraryNodes.find({
+			'ancestors.id': nodeId,
+			removed: {$ne: true},
+		}).fetch();
+
+    // The root node is first in the array of nodes
+    // It must get the first generated ID to prevent flickering
+		nodes = [node, ...nodes];
+
+		// re-map all the ancestors
+		setLineageOfDocs({
+			docArray: nodes,
+			newAncestry: ancestors,
+			oldParent,
+		});
+
+		// Give the docs new IDs without breaking internal references
+		renewDocIds({
+			docArray: nodes,
+			collectionMap: {'libraryNodes': 'creatureProperties'}
+		});
+
+		// Order the root node
+		setDocToLastOrder({
+			collection: CreatureProperties,
+			doc: node,
+		});
+
+		// Insert the creature properties
+    CreatureProperties.batchInsert(nodes);
+
+    // get the root inserted doc
+    let rootId = node._id;
+
+    // Tree structure changed by inserts, reorder the tree
+    reorderDocs({
+      collection: CreatureProperties,
+      ancestorId: rootCreature._id,
+    });
+
+    // The library properties need to denormalise which of them are inactive
+    recomputeInactiveProperties(rootId);
+		// Inserting a creature property invalidates dependencies: full recompute
+    recomputeCreatureByDoc(rootCreature);
+		// Return the docId of the last property, the inserted root property
+		return rootId;
+	},
+});
+
+export default insertPropertyFromLibraryNode;
--- a/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js
@@ -0,0 +1,36 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const pullFromProperty = new ValidatedMethod({
+	name: 'creatureProperties.pull',
+	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id, path, itemId}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+		CreatureProperties.update(_id, {
+			$pull: {[path.join('.')]: {_id: itemId}},
+		}, {
+			selector: {type: property.type},
+			getAutoValues: false,
+		});
+
+    // TODO figure out if this method can change deps or not
+    recomputeCreatureByDoc(rootCreature);
+    // recomputePropertyDependencies(property);
+	}
+});
+
+export default pullFromProperty;
--- a/app/imports/api/creature/creatureProperties/methods/pushToProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/pushToProperty.js
@@ -0,0 +1,35 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const pushToProperty = new ValidatedMethod({
+	name: 'creatureProperties.push',
+	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id, path, value}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+		CreatureProperties.update(_id, {
+			$push: {[path.join('.')]: value},
+		}, {
+			selector: {type: property.type},
+		});
+
+    // TODO figure out if this method can change deps or not
+    recomputeCreatureByDoc(rootCreature);
+    // recomputePropertyDependencies(property);
+	}
+});
+
+export default pushToProperty;
--- a/app/imports/api/creature/creatureProperties/methods/restoreProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/restoreProperty.js
@@ -0,0 +1,37 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { restore } from '/imports/api/parenting/softRemove.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const restoreProperty = new ValidatedMethod({
+	name: 'creatureProperties.restore',
+	validate: new SimpleSchema({
+		_id: SimpleSchema.RegEx.Id
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+    restore({_id, collection: CreatureProperties});
+
+    // Parents active status may have changed while it was deleted
+    recomputeInactiveProperties(rootCreature._id);
+    // Changes dependency tree by restoring children
+    recomputeCreatureByDoc(rootCreature);
+	}
+});
+
+export default restoreProperty;
--- a/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js
+++ b/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js
@@ -0,0 +1,52 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const selectAmmoItem = new ValidatedMethod({
+  name: 'creatureProperties.selectAmmoItem',
+  validate: new SimpleSchema({
+    actionId: SimpleSchema.RegEx.Id,
+    itemId: SimpleSchema.RegEx.Id,
+    itemConsumedIndex: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({actionId, itemId, itemConsumedIndex}) {
+    // Permissions
+		let action = CreatureProperties.findOne(actionId);
+    let rootCreature = getRootCreatureAncestor(action);
+		assertEditPermission(rootCreature, this.userId);
+
+    // Check that this index has a document to edit
+    let itemConsumed = action.resources.itemsConsumed[itemConsumedIndex];
+    if (!itemConsumed){
+      throw new Meteor.Error('Resouce not found',
+        'Could not set ammo, because the ammo document was not found');
+    }
+    let itemToLink = CreatureProperties.findOne(itemId);
+    if (!itemToLink){
+      throw new Meteor.Error('Item not found',
+        'Could not set ammo: the item was not found');
+    }
+    let path = `resources.itemsConsumed.${itemConsumedIndex}.itemId`;
+    CreatureProperties.update(actionId, {
+      $set: {[path]: itemId}
+    }, {
+      selector: action,
+    });
+
+    // Changing the linked item does change the dependency tree
+    // TODO: We can predict exactly which deps will be affected instead of
+    //       recomputing the entire creature
+    recomputeCreatureByDoc(rootCreature);
+  },
+});
+
+export default selectAmmoItem;
--- a/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js
@@ -0,0 +1,34 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { softRemove } from '/imports/api/parenting/softRemove.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const softRemoveProperty = new ValidatedMethod({
+	name: 'creatureProperties.softRemove',
+	validate: new SimpleSchema({
+		_id: SimpleSchema.RegEx.Id
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+		softRemove({_id, collection: CreatureProperties});
+
+    // Changes dependency tree by removing children
+    recomputeCreatureByDoc(rootCreature);
+	}
+});
+
+export default softRemoveProperty;
--- a/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js
@@ -0,0 +1,60 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+
+const updateCreatureProperty = new ValidatedMethod({
+  name: 'creatureProperties.update',
+  validate({_id, path}){
+		if (!_id) throw new Meteor.Error('No _id', '_id is required');
+		// We cannot change these fields with a simple update
+		switch (path[0]){
+			case 'type':
+      case 'order':
+      case 'parent':
+      case 'ancestors':
+			case 'damage':
+				throw new Meteor.Error('Permission denied',
+				'This property can\'t be updated directly');
+		}
+  },
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, path, value}) {
+    // Permission
+    let property = CreatureProperties.findOne(_id, {
+      fields: {type: 1, ancestors: 1}
+    });
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    let pathString = path.join('.');
+    let modifier;
+    // unset empty values
+    if (value === null || value === undefined){
+      modifier = {$unset: {[pathString]: 1}};
+    } else {
+      modifier = {$set: {[pathString]: value}};
+    }
+		CreatureProperties.update(_id, modifier, {
+			selector: {type: property.type},
+		});
+
+    // Some updates might cause other properties to become inactive
+    if ([
+      'applied', 'equipped', 'prepared', 'alwaysPrepared', 'disabled'
+    ].includes(path[0])){
+      recomputeInactiveProperties(rootCreature._id);
+    }
+    // Updating a property is likely to change dependencies, do a full recompute
+    recomputeCreatureByDoc(rootCreature);
+  },
+});
+
+export default updateCreatureProperty;
--- a/app/imports/api/creature/creatureProperties/recomputeCreaturesByProperty.js
+++ b/app/imports/api/creature/creatureProperties/recomputeCreaturesByProperty.js
@@ -0,0 +1,12 @@
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+/**
+ * Recomputes all ancestor creatures of this property
+ */
+export default function recomputeCreaturesByProperty(property){
+	for (let ref of property.ancestors){
+		if (ref.collection === 'creatures') {
+			recomputeCreatureById.call(ref.id);
+		}
+	}
+}
--- a/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js
+++ b/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js
@@ -3,7 +3,7 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import Creatures from '/imports/api/creature/Creatures.js';
-import getActiveProperties from '/imports/api/creature/getActiveProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';

 export const recomputeDamageMultipliers = new ValidatedMethod({

@@ -31,9 +31,13 @@ export const recomputeDamageMultipliers = new ValidatedMethod({

 export function recomputeDamageMultipliersById(creatureId){
  if (!creatureId) throw 'Creature ID is required';
-  let props = getActiveProperties({
-    ancestorId: creatureId,
-    filter: {type: 'damageMultiplier'},
+  let props = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    type: 'damageMultiplier',
+    removed: {$ne: true},
+    inactive: {$ne: true},
+  }, {
+    sort: {order: 1}
  });

  // Count of how many weakness, resistances and immunities each damage type has
--- a/app/imports/api/creature/denormalise/recomputeInactiveProperties.js
+++ b/app/imports/api/creature/denormalise/recomputeInactiveProperties.js
@@ -1,4 +1,4 @@
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';

 export default function recomputeInactiveProperties(ancestorId){
  let disabledFilter = {
--- a/app/imports/api/creature/denormalise/recomputeInventory.js
+++ b/app/imports/api/creature/denormalise/recomputeInventory.js
@@ -1,4 +1,4 @@
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import nodesToTree from '/imports/api/parenting/parenting.js';

 export default function recomputeInventory(creatureId){
--- a/app/imports/api/creature/denormalise/recomputeSlotFullness.js
+++ b/app/imports/api/creature/denormalise/recomputeSlotFullness.js
@@ -1,4 +1,4 @@
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 // n + 1 database queries + n potential updates for n slots. Could be sped up.
 export default function recomputeSlotFullness(ancestorId){
  CreatureProperties.find({
--- a/app/imports/api/creature/experience/Experiences.js
+++ b/app/imports/api/creature/experience/Experiences.js
@@ -4,7 +4,7 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import Creatures from '/imports/api/creature/Creatures.js';
-import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';

 let Experiences = new Mongo.Collection('experiences');

--- a/app/imports/api/creature/getActiveProperties.js
+++ b/app/imports/api/creature/getActiveProperties.js
@@ -1,86 +0,0 @@
-import Creatures from '/imports/api/creature/Creatures.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
-
-export default function getActiveProperties({
-  ancestorId,
-  filter = {},
-  options = {sort: {order: 1}},
-  includeUntoggled = false,
-  includeUnprepared = false,
-  includeUnequipped = false,
-  excludeAncestors,
-}){
-  filter = getActivePropertyFilter({
-    ancestorId,
-    filter,
-    includeUntoggled,
-    includeUnprepared,
-    includeUnequipped,
-    excludeAncestors,
-  });
-  return CreatureProperties.find(filter, options).fetch();
-}
-
-export function getActivePropertyFilter({
-  ancestorId,
-  filter = {},
-  includeUntoggled = false,
-  includeUnprepared = false,
-  includeUnequipped = false,
-  excludeAncestors = [],
-}){
-  if (!ancestorId){
-    throw 'Ancestor Id is required to get active properties'
-  }
-  // First get ids of disabled properties, unequiped items, unapplied buffs
-  let disabledAncestorsFilter = {
-    'ancestors.id': ancestorId,
-    $or: [
-      {disabled: true}, // Everything can be disabled
-      {applied: false}, // Buffs can be applied
-    ],
-  };
-  if (!includeUnequipped){
-    disabledAncestorsFilter.$or.push({type: 'item', equipped: {$ne: true}});
-  }
-  if (!includeUntoggled){
-    disabledAncestorsFilter.$or.push({toggleResult: false});
-  }
-  if (!includeUnprepared){
-    disabledAncestorsFilter.$or.push({
-      type: 'spell',
-      prepared: {$ne: true},
-      alwaysPrepared: {$ne: true}
-    });
-  }
-  let disabledAncestorIds = CreatureProperties.find(disabledAncestorsFilter, {
-    fields: {_id: 1},
-  }).map(prop => prop._id);
-
-  // Then get the ids of creatures that are children of this creature
-  // to isolate their decendent properties
-  Creatures.find({
-    'ancestors.id': ancestorId,
-  }, {
-    fields: {_id: 1},
-  }).forEach(subCreature => {
-    disabledAncestorIds.push(subCreature._id);
-  });
-
-  // Get all the properties that are decendents of the ancestor of interest but
-  // aren't from the excluded decendents
-  if (filter['ancestors.id'] && Meteor.isClient){
-    console.warn('Filtering on ancestor id is ignored')
-  }
-  filter['ancestors.id'] = {
-    $eq: ancestorId,
-    $nin: disabledAncestorIds.concat(excludeAncestors),
-  };
-  // Get properties that aren't removed
-  filter.removed = {$ne: true};
-  // Don't include the disabled ancestors themselves either
-  filter._id = {
-    $nin: disabledAncestorIds,
-  }
-  return filter;
-}
--- a/app/imports/api/creature/log/CreatureLogs.js
+++ b/app/imports/api/creature/log/CreatureLogs.js
@@ -1,9 +1,14 @@
 import SimpleSchema from 'simpl-schema';
 import Creatures from '/imports/api/creature/Creatures.js';
+import LogContentSchema from '/imports/api/creature/log/LogContentSchema.js';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import {assertEditPermission} from '/imports/api/creature/creaturePermissions.js';
-import { parse, CompilationContext } from '/imports/parser/parser.js';
+import {
+  parse,
+  CompilationContext,
+  prettifyParseError
+} from '/imports/parser/parser.js';
 const PER_CREATURE_LOG_LIMIT = 100;

 if (Meteor.isServer){
@@ -13,13 +18,16 @@ if (Meteor.isServer){
 let CreatureLogs = new Mongo.Collection('creatureLogs');

 let CreatureLogSchema = new SimpleSchema({
-	text: {
+	name: {
 		type: String,
+    optional: true,
 	},
-  type: {
-    type: String,
-    allowedValues: ['roll', 'change', 'damage', 'info'],
-    defaultValue: 'info',
+  content: {
+    type: Array,
+    defaultValue: [],
+  },
+  'content.$': {
+    type: LogContentSchema,
  },
 	// The real-world date that it occured, usually sorted by date
 	date: {
@@ -37,6 +45,10 @@ let CreatureLogSchema = new SimpleSchema({
    regEx: SimpleSchema.RegEx.Id,
    index: 1,
  },
+  creatureName: {
+    type: String,
+    optional: true,
+  },
 });

 CreatureLogs.attachSchema(CreatureLogSchema);
@@ -73,7 +85,7 @@ const insertCreatureLog = new ValidatedMethod({
    timeInterval: 5000,
  },
 	validate: new SimpleSchema({
-		log: CreatureLogSchema.omit('type', 'date'),
+		log: CreatureLogSchema.omit('date'),
 	}).validator(),
  run({log}){
    const creatureId = log.creatureId;
@@ -87,21 +99,27 @@ const insertCreatureLog = new ValidatedMethod({
    }});
    assertEditPermission(creature, this.userId);
    // Build the new log
-    if (typeof log === 'string'){
-      log = {text: log};
-    }
-    log.date = new Date();
-    // Insert it
-    let id = CreatureLogs.insert(log);
-    if (Meteor.isServer){
-      this.unblock();
-      removeOldLogs(creatureId);
-      logWebhook({log, creature});
-    }
+    let id = insertCreatureLogWork({log, creature, method: this})
    return id;
  },
 });

+export function insertCreatureLogWork({log, creature, method}){
+  // Build the new log
+  if (typeof log === 'string'){
+    log = {text: log};
+  }
+  log.date = new Date();
+  // Insert it
+  let id = CreatureLogs.insert(log);
+  if (Meteor.isServer){
+    method.unblock();
+    removeOldLogs(creature._id);
+    logWebhook({log, creature});
+  }
+  return id;
+}
+

 function equalIgnoringWhitespace(a, b){
  if (typeof a !== 'string' || typeof b !== 'string') return a === b;
@@ -135,39 +153,45 @@ const logRoll = new ValidatedMethod({
      avatarPicture: 1,
    }});
    assertEditPermission(creature, this.userId);
-    let parsedResult = parse(roll);
-    let logText;
-    if (parsedResult === null) {
-      logText = 'Unexpected end of input';
+    let logContent = []
+    let parsedResult = undefined;
+    try {
+      parsedResult = parse(roll);
+    } catch (e){
+      let error = prettifyParseError(e);
+      logContent.push({error});
    }
-    else try {
-      logText = [];
+    if (parsedResult) try {
      let rollContext = new CompilationContext();
      let compiled = parsedResult.compile(creature.variables, rollContext);
      let compiledString = compiled.toString();
-      if (!equalIgnoringWhitespace(compiledString, roll)) logText.push(roll);
-      logText.push(compiledString);
+      if (!equalIgnoringWhitespace(compiledString, roll)) logContent.push({
+        details: roll
+      });
+      logContent.push({
+        details: compiledString
+      });
      let rolled = compiled.roll(creature.variables, rollContext);
      let rolledString = rolled.toString();
-      if (rolledString !== compiledString) logText.push(rolled.toString());
+      if (rolledString !== compiledString) logContent.push({
+        result: rolled.toString()
+      });
      let result = rolled.reduce(creature.variables, rollContext);
      let resultString = result.toString();
-      if (resultString !== rolledString) logText.push(resultString);
-      logText = logText.join('\n\n');
+      if (resultString !== rolledString) logContent.push({
+        result: resultString
+      });
    } catch (e){
-      logText = 'Calculation error';
+      logContent = [{error: 'Calculation error'}];
    }
    const log = {
-      text: logText,
+      content: logContent,
      creatureId,
      date: new Date(),
    };
-    let id = CreatureLogs.insert(log);
-    if (Meteor.isServer){
-      this.unblock();
-      removeOldLogs(creatureId);
-      logWebhook({log, creature});
-    }
+
+    let id = insertCreatureLogWork({log, creature, method: this});
+
    return id;
  },
 });
--- a/app/imports/api/creature/log/LogContentSchema.js
+++ b/app/imports/api/creature/log/LogContentSchema.js
@@ -0,0 +1,58 @@
+import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+import RollDetailsSchema from '/imports/api/properties/subSchemas/RollDetailsSchema.js';
+
+let LogContentSchema = new SimpleSchema({
+  name: {
+    type: String,
+    optional: true,
+  },
+  error: {
+    type: String,
+    optional: true,
+  },
+  resultPrefix: {
+    type: String,
+    optional: true,
+  },
+  result: {
+    type: String,
+    optional: true,
+  },
+  expandedResult: {
+    type: String,
+    optional: true,
+  },
+  details: {
+    type: String,
+    optional: true,
+  },
+  description: {
+    type: String,
+    optional: true,
+  },
+  context: {
+    type: Object,
+    optional: true,
+  },
+  'context.errors':{
+    type: Array,
+    defaultValue: [],
+  },
+  'context.errors.$': {
+    type: ErrorSchema,
+  },
+  'context.rolls': {
+    type: Array,
+    defaultValue: [],
+  },
+  'context.rolls.$': {
+    type: RollDetailsSchema,
+  },
+  'context.doubleRolls': {
+    type: Boolean,
+    optional: true,
+  },
+});
+
+export default LogContentSchema;
--- a/app/imports/api/creature/mixins/recomputeCreatureMixin.js
+++ b/app/imports/api/creature/mixins/recomputeCreatureMixin.js
@@ -1,4 +1,4 @@
-import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';

 export default function recomputeCreatureMixin(methodOptions){
  let runFunc = methodOptions.run;
--- a/app/imports/api/creature/removeCreature.js
+++ b/app/imports/api/creature/removeCreature.js
@@ -3,7 +3,7 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
 import Creatures from '/imports/api/creature/Creatures.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';

--- a/app/imports/api/creature/restCreature.js
+++ b/app/imports/api/creature/restCreature.js
@@ -2,10 +2,9 @@ import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/Creatures.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
-import getActiveProperties, { getActivePropertyFilter } from '/imports/api/creature/getActiveProperties.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
-import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';

 const restCreature = new ValidatedMethod({
  name: 'creature.methods.longRest',
@@ -43,11 +42,12 @@ const restCreature = new ValidatedMethod({
      resetFilter = {$in: ['shortRest', 'longRest']}
    }
    // Only apply to active properties
-    let filter = getActivePropertyFilter({
-      filter: {reset: resetFilter},
-      ancestorId: creatureId,
-      includeUntoggled: true,
-    });
+    let filter = {
+      'ancestors.id': creatureId,
+      reset: resetFilter,
+      removed: {$ne: true},
+      inactive: {$ne: true},
+    };
    // update all attribute's damage
    filter.type = 'attribute';
    CreatureProperties.update(filter, {
@@ -70,15 +70,19 @@ const restCreature = new ValidatedMethod({
    });
    // Reset half hit dice on a long rest, starting with the highest dice
    if (restType === 'longRest'){
-      let hitDice = getActiveProperties({
-        ancestorId: creatureId,
-        filter: {type: 'attribute', attributeType: 'hitDice'},
-        options: {fields: {
+      let hitDice = CreatureProperties.find({
+        'ancestors.id': creatureId,
+        type: 'attribute',
+        attributeType: 'hitDice',
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        fields: {
          hitDiceSize: 1,
          damage: 1,
          value: 1,
-        }},
-      });
+        }
+      }).fetch();
      // Use a collator to do sorting in natural order
      let collator = new Intl.Collator('en', {
        numeric: true, sensitivity: 'base'
--- a/app/imports/api/library/LibraryNodes.js
+++ b/app/imports/api/library/LibraryNodes.js
@@ -32,6 +32,14 @@ let LibraryNodeSchema = new SimpleSchema({
  }
 });

+// Set up server side search index
+if (Meteor.isServer) {
+  LibraryNodes._ensureIndex({
+    'name': 'text',
+		'tags': 'text',
+  });
+}
+
 for (let key in propertySchemasIndex){
 	let schema = new SimpleSchema({});
 	schema.extend(LibraryNodeSchema);
--- a/app/imports/api/parenting/organizeMethods.js
+++ b/app/imports/api/parenting/organizeMethods.js
@@ -8,7 +8,8 @@ import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
 import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
-import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';

 const organizeDoc = new ValidatedMethod({
  name: 'organize.organizeDoc',
@@ -54,6 +55,10 @@ const organizeDoc = new ValidatedMethod({
    let creaturesToRecompute = union(docCreatures, parentCreatures);
    // Recompute the creatures
    creaturesToRecompute.forEach(id => {
+      // The active status of some properties might change due to a change in
+      // ancestry
+      recomputeInactiveProperties(id);
+      // Some Dependencies depend on ancestry, so a full recompute is needed
      recomputeCreatureById(id);
    });
  },
--- a/app/imports/api/parenting/parenting.js
+++ b/app/imports/api/parenting/parenting.js
@@ -120,13 +120,19 @@ export function setLineageOfDocs({docArray, oldParent, newAncestry}){
 export function renewDocIds({docArray, collectionMap}){
  // map of {oldId: newId}
  let idMap = {};
-  // Give new ids and map the changes
+
+  // Get a random generator that's consistent on client and server
+  let randomSrc = DDP.randomStream('renewDocIds');
+
+  // Give new ids and map the changes as {oldId: newId}
  docArray.forEach(doc => {
    let oldId = doc._id;
-    let newId = Random.id();
+    let newId = randomSrc.id();
    doc._id = newId;
    idMap[oldId] = newId;
  });
+
+  // Remap all references using the new IDs
  const remapReference = ref => {
    if (idMap[ref.id]){
      ref.id = idMap[ref.id];
--- a/app/imports/api/properties/Actions.js
+++ b/app/imports/api/properties/Actions.js
@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';
 import { storedIconsSchema } from '/imports/api/icons/Icons.js'
-
 /*
 * Actions are things a character can do
 * Any rolls that are children of actions will be rolled when taking the action
@@ -117,6 +117,20 @@ let ActionSchema = new SimpleSchema({
 });

 const ComputedOnlyActionSchema = new SimpleSchema({
+  summaryCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'summaryCalculations.$': InlineComputationSchema,
+
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
+
  usesResult: {
    type: SimpleSchema.Integer,
    optional: true,
--- a/app/imports/api/properties/Adjustments.js
+++ b/app/imports/api/properties/Adjustments.js
@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';

 const AdjustmentSchema = new SimpleSchema({
 	// The roll that determines how much to change the attribute
@@ -13,7 +14,7 @@ const AdjustmentSchema = new SimpleSchema({
 		type: String,
    defaultValue: 'every',
 		allowedValues: [
-      'self',   // the character who took the action
+      'self',   // the character who took the Adjustment
      'each',   // rolled once for `each` target
      'every',  // rolled once and applied to `every` target
    ],
@@ -30,4 +31,22 @@ const AdjustmentSchema = new SimpleSchema({
  },
 });

-export { AdjustmentSchema };
+const ComputedOnlyAdjustmentSchema = new SimpleSchema({
+  amountResult: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+  amountErrors: {
+    type: Array,
+    optional: true,
+  },
+  'amountErrors.$':{
+    type: ErrorSchema,
+  },
+});
+
+const ComputedAdjustmentSchema = new SimpleSchema()
+  .extend(AdjustmentSchema)
+  .extend(ComputedOnlyAdjustmentSchema);
+
+export { AdjustmentSchema, ComputedAdjustmentSchema, ComputedOnlyAdjustmentSchema };
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -1,6 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';

 /*
 * Attributes are numbered stats of a character
@@ -75,6 +76,12 @@ let AttributeSchema = new SimpleSchema({
 });

 let ComputedOnlyAttributeSchema = new SimpleSchema({
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
  // The result of baseValueCalculation
  baseValue: {
    type: SimpleSchema.oneOf(Number, String, Boolean),
@@ -116,6 +123,11 @@ let ComputedOnlyAttributeSchema = new SimpleSchema({
 		type: SimpleSchema.Integer,
 		optional: true,
 	},
+  // The computed creature constitution modifier
+  constitutionMod: {
+    type: Number,
+		optional: true,
+  },
  // Should this attribute hide
  hide: {
    type: Boolean,
--- a/app/imports/api/properties/Buffs.js
+++ b/app/imports/api/properties/Buffs.js
@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';

 let BuffSchema = new SimpleSchema({
 	name: {
@@ -29,12 +30,13 @@ let BuffSchema = new SimpleSchema({
 	},
 });

-let AppliedBuffSchema = new SimpleSchema({
-  applied: {
-    type: Boolean,
-    defaultValue: true,
-    index: 1,
+let ComputedOnlyBuffSchema = new SimpleSchema({
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
  },
+  'descriptionCalculations.$': InlineComputationSchema,
 	durationSpent: {
 		type: Number,
 		optional: true,
@@ -54,6 +56,10 @@ let AppliedBuffSchema = new SimpleSchema({
 	'appliedBy.collection': {
 		type: String,
 	},
-}).extend(BuffSchema);
+})

-export { AppliedBuffSchema, BuffSchema };
+const ComputedBuffSchema = new SimpleSchema()
+  .extend(BuffSchema)
+  .extend(ComputedOnlyBuffSchema);
+
+export { BuffSchema, ComputedOnlyBuffSchema, ComputedBuffSchema };
--- a/app/imports/api/properties/ClassLevels.js
+++ b/app/imports/api/properties/ClassLevels.js
@@ -6,6 +6,7 @@ let ClassLevelSchema = new SimpleSchema({
 		type: String,
 		optional: true,
 	},
+  // Only used by slot filling dialog, not computed
  description: {
    type: String,
    optional: true,
--- a/app/imports/api/properties/Constants.js
+++ b/app/imports/api/properties/Constants.js
@@ -0,0 +1,81 @@
+import SimpleSchema from 'simpl-schema';
+import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+import {
+  parse,
+  CompilationContext,
+  prettifyParseError,
+} from '/imports/parser/parser.js';
+import AccessorNode from '/imports/parser/parseTree/AccessorNode.js';
+import SymbolNode from '/imports/parser/parseTree/SymbolNode.js';
+/*
+ * Constants are primitive values that can be used elsewhere in computations
+ */
+let ConstantSchema = new SimpleSchema({
+  name: {
+		type: String,
+		optional: true,
+	},
+  // The technical, lowercase, single-word name used in formulae
+  variableName: {
+    type: String,
+		regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    defaultValue: 'newConstant',
+  },
+	// The input value to be parsed, must return a constant node or an array
+  // of constant nodes to be valid
+	calculation: {
+		type: String,
+		optional: true,
+	},
+  errors: {
+    type: Array,
+    autoValue(){
+      let calc = this.field('calculation');
+      if (!calc.isSet && this.isModifier) {
+        this.unset()
+        return;
+      }
+      let string = calc.value;
+      // Evaluate the calculation with no scope
+      let {result, context} = parseString(string);
+      // Any existing errors will result in an early failure
+      if (context.errors.length) return context.errors;
+      // Ban variables in constants if necessary
+      result && result.traverse(node => {
+        if (node instanceof SymbolNode || node instanceof AccessorNode){
+          context.storeError()({
+            type: 'error',
+            message: 'Variables can\'t be used to define a constant'
+          });
+        }
+      });
+      return context.errors;
+    }
+  },
+  'errors.$':{
+    type: ErrorSchema,
+  },
+});
+
+function parseString(string, fn = 'compile'){
+  let context = new CompilationContext();
+  if (!string){
+    return {result: string, errors: []};
+  }
+
+  // Parse the string using mathjs
+  let node;
+  try {
+    node = parse(string);
+  } catch (e) {
+    let message = prettifyParseError(e);
+    context.storeError({type: 'error', message});
+    return {result: string, errors: context.errors};
+  }
+  let result = node[fn]({/*empty scope*/}, context);
+  return {result, context}
+}
+
+export { ConstantSchema };
--- a/app/imports/api/properties/Containers.js
+++ b/app/imports/api/properties/Containers.js
@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';

 let ContainerSchema = new SimpleSchema({
 	name: {
@@ -33,6 +34,12 @@ let ContainerSchema = new SimpleSchema({
 });

 const ComputedOnlyContainerSchema = new SimpleSchema({
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
  // Weight of all the contents, zero if `contentsWeightless` is true
  contentsWeight:{
    type: Number,
@@ -48,4 +55,4 @@ const ComputedContainerSchema = new SimpleSchema()
 	.extend(ComputedOnlyContainerSchema)
 	.extend(ContainerSchema);

-export { ContainerSchema, ComputedContainerSchema };
+export { ContainerSchema, ComputedOnlyContainerSchema, ComputedContainerSchema };
--- a/app/imports/api/properties/Damages.js
+++ b/app/imports/api/properties/Damages.js
@@ -1,5 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';

 const DamageSchema = new SimpleSchema({
 	// The roll that determines how much to damage the attribute
@@ -26,4 +27,22 @@ const DamageSchema = new SimpleSchema({
 	},
 });

-export { DamageSchema };
+const ComputedOnlyDamageSchema = new SimpleSchema({
+  amountResult: {
+    type: SimpleSchema.oneOf(String, SimpleSchema.Integer),
+    optional: true,
+  },
+  amountErrors: {
+    type: Array,
+    optional: true,
+  },
+  'amountErrors.$':{
+    type: ErrorSchema,
+  },
+});
+
+const ComputedDamageSchema = new SimpleSchema()
+  .extend(DamageSchema)
+  .extend(ComputedOnlyDamageSchema);
+
+export { DamageSchema, ComputedDamageSchema, ComputedOnlyDamageSchema };
--- a/app/imports/api/properties/Features.js
+++ b/app/imports/api/properties/Features.js
@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';

 let FeatureSchema = new SimpleSchema({
 	name: {
@@ -14,4 +15,26 @@ let FeatureSchema = new SimpleSchema({
 	},
 });

-export { FeatureSchema }
+let ComputedOnlyFeatureSchema = new SimpleSchema({
+
+  summaryCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'summaryCalculations.$': InlineComputationSchema,
+
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
+
+});
+
+const ComputedFeatureSchema = new SimpleSchema()
+  .extend(FeatureSchema)
+  .extend(ComputedOnlyFeatureSchema);
+
+export { FeatureSchema, ComputedFeatureSchema, ComputedOnlyFeatureSchema }
--- a/app/imports/api/properties/Items.js
+++ b/app/imports/api/properties/Items.js
@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';

 const ItemSchema = new SimpleSchema({
 	name: {
@@ -33,7 +34,6 @@ const ItemSchema = new SimpleSchema({
    optional: true,
 	},
 	// If this item is equipped, it requires attunement
-	// Being equipped is `enabled === true`
 	requiresAttunement: {
 		type: Boolean,
 		optional: true,
@@ -54,4 +54,17 @@ const ItemSchema = new SimpleSchema({
 	},
 });

-export { ItemSchema };
+let ComputedOnlyItemSchema = new SimpleSchema({
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
+});
+
+const ComputedItemSchema = new SimpleSchema()
+  .extend(ItemSchema)
+  .extend(ComputedOnlyItemSchema);
+
+export { ItemSchema, ComputedItemSchema, ComputedOnlyItemSchema };
--- a/app/imports/api/properties/Notes.js
+++ b/app/imports/api/properties/Notes.js
@@ -1,14 +1,41 @@
 import SimpleSchema from 'simpl-schema';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';

 let NoteSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
+  summary: {
+		type: String,
+		optional: true,
+	},
 	description: {
 		type: String,
 		optional: true,
 	},
 });

-export { NoteSchema };
+let ComputedOnlyNoteSchema = new SimpleSchema({
+
+  summaryCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'summaryCalculations.$': InlineComputationSchema,
+
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
+
+});
+
+const ComputedNoteSchema = new SimpleSchema()
+  .extend(NoteSchema)
+  .extend(ComputedOnlyNoteSchema);
+
+export { NoteSchema, ComputedNoteSchema, ComputedOnlyNoteSchema, };
--- a/app/imports/api/properties/Rolls.js
+++ b/app/imports/api/properties/Rolls.js
@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';

 /**
 * Rolls are children to actions or other rolls, they are triggered with 0 or
@@ -35,4 +36,22 @@ let RollSchema = new SimpleSchema({
  },
 });

-export { RollSchema };
+let ComputedOnlyRollSchema = new SimpleSchema({
+  rollResult: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+  rollErrors: {
+    type: Array,
+    optional: true,
+  },
+  'rollErrors.$':{
+    type: ErrorSchema,
+  },
+});
+
+const ComputedRollSchema = new SimpleSchema()
+  .extend(RollSchema)
+  .extend(ComputedOnlyRollSchema);
+
+export { RollSchema, ComputedRollSchema, ComputedOnlyRollSchema };
--- a/app/imports/api/properties/Slots.js
+++ b/app/imports/api/properties/Slots.js
@@ -41,12 +41,11 @@ let SlotSchema = new SimpleSchema({
 });

 const ComputedOnlySlotSchema = new SimpleSchema({
-	// The computed result of the effect
+	// Condition calculation results
 	slotConditionResult: {
 		type: SimpleSchema.oneOf(Number, String, Boolean),
 		optional: true,
 	},
-  // The errors encountered while computing the result
  slotConditionErrors: {
    type: Array,
    optional: true,
@@ -54,6 +53,21 @@ const ComputedOnlySlotSchema = new SimpleSchema({
  'slotConditionErrors.$':{
    type: ErrorSchema,
  },
+
+  // Quantity Expected calculation results
+  quantityExpectedResult: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+  quantityExpectedErrors: {
+    type: Array,
+    optional: true,
+  },
+  'quantityExpectedErrors.$':{
+    type: ErrorSchema,
+  },
+
+  // Denormalised fields
  totalFilled: {
    type: SimpleSchema.Integer,
    defaultValue: 0,
--- a/app/imports/api/properties/SpellLists.js
+++ b/app/imports/api/properties/SpellLists.js
@@ -1,6 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';

 let SpellListSchema = new SimpleSchema({
 	name: {
@@ -25,6 +26,13 @@ let SpellListSchema = new SimpleSchema({
 });

 const ComputedOnlySpellListSchema = new SimpleSchema({
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
+
  maxPreparedResult: {
    type: Number,
    optional: true,
--- a/app/imports/api/properties/Spells.js
+++ b/app/imports/api/properties/Spells.js
@@ -1,6 +1,5 @@
 import { ActionSchema, ComputedOnlyActionSchema } from '/imports/api/properties/Actions.js';
 import SimpleSchema from 'simpl-schema';
-import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';

 const magicSchools = [
 	'abjuration',
@@ -39,10 +38,6 @@ let SpellSchema = new SimpleSchema({})
    type: Boolean,
    optional: true,
  },
-	description: {
-		type: String,
-		optional: true,
-	},
 	castingTime: {
 		type: String,
 		optional: true,
--- a/app/imports/api/properties/computedOnlyPropertySchemasIndex.js
+++ b/app/imports/api/properties/computedOnlyPropertySchemasIndex.js
@@ -0,0 +1,52 @@
+import SimpleSchema from 'simpl-schema';
+import { ComputedOnlyActionSchema } from '/imports/api/properties/Actions.js';
+import { ComputedOnlyAdjustmentSchema } from '/imports/api/properties/Adjustments.js';
+import { ComputedOnlyAttackSchema } from '/imports/api/properties/Attacks.js';
+import { ComputedOnlyAttributeSchema } from '/imports/api/properties/Attributes.js';
+import { ComputedOnlyBuffSchema } from '/imports/api/properties/Buffs.js';
+// import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
+import { ComputedOnlyContainerSchema } from '/imports/api/properties/Containers.js';
+import { ComputedOnlyDamageSchema } from '/imports/api/properties/Damages.js';
+import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
+import { ComputedOnlyEffectSchema } from '/imports/api/properties/Effects.js';
+import { ComputedOnlyFeatureSchema } from '/imports/api/properties/Features.js';
+// import { FolderSchema } from '/imports/api/properties/Folders.js';
+import { ComputedOnlyItemSchema } from '/imports/api/properties/Items.js';
+import { ComputedOnlyNoteSchema } from '/imports/api/properties/Notes.js';
+// import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js';
+import { ComputedOnlyRollSchema } from '/imports/api/properties/Rolls.js';
+import { ComputedOnlySavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
+import { ComputedOnlySkillSchema } from '/imports/api/properties/Skills.js';
+import { ComputedOnlySlotSchema } from '/imports/api/properties/Slots.js';
+// import { SlotFillerSchema } from '/imports/api/properties/SlotFillers.js';
+import { ComputedOnlySpellSchema } from '/imports/api/properties/Spells.js';
+import { ComputedOnlySpellListSchema } from '/imports/api/properties/SpellLists.js';
+import { ComputedOnlyToggleSchema } from '/imports/api/properties/Toggles.js';
+
+const propertySchemasIndex = {
+  action: ComputedOnlyActionSchema,
+  adjustment: ComputedOnlyAdjustmentSchema,
+  attack: ComputedOnlyAttackSchema,
+  attribute: ComputedOnlyAttributeSchema,
+  buff: ComputedOnlyBuffSchema,
+  // classLevel: ClassLevelSchema,
+  damage: ComputedOnlyDamageSchema,
+  damageMultiplier: DamageMultiplierSchema,
+  effect: ComputedOnlyEffectSchema,
+  feature: ComputedOnlyFeatureSchema,
+  // folder: FolderSchema,
+  note: ComputedOnlyNoteSchema,
+  // proficiency: ProficiencySchema,
+  propertySlot: ComputedOnlySlotSchema,
+  roll: ComputedOnlyRollSchema,
+  savingThrow: ComputedOnlySavingThrowSchema,
+  skill: ComputedOnlySkillSchema,
+  spellList: ComputedOnlySpellListSchema,
+  spell: ComputedOnlySpellSchema,
+  toggle: ComputedOnlyToggleSchema,
+  container: ComputedOnlyContainerSchema,
+  item: ComputedOnlyItemSchema,
+  any: new SimpleSchema({}),
+};
+
+export default propertySchemasIndex;
--- a/app/imports/api/properties/computedPropertySchemasIndex.js
+++ b/app/imports/api/properties/computedPropertySchemasIndex.js
@@ -1,52 +1,54 @@
 import SimpleSchema from 'simpl-schema';
 import { ComputedActionSchema } from '/imports/api/properties/Actions.js';
-import { AdjustmentSchema } from '/imports/api/properties/Adjustments.js';
+import { ComputedAdjustmentSchema } from '/imports/api/properties/Adjustments.js';
 import { ComputedAttackSchema } from '/imports/api/properties/Attacks.js';
 import { ComputedAttributeSchema } from '/imports/api/properties/Attributes.js';
-import { BuffSchema } from '/imports/api/properties/Buffs.js';
+import { ComputedBuffSchema } from '/imports/api/properties/Buffs.js';
 import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
-import { ContainerSchema } from '/imports/api/properties/Containers.js';
-import { DamageSchema } from '/imports/api/properties/Damages.js';
+import { ConstantSchema } from '/imports/api/properties/Constants.js';
+import { ComputedContainerSchema } from '/imports/api/properties/Containers.js';
+import { ComputedDamageSchema } from '/imports/api/properties/Damages.js';
 import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
 import { ComputedEffectSchema } from '/imports/api/properties/Effects.js';
-import { FeatureSchema } from '/imports/api/properties/Features.js';
+import { ComputedFeatureSchema } from '/imports/api/properties/Features.js';
 import { FolderSchema } from '/imports/api/properties/Folders.js';
-import { ItemSchema } from '/imports/api/properties/Items.js';
-import { NoteSchema } from '/imports/api/properties/Notes.js';
+import { ComputedItemSchema } from '/imports/api/properties/Items.js';
+import { ComputedNoteSchema } from '/imports/api/properties/Notes.js';
 import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js';
-import { RollSchema } from '/imports/api/properties/Rolls.js';
+import { ComputedRollSchema } from '/imports/api/properties/Rolls.js';
 import { ComputedSavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
 import { ComputedSkillSchema } from '/imports/api/properties/Skills.js';
 import { ComputedSlotSchema } from '/imports/api/properties/Slots.js';
 import { SlotFillerSchema } from '/imports/api/properties/SlotFillers.js';
 import { ComputedSpellSchema } from '/imports/api/properties/Spells.js';
 import { ComputedSpellListSchema } from '/imports/api/properties/SpellLists.js';
-import { ToggleSchema } from '/imports/api/properties/Toggles.js';
+import { ComputedToggleSchema } from '/imports/api/properties/Toggles.js';

 const propertySchemasIndex = {
  action: ComputedActionSchema,
-  adjustment: AdjustmentSchema,
+  adjustment: ComputedAdjustmentSchema,
  attack: ComputedAttackSchema,
  attribute: ComputedAttributeSchema,
-  buff: BuffSchema,
+  buff: ComputedBuffSchema,
  classLevel: ClassLevelSchema,
-  damage: DamageSchema,
+  constant: ConstantSchema,
+  damage: ComputedDamageSchema,
  damageMultiplier: DamageMultiplierSchema,
  effect: ComputedEffectSchema,
-  feature: FeatureSchema,
+  feature: ComputedFeatureSchema,
  folder: FolderSchema,
-  note: NoteSchema,
+  note: ComputedNoteSchema,
  proficiency: ProficiencySchema,
  propertySlot: ComputedSlotSchema,
-  roll: RollSchema,
+  roll: ComputedRollSchema,
  savingThrow: ComputedSavingThrowSchema,
  skill: ComputedSkillSchema,
  slotFiller: SlotFillerSchema,
  spellList: ComputedSpellListSchema,
  spell: ComputedSpellSchema,
-  toggle: ToggleSchema,
-  container: ContainerSchema,
-  item: ItemSchema,
+  toggle: ComputedToggleSchema,
+  container: ComputedContainerSchema,
+  item: ComputedItemSchema,
  any: new SimpleSchema({}),
 };

--- a/app/imports/api/properties/propertySchemasIndex.js
+++ b/app/imports/api/properties/propertySchemasIndex.js
@@ -5,6 +5,7 @@ import { AttackSchema } from '/imports/api/properties/Attacks.js';
 import { AttributeSchema } from '/imports/api/properties/Attributes.js';
 import { BuffSchema } from '/imports/api/properties/Buffs.js';
 import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
+import { ConstantSchema } from '/imports/api/properties/Constants.js';
 import { DamageSchema } from '/imports/api/properties/Damages.js';
 import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
 import { EffectSchema } from '/imports/api/properties/Effects.js';
@@ -30,6 +31,7 @@ const propertySchemasIndex = {
  attribute: AttributeSchema,
  buff: BuffSchema,
  classLevel: ClassLevelSchema,
+  constant: ConstantSchema,
  damage: DamageSchema,
  damageMultiplier: DamageMultiplierSchema,
  effect: EffectSchema,
--- a/app/imports/api/properties/subSchemas/InlineComputationSchema.js
+++ b/app/imports/api/properties/subSchemas/InlineComputationSchema.js
@@ -0,0 +1,16 @@
+import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+
+const InlineComputationSchema = new SimpleSchema({
+	// The part between bracers {}
+  calculation: {
+    type: String,
+  },
+  result: {
+    type: String,
+    optional: true,
+  },
+  errors: ErrorSchema,
+});
+
+export default InlineComputationSchema;
--- a/app/imports/api/properties/subSchemas/RollDetailsSchema.js
+++ b/app/imports/api/properties/subSchemas/RollDetailsSchema.js
@@ -0,0 +1,19 @@
+import SimpleSchema from 'simpl-schema';
+
+const RollDetailsSchema = new SimpleSchema({
+  number: {
+    type: Number,
+  },
+  diceSize: {
+    type: Number,
+  },
+  values: {
+    type: Array,
+    defaultValue: [],
+  },
+  'values.$': {
+    type: Number,
+  },
+});
+
+export default RollDetailsSchema;
--- a/app/imports/api/users/patreon/updatePatreonDetails.js
+++ b/app/imports/api/users/patreon/updatePatreonDetails.js
@@ -9,8 +9,8 @@ const getIdentity = function(accessToken, callback){
      Authorization: 'Bearer ' + accessToken,
    },
    qs: {
-      'include': 'memberships',
-      'fields[member]': 'currently_entitled_amount_cents',
+      'include': 'memberships.currently_entitled_tiers',
+      'fields[tier]': 'amount_cents,title',
    }
  }, callback);
 };
@@ -61,9 +61,18 @@ const updateIdentity = Meteor.wrapAsync(function(accessToken, userId, callback){
    }
    try {
      let identity = JSON.parse(body);
-      let membership = identity.included && identity.included[0];
-      let entitledAmount = membership && membership.attributes
-        .currently_entitled_amount_cents || 0;
+      let entitledAmount = 0;
+      if (identity && identity.included){
+        identity.included.forEach(doc => {
+          if (
+            doc.type === 'tier' &&
+            doc.attributes &&
+            doc.attributes.amount_cents > entitledAmount
+          ){
+            entitledAmount = doc.attributes.amount_cents;
+          }
+        });
+      }
      writeEntitledCents(userId, entitledAmount);
      if (callback) callback();
    } catch(error) {
--- a/app/imports/client/config.js
+++ b/app/imports/client/config.js
@@ -0,0 +1,2 @@
+Meteor.connection._bufferedWritesInterval = 0;
+//Meteor.connection._bufferedWritesMaxAge = 500;
--- a/app/imports/constants/INLINE_CALCULTION_REGEX.js
+++ b/app/imports/constants/INLINE_CALCULTION_REGEX.js
@@ -0,0 +1,3 @@
+const INLINE_CALCULATION_REGEX = /\{([^{}]*)\}/g;
+
+export default INLINE_CALCULATION_REGEX;
--- a/app/imports/constants/PROPERTIES.js
+++ b/app/imports/constants/PROPERTIES.js
@@ -23,6 +23,10 @@ const PROPERTIES = Object.freeze({
    icon: '$vuetify.icons.class_level',
    name: 'Class level'
  },
+  constant: {
+    icon: 'anchor',
+    name: 'Constant'
+  },
  container: {
    icon: 'work',
    name: 'Container'
--- a/app/imports/parser/grammar.js
+++ b/app/imports/parser/grammar.js
@@ -24,7 +24,7 @@ function id(x) { return x[0]; }
      value: s => s.slice(1, -1),
    },
    name: {
-      match: /[a-zA-Z_]*[a-ce-zA-Z_][a-zA-Z0-9_]*/,
+      match: /[a-zA-Z_#]*[a-ce-zA-Z_#][a-zA-Z0-9_#]*/,
      type: moo.keywords({
        'keywords': ['true', 'false'],
      }),
@@ -41,6 +41,7 @@ function id(x) { return x[0]; }
    multiplicativeOperator: ['*', '/'],
    exponentOperator: ['^'],
    additiveOperator: ['+', '-'],
+    moduloOperator: ['%'],
    andOperator: ['&', '&&'],
    orOperator: ['|', '||'],
    stringDelimiters: ['\"', '\''],
@@ -75,8 +76,10 @@ let ParserRules = [
    {"name": "equalityExpression", "symbols": ["relationalExpression"], "postprocess": id},
    {"name": "relationalExpression", "symbols": ["relationalExpression", "_", (lexer.has("relationalOperator") ? {type: "relationalOperator"} : relationalOperator), "_", "additiveExpression"], "postprocess": d => operator(d, 'relation')},
    {"name": "relationalExpression", "symbols": ["additiveExpression"], "postprocess": id},
-    {"name": "additiveExpression", "symbols": ["additiveExpression", "_", (lexer.has("additiveOperator") ? {type: "additiveOperator"} : additiveOperator), "_", "multiplicativeExpression"], "postprocess": d => operator(d, 'add')},
-    {"name": "additiveExpression", "symbols": ["multiplicativeExpression"], "postprocess": id},
+    {"name": "additiveExpression", "symbols": ["additiveExpression", "_", (lexer.has("additiveOperator") ? {type: "additiveOperator"} : additiveOperator), "_", "remainderExpression"], "postprocess": d => operator(d, 'add')},
+    {"name": "additiveExpression", "symbols": ["remainderExpression"], "postprocess": id},
+    {"name": "remainderExpression", "symbols": ["remainderExpression", "_", (lexer.has("moduloOperator") ? {type: "moduloOperator"} : moduloOperator), "_", "multiplicativeExpression"], "postprocess": d => operator(d, 'remainder')},
+    {"name": "remainderExpression", "symbols": ["multiplicativeExpression"], "postprocess": id},
    {"name": "multiplicativeExpression", "symbols": ["multiplicativeExpression", "_", (lexer.has("multiplicativeOperator") ? {type: "multiplicativeOperator"} : multiplicativeOperator), "_", "rollExpression"], "postprocess": d => operator(d, 'multiply')},
    {"name": "multiplicativeExpression", "symbols": ["rollExpression"], "postprocess": id},
    {"name": "rollExpression", "symbols": ["rollExpression", "_", (lexer.has("diceOperator") ? {type: "diceOperator"} : diceOperator), "_", "exponentExpression"], "postprocess": d => new RollNode({left: d[0], right: d[4]})},
@@ -116,11 +119,14 @@ let ParserRules = [
    {"name": "arrayExpression", "symbols": ["parenthesizedExpression"], "postprocess": id},
    {"name": "parenthesizedExpression", "symbols": [{"literal":"("}, "_", "expression", "_", {"literal":")"}], "postprocess": d => new ParenthesisNode({content: d[2]})},
    {"name": "parenthesizedExpression", "symbols": ["accessorExpression"], "postprocess": id},
-    {"name": "accessorExpression$ebnf$1$subexpression$1", "symbols": [{"literal":"."}, "name"], "postprocess": d => d[1].name},
+    {"name": "accessorExpression$subexpression$1", "symbols": [(lexer.has("name") ? {type: "name"} : name)], "postprocess": d => d[0].value},
+    {"name": "accessorExpression$ebnf$1$subexpression$1", "symbols": [{"literal":"."}, (lexer.has("name") ? {type: "name"} : name)], "postprocess": d => d[1].value},
    {"name": "accessorExpression$ebnf$1", "symbols": ["accessorExpression$ebnf$1$subexpression$1"]},
-    {"name": "accessorExpression$ebnf$1$subexpression$2", "symbols": [{"literal":"."}, "name"], "postprocess": d => d[1].name},
+    {"name": "accessorExpression$ebnf$1$subexpression$2", "symbols": [{"literal":"."}, (lexer.has("name") ? {type: "name"} : name)], "postprocess": d => d[1].value},
    {"name": "accessorExpression$ebnf$1", "symbols": ["accessorExpression$ebnf$1", "accessorExpression$ebnf$1$subexpression$2"], "postprocess": function arrpush(d) {return d[0].concat([d[1]]);}},
-    {"name": "accessorExpression", "symbols": ["name", "accessorExpression$ebnf$1"], "postprocess": d=> new AccessorNode({name: d[0], path: d[1]})},
+    {"name": "accessorExpression", "symbols": ["accessorExpression$subexpression$1", "accessorExpression$ebnf$1"], "postprocess": 
+        d=> new AccessorNode({name: d[0], path: d[1]})
+          },
    {"name": "accessorExpression", "symbols": ["valueExpression"], "postprocess": id},
    {"name": "valueExpression", "symbols": ["name"], "postprocess": id},
    {"name": "valueExpression", "symbols": ["number"], "postprocess": id},
--- a/app/imports/parser/grammar.ne
+++ b/app/imports/parser/grammar.ne
@@ -22,7 +22,7 @@
      value: s => s.slice(1, -1),
    },
    name: {
-      match: /[a-zA-Z_]*[a-ce-zA-Z_][a-zA-Z0-9_]*/,
+      match: /[a-zA-Z_#]*[a-ce-zA-Z_#][a-zA-Z0-9_#]*/,
      type: moo.keywords({
        'keywords': ['true', 'false'],
      }),
@@ -39,6 +39,7 @@
    multiplicativeOperator: ['*', '/'],
    exponentOperator: ['^'],
    additiveOperator: ['+', '-'],
+    moduloOperator: ['%'],
    andOperator: ['&', '&&'],
    orOperator: ['|', '||'],
    stringDelimiters: ['\"', '\''],
@@ -91,7 +92,11 @@ relationalExpression ->
 | additiveExpression {% id %}

 additiveExpression ->
-  additiveExpression _ %additiveOperator _ multiplicativeExpression {% d => operator(d, 'add') %}
+  additiveExpression _ %additiveOperator _ remainderExpression {% d => operator(d, 'add') %}
+| remainderExpression {% id %}
+
+remainderExpression ->
+  remainderExpression _ %moduloOperator _ multiplicativeExpression {% d => operator(d, 'remainder') %}
 | multiplicativeExpression {% id %}

 multiplicativeExpression ->
@@ -144,7 +149,9 @@ parenthesizedExpression ->
 | accessorExpression {% id %}

 accessorExpression ->
-  name ( "." name {% d => d[1].name %} ):+ {% d=> new AccessorNode({name: d[0], path: d[1]}) %}
+  (%name {% d => d[0].value %}) ( "." %name {% d => d[1].value %} ):+ {%
+    d=> new AccessorNode({name: d[0], path: d[1]})
+  %}
 | valueExpression {% id %}

 valueExpression ->
--- a/app/imports/parser/parseTree/AccessorNode.js
+++ b/app/imports/parser/parseTree/AccessorNode.js
@@ -7,7 +7,7 @@ export default class AccessorNode extends ParseNode {
    this.name = name;
    this.path = path;
  }
-  compile(scope){
+  compile(scope, context){
    let value = scope && scope[this.name];
    // For objects, get their value
    this.path.forEach(name => {
@@ -16,14 +16,21 @@ export default class AccessorNode extends ParseNode {
    });
    let type = typeof value;
    if (type === 'string' || type === 'number' || type === 'boolean'){
-      return new ConstantNode({value, type, previousNodes: [this]});
+      return new ConstantNode({value, type});
    } else if (type === 'undefined'){
      return new AccessorNode({
        name: this.name,
        path: this.path,
      });
    } else {
-      throw new Meteor.Error(`Unexpected case: ${this.name} resolved to ${value}`);
+      if (context) context.storeError({
+        type: 'error',
+        message: `${this.name} returned an unexpected type`
+      });
+      return new AccessorNode({
+        name: this.name,
+        path: this.path,
+      });
    }
  }
  reduce(scope, context){
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stefan Zermatten	299f5a06dd	Moved inline cacultion regex to a constant to ensure constistency	2021-02-16 10:14:26 +02:00
Stefan Zermatten	2776850311	Fixed missing import	2021-02-12 11:45:32 +02:00
Stefan Zermatten	3e6221309e	Notes now have a summary and a description, some data migration my be needed	2021-02-12 11:44:03 +02:00
Stefan Zermatten	a078ce3d5d	Description fields should now show calculation errors	2021-02-12 11:43:13 +02:00
Stefan Zermatten	b9e0475d07	Markdown now follow Github Flavor Markdown, including single line breaks	2021-02-12 11:11:12 +02:00
Stefan Zermatten	2b345c1f77	Improved error handling for most calculations	2021-02-12 11:00:44 +02:00
Stefan Zermatten	fed87f0a84	Fixed: items and spells should no longer be draggable when you don't have edit permission	2021-02-12 09:41:24 +02:00
Stefan Zermatten	b116be1238	Fixed flickering when inserting properties from library by ensuring consistent ID generation	2021-02-12 00:43:56 +02:00
Stefan Zermatten	ae373330ab	Improved slot fill dialog UI, abandoned column layout in favour of wrapping flex rows	2021-02-12 00:18:29 +02:00
Stefan Zermatten	dcb535c84e	Moved slot filler search to server side, limited docs in subscription	2021-02-11 22:09:43 +02:00
Stefan Zermatten	8c477ad4b1	Fixed constants not being found when used as the only thing in a calculation	2021-02-11 18:01:30 +02:00
Stefan Zermatten	eb2dd3bba1	Fixed computation dependency aggregation broken by refactoring	2021-02-11 16:27:22 +02:00
Stefan Zermatten	dc4808c70a	fixed snackbars being blank	2021-02-11 16:20:33 +02:00
Stefan Zermatten	16c8c1db81	Improved descriptions in log entries	2021-02-11 16:16:22 +02:00
Stefan Zermatten	92a5c1e6c3	Improved log entries for actions	2021-02-11 16:08:31 +02:00
Stefan Zermatten	439eadf079	Condensed logs to a single card per action	2021-02-11 15:48:23 +02:00
Stefan Zermatten	d7083cf242	Hid unused cards on the stats tab	2021-02-11 13:48:10 +02:00
Stefan Zermatten	3af5e820ca	Stopped inactive effects showing up in attributes	2021-02-11 13:38:34 +02:00
Stefan Zermatten	20aaab4dea	Hid inactive notes	2021-02-11 13:14:31 +02:00
Stefan Zermatten	81cdf282ea	Stopped inactive properties from showing computed inline fields, since they are not recomputed while inactive	2021-02-11 13:12:35 +02:00
Stefan Zermatten	3313ed0297	Added constants to the UI and Computation Engine	2021-02-11 13:03:31 +02:00
Stefan Zermatten	25fd5c18e8	Fixed casting broken by refactoring	2021-02-11 10:13:35 +02:00
Stefan Zermatten	5b9bb6e4bc	Fixed spending resources for actions broken by refactoring	2021-02-11 10:13:23 +02:00
Stefan Zermatten	74370f6fec	Performance optimization: Removed creature document from injection to prevent uneccessary Vue re-rendering	2021-02-11 10:04:28 +02:00
Stefan Zermatten	565ddccba6	fixed broken import	2021-02-04 16:55:50 +02:00
Stefan Zermatten	4ea4348a02	Now writing partial recalculations to creature variables	2021-02-04 16:52:26 +02:00
Stefan Zermatten	280f30dab5	Improved dependencies-only recalculations and fixed many calculation bugs	2021-02-04 16:16:51 +02:00
Stefan Zermatten	6d1e3f078c	Optimised when certain recompute functions are called to prevent unccessary work	2021-02-04 13:59:08 +02:00
Stefan Zermatten	326d1bd165	Refactored computation into folders	2021-02-04 13:33:20 +02:00
Stefan Zermatten	87fa941f63	Merge branch 'version-2' of https://github.com/ThaumRystra/DiceCloud into version-2	2021-02-04 11:38:55 +02:00
Stefan Zermatten	449a4fba7d	Refactored creature property methods into separate documents, might have broken a lot of things	2021-02-04 11:38:29 +02:00
Stefan Zermatten	9ff096ec0f	Added modulo operator	2021-02-03 09:33:00 +02:00
Stefan Zermatten	f9f0186d95	Fixed error where parser was not creating accessor nodes correctly	2021-02-03 00:39:11 +02:00
Stefan Zermatten	60ea545ee9	Started implementing `constant` property	2021-02-02 16:36:23 +02:00
Stefan Zermatten	aaa5d0b63b	Allowed effects and calculations to target nearest ancestors of `#type`	2021-02-02 16:11:59 +02:00
Stefan Zermatten	69c72e0987	Fixed parenthesis being discarded from compiled calculations in cases where they should not be	2021-02-02 15:13:49 +02:00
Stefan Zermatten	a6df4df534	Fixed some fields not storing strings when compiling calculations	2021-02-02 15:07:31 +02:00
Stefan Zermatten	8b8f9bea6f	Removed character variables from creatures injected into character sheet as context	2021-01-31 20:13:45 +02:00
Stefan Zermatten	e7a27e4b83	Fixed hit dice breaking long rests	2021-01-31 19:45:14 +02:00
Stefan Zermatten	e14e875c42	Fixed conMod not being signed in hit dice tiles	2021-01-31 19:43:09 +02:00
Stefan Zermatten	a7898bfe4b	Fixed props not having a default array for embedded calculations	2021-01-31 19:42:49 +02:00
Stefan Zermatten	aee899e181	Removed all UI computations from viewers and components	2021-01-31 18:42:17 +02:00
Stefan Zermatten	a5284bf6e8	Made 'always prepared' spells show up in casting list	2021-01-30 11:22:29 +02:00
Stefan Zermatten	0ea3f7a975	Migrated fields to embedded property calculations	2021-01-29 13:04:53 +02:00
Stefan Zermatten	1167538977	Denormalised inline calculations to property documents, needs to be referenced by UI still	2021-01-29 12:29:01 +02:00
Stefan Zermatten	9c799e3dc9	Added search to slot fill dialog	2021-01-28 17:09:37 +02:00
Stefan Zermatten	2bf749c4f1	Fixed: Layout of slot fill dialog is no longer broken by tall images, background is now the correct color	2021-01-28 16:48:33 +02:00
Stefan Zermatten	db83d5f82a	Fix: Tabs and tab headers no longer lose sync when changing characters	2021-01-28 16:17:03 +02:00
Stefan Zermatten	d596061fa8	Fixed: Attributes that aren't ability scores now have their modifiers removed correctly	2021-01-28 16:05:47 +02:00
Stefan Zermatten	78efe639ed	Fixed: Zero effect passive bonus now causes passive skill value to show.	2021-01-28 16:01:58 +02:00
Stefan Zermatten	e5bde38745	Removed console timers from recompute function: it's not the primary slowdown	2021-01-28 15:00:36 +02:00
Stefan Zermatten	83f2047dbe	Replaced expensive `getActiveProperties` with cheaper filter by `inactive` field	2021-01-28 14:29:10 +02:00
Stefan Zermatten	fc03097ed8	Patreon access is now given by tier instead of by price paid	2021-01-28 12:15:45 +02:00
Stefan Zermatten	252ac23391	Merge branch 'version-2' of https://github.com/ThaumRystra/DiceCloud into version-2	2021-01-27 22:25:19 +02:00
Stefan Zermatten	531ddce6a0	Added dependency tracking to computations for future optimization effort	2021-01-27 22:24:28 +02:00
Stefan Zermatten	3cdeb73c30	Stopped removed items from showing up in inventory containers	2021-01-25 12:38:46 +02:00