diff --git a/rpg-docs/Model/Character/Effects.js b/rpg-docs/Model/Character/Effects.js
index 1af8b531..cdf794fe 100644
--- a/rpg-docs/Model/Character/Effects.js
+++ b/rpg-docs/Model/Character/Effects.js
@@ -60,7 +60,11 @@ Characters.after.insert(function (userId, char) {
 			name: "Constitution modifier for each level",
 			stat: "hitPoints",
 			operation: "add",
-			calculation: "level * constitutionMod"
+			calculation: "level * constitutionMod",
+			parent: {
+				id: char._id,
+				collection: "Characters"
+			}
 		});
 		Effects.insert({
 			charId: char._id,
@@ -68,7 +72,11 @@ Characters.after.insert(function (userId, char) {
 			name: "Proficiency bonus by level",
 			stat: "proficiencyBonus",
 			operation: "add",
-			calculation: "floor(level / 4 + 1.75)"
+			calculation: "floor(level / 4 + 1.75)",
+			parent: {
+				id: char._id,
+				collection: "Characters"
+			}
 		});
 		Effects.insert({
 			charId: char._id,
@@ -76,7 +84,11 @@ Characters.after.insert(function (userId, char) {
 			name: "Dexterity Armor Bonus",
 			stat: "armor",
 			operation: "add",
-			calculation: "dexterityArmor"
+			calculation: "dexterityArmor",
+			parent: {
+				id: char._id,
+				collection: "Characters"
+			}
 		});
 		Effects.insert({
 			charId: char._id,
@@ -84,7 +96,11 @@ Characters.after.insert(function (userId, char) {
 			name: "Natural Armor",
 			stat: "armor",
 			operation: "base",
-			value: 10
+			value: 10,
+			parent: {
+				id: char._id,
+				collection: "Characters"
+			} 
 		});
 	}
 });
diff --git a/rpg-docs/Model/Inventory/Containers.js b/rpg-docs/Model/Inventory/Containers.js
index 5335414f..c942e3a4 100644
--- a/rpg-docs/Model/Inventory/Containers.js
+++ b/rpg-docs/Model/Inventory/Containers.js
@@ -16,14 +16,14 @@ Containers.attachSchema(Schemas.Container);
 Containers.helpers({
 	totalValue: function(){
 		var value = this.value;
-		Items.find({container: this._id, equipped: false}, {fields: {quantity: 1, value: 1}}).forEach(function(item){
+		Items.find({"parent.id": this._id}, {fields: {quantity: 1, value: 1}}).forEach(function(item){
 			value += item.totalValue();
 		});
 		return value;
 	},
 	totalWeight: function(){
 		var weight = this.weight;
-		Items.find({container: this._id, equipped: false}, {fields: {quantity: 1, weight: 1}}).forEach(function(item){
+		Items.find({"parent.id": this._id}, {fields: {quantity: 1, weight: 1}}).forEach(function(item){
 			weight += item.totalWeight();
 		});
 		return weight;
diff --git a/rpg-docs/Model/Inventory/Items.js b/rpg-docs/Model/Inventory/Items.js
index c1eb687a..0675621a 100644
--- a/rpg-docs/Model/Inventory/Items.js
+++ b/rpg-docs/Model/Inventory/Items.js
@@ -33,17 +33,24 @@ Items.helpers({
 			return this.name;
 		}
 	},
-	equip: function(){
-		Items.update(this._id, {$set: {enabled: true}});
+	equip: function(characterId){
+		var charId = characterId || this.charId;
+		if(!charId || ! Characters.findOne(charId)) throw "Invalid character";
+		if(this.parent.collection === "Characters" && this.parent.id === charId && this.enabled) return;
+		Items.update(this._id, {$set: {"parent.collection": "Characters", "parent.id": charId, enabled: true}});
 	},
 	unequip: function(){
+		if(!this.enabled) return;
 		Items.update(this._id, {$set: {enabled: false}});
 	},
 	moveToContainer: function(containerId){
+		if( !containerId || !Containers.findOne(containerId) ) throw "Invalid container";
+		if(this.parent.collection === "Containers" && this.parent.id === containerId && !this.enabled) return;
 		Items.update(this._id, {$set: {"parent.collection": "Containers", "parent.id": containerId, enabled: false}});
 	},
 	moveToCharacter: function(characterId){
-		if(this.charId === characterId) return;
+		if(!characterId || ! Characters.findOne(characterId)) throw "Invalid character";
+		if(this.parent.collection === "Characters" && this.parent.id === characterId && !this.enabled) return;
 		Items.update(this._id, {$set: {"parent.collection": "Characters", "parent.id": characterId, charId: characterId, enabled: false}});
 	}
 });
diff --git a/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.html b/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.html
index 789f916f..8ce4c03d 100644
--- a/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.html
+++ b/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.html
@@ -1,4 +1,4 @@
-<!--needs to be given charId, sourceId and type-->
+<!--needs to be given charId, parentId and type-->
 <template name="attackEditList">
 	{{#if attacks.count}}
 		<hr style="margin: 16px 0 16px 0;">
diff --git a/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.js b/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.js
index 36ba61fe..66208283 100644
--- a/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.js
+++ b/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.js
@@ -1,21 +1,19 @@
 Template.attackEditList.helpers({
 	attacks: function(){
-		var cursor = Attacks.find({sourceId: this.sourceId, type: this.type});
+		var cursor = Attacks.find({"parent.id": this.parentId, type: this.type, charId: this.charId});
 		return cursor;
 	}
 });
 
 Template.attackEditList.events({
 	"tap #addAttackButton": function(){
-		if ( !_.isBoolean(this.enabled) ) {
-			this.enabled = true;
-		}
 		Attacks.insert({
-			name: this.name,
 			charId: this.charId,
-			sourceId: this.sourceId,
+			parent: {
+				id: this.parentId,
+				collection: this.parentCollection
+			},
 			type: this.type,
-			enabled: this.enabled
 		});
 	},
 });
diff --git a/rpg-docs/client/views/character/effects/effectView/effectView.html b/rpg-docs/client/views/character/effects/effectView/effectView.html
index 4208b334..abf095c7 100644
--- a/rpg-docs/client/views/character/effects/effectView/effectView.html
+++ b/rpg-docs/client/views/character/effects/effectView/effectView.html
@@ -1,10 +1,10 @@
 <template name="effectView">
 	<div class="effectView" layout horizontal center>
-		{{#if sourceId}}
-			<div>{{sourceName}}</div>
-		{{else}}
+		{{#with statName}}
 			<div flex>{{statName}}</div>
-		{{/if}}
+		{{else}}
+			<div flex>{{sourceName}}</div>
+		{{/with}}
 		<div>{{operationName}}</div>
 		<div>{{statValue}}</div>
 		<br>
diff --git a/rpg-docs/client/views/character/effects/effectView/effectView.js b/rpg-docs/client/views/character/effects/effectView/effectView.js
index b803f8ad..e8b525f0 100644
--- a/rpg-docs/client/views/character/effects/effectView/effectView.js
+++ b/rpg-docs/client/views/character/effects/effectView/effectView.js
@@ -86,20 +86,20 @@ var operations = {
 
 Template.effectView.helpers({
 	sourceName: function(){
-		var id = this.sourceId;
+		var id = this.parent.id;
 		if(!id) return;
-		switch(this.type){
-			case "feature":
+		switch(this.parent.collection){
+			case "Features":
 				return "Feature - " + Features.findOne(id, {fields: {name: 1}}).name;
-			case "class":
+			case "Classes":
 				return Classes.findOne(id, {fields: {name: 1}}).name;
-			case "buff":
+			case "Buffs":
 				return "Buff - " + Buffs.findOne(id, {fields: {name: 1}}).name;
-			case "equipment":
+			case "Items":
 				return "Equipment - " + Items.findOne(id, {fields: {name: 1}}).name;
-			case "racial":
+			case "Characters":
 				return Characters.findOne(this.charId, {fields: {race: 1}}).race;
-			case "inate":
+			default:
 				return "Inate"
 		}
 	},
diff --git a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html
index 80b77f0e..b2ab66db 100644
--- a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html
+++ b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html
@@ -1,4 +1,4 @@
-<!--needs to be given charId, sourceId and type-->
+<!--needs to be given charId, parentId, parentCollection and type-->
 <template name="effectsEditList">
 	{{#if effects.count}}
 		<hr style="margin: 16px 0 16px 0;">
diff --git a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js
index 06c45b7f..a3e9ad39 100644
--- a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js
+++ b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js
@@ -1,6 +1,6 @@
 Template.effectsEditList.helpers({
 	effects: function(){
-		var cursor = Effects.find({sourceId: this.sourceId, type: this.type});
+		var cursor = Effects.find({"parent.id": this.parentId, "parent.collection": this.parentCollection, type: this.type});
 		return cursor;
 	}
 });
@@ -13,7 +13,10 @@ Template.effectsEditList.events({
 		Effects.insert({
 			name: this.name,
 			charId: this.charId,
-			sourceId: this.sourceId,
+			parent: {
+				id: this.parentId,
+				collection: this.parentCollection
+			},
 			operation: "add",
 			type: this.type,
 			enabled: this.enabled
diff --git a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html b/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html
index 173e780c..8659bc8d 100644
--- a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html
+++ b/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html
@@ -1,4 +1,4 @@
-<!--needs to be given charId, sourceId and type-->
+<!--needs to be given charId, (parentId or stat) and type-->
 <template name="effectsViewList">
 	{{#if effects}}
 		<hr style="margin: 16px 0 16px 0;">
diff --git a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.js b/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.js
index 92427188..7a9042c2 100644
--- a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.js
+++ b/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.js
@@ -1,7 +1,7 @@
 Template.effectsViewList.helpers({
 	effects: function(){
-		if(this.sourceId){
-			return Effects.find({sourceId: this.sourceId, type: this.type, charId: this.charId}, {fields: {sourceId: 0}});
+		if(this.parentId){
+			return Effects.find({"parent.id": this.parentId, type: this.type, charId: this.charId}, {fields: {parent: 0}});
 		} else if(this.stat){
 			return Effects.find({charId: this.charId, stat: this.stat});
 		}
diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
index cf698f85..45a49e37 100644
--- a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
+++ b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
@@ -34,7 +34,7 @@
 					</paper-dropdown>
 				</paper-dropdown-menu>
 			</div>
-			{{> effectsEditList sourceId=_id charId=charId type="feature" name=name enabled=isEnabled}}
+			{{> effectsEditList parentId=_id parentCollection="Features" charId=charId type="feature" name=name enabled=isEnabled}}
 		{{/baseDialog}}
 	{{/with}}
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/inventory/inventory.css b/rpg-docs/client/views/character/inventory/inventory.css
index 548da32b..f7cb5b0a 100644
--- a/rpg-docs/client/views/character/inventory/inventory.css
+++ b/rpg-docs/client/views/character/inventory/inventory.css
@@ -116,7 +116,7 @@ div#stats {
 .inventoryItem {
 	background: white;
 	transition: box-shadow 0.3s ease,
-		opacity 0.3s ease;
+		opacity 0.5s ease-in-out;
 	height: 40px;
 	margin: 1px 0 1px 0;
 	font-size: 16px;
diff --git a/rpg-docs/client/views/character/inventory/inventory.js b/rpg-docs/client/views/character/inventory/inventory.js
index 87155ece..9cba6291 100644
--- a/rpg-docs/client/views/character/inventory/inventory.js
+++ b/rpg-docs/client/views/character/inventory/inventory.js
@@ -7,10 +7,10 @@ Template.inventory.helpers({
 		return Containers.find({charId: this._id}, {sort: {color: 1, name: 1}})
 	},
 	items: function(charId, containerId){
-		return Items.find({charId: charId, equipped: false, container: containerId }, {sort: {color: 1, name: 1}});
+		return Items.find({charId: charId, "parent.id": containerId }, {sort: {color: 1, name: 1}});
 	},
 	equipment: function(){
-		return Items.find({ charId: this._id, equipped: true }, {sort: {color: 1, name: 1}});
+		return Items.find({ charId: this._id, enabled: true }, {sort: {color: 1, name: 1}});
 	},
 	showAddButtons: function(){
 		return Template.instance().showAddButtons.get();
@@ -30,21 +30,21 @@ Template.inventory.helpers({
 		Containers.find({charId: this._id, isCarried: true}).forEach(function(container){
 			weight += container.totalWeight();
 		});
-		Items.find({charId: this._id, equipped: true}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
+		Items.find({charId: this._id, "parent.id": this._id}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
 			weight += item.totalWeight();
 		});
 		return weight;
 	},
 	equipmentValue: function(){
 		var value = 0;
-		Items.find({charId: this._id, equipped: true}, {fields: {value : 1, quantity: 1}}).forEach(function(item){
+		Items.find({charId: this._id, enabled: true}, {fields: {value : 1, quantity: 1}}).forEach(function(item){
 			value += item.totalValue();
 		});
 		return value;
 	},
 	equipmentWeight: function(){
 		var weight = 0;
-		Items.find({charId: this._id, equipped: true}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
+		Items.find({charId: this._id, enabled: true}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
 			weight += item.totalWeight();
 		});
 		return weight;
@@ -63,7 +63,13 @@ Template.inventory.events({
 			containerId = Containers.insert({name: "New Container", isCarried: true, charId: this._id});
 		}
 		_.defer(function(){
-			var itemId = Items.insert({charId: charId, container: containerId});
+			var itemId = Items.insert({
+				charId: charId, 
+				parent:{
+					id: containerId,
+					collection: "Containers"
+				} 
+			});
 			GlobalUI.setDetail({
 				template: "itemDialog",
 				data:     {itemId: itemId, charId: charId},
@@ -128,35 +134,18 @@ Template.layout.events({
 		event.preventDefault();
 	},
 	"dragover .equipmentContainer": function(event, instance){
-		var containerId = Session.get("inventory.dragItemOriginalContainer");
-		var charId = Session.get("inventory.dragItemOriginalCharacter");
-
-		if (this._id !== charId) return; //we can't equip something we don't own
-
-		var item = Items.findOne(Session.get("inventory.dragItemId"));
-		if (item.equipmentSlot === "none") return; //we can't equip this
-
 		event.preventDefault(); //this is a valid drop zone
 	},
-	"drop .container": function(event, instacne){
+	"drop .itemContainer": function(event, instacne){
 		var item = Items.findOne(Session.get("inventory.dragItemId"));
-		if (!item) return; //the item doesn't exist
-		if (item.container === this._id && !item.equipped) return; //the item is already here
-		if(Containers.findOne(this._id)){//the container exists
-			Items.update(item._id, {$set: {container: this._id, charId: this.charId, equipped: false}});
-		}
+		//move item to the container
+		item.moveToContainer(this._id)
 		resetInvetorySession();
 	},
 	"drop .equipmentContainer": function(event, instance){
-		var containerId = Session.get("inventory.dragItemOriginalContainer");
 		var charId = Session.get("inventory.dragItemOriginalCharacter");
-
-		if (this._id !== charId) return; //we can't equip something we don't own
-
 		var item = Items.findOne(Session.get("inventory.dragItemId"));
-		if (item.equipmentSlot === "none") return; //we can't equip this
-		//equip the item if it's not equipped
-		if(!item.equipped) Items.update(item._id, {$set: {equipped: true, container: containerId, charId: charId}});
+		item.equip(charId);
 		resetInvetorySession();
 	}
 })
diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
index e8296652..0db13ed4 100644
--- a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
+++ b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
@@ -7,9 +7,9 @@
 			<!--Container dropdown-->
 			<paper-dropdown-menu id="containerDropDown" label="Container">
 				<paper-dropdown layered class="dropdown">
-					<core-menu class="menu"  selected={{containerIndex}}>
+					<core-menu class="menu"  selected={{parent.id}}>
 						{{#each containers}}
-							<paper-item containerId={{_id}} class="containerMenuItem">{{name}}</paper-item>
+							<paper-item name={{_id}} class="containerMenuItem">{{name}}</paper-item>
 						{{/each}}
 					</core-menu>
 				</paper-dropdown>
@@ -57,9 +57,9 @@
 			</paper-input-decorator>
 			{{#if canEquip}}
 				<!--Effects-->
-				{{> effectsEditList sourceId=_id charId=charId type="equipment" enabled=equipped name=name}}
+				{{> effectsEditList parentId=_id parentCollection="Items" charId=charId type="equipment" enabled=equipped name=name}}
 				<!--Attacks-->
-				{{> attackEditList sourceId=_id charId=charId type="equipment" enabled=equipped name=name}}
+				{{> attackEditList  parentId=_id parentCollection="Items" charId=charId type="equipment" enabled=equipped name=name}}
 			{{/if}}
 		{{/baseDialog}}
 	{{/with}}
diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js
index 34d5fbb1..4a5f56be 100644
--- a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js
+++ b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js
@@ -19,11 +19,6 @@ Template.itemDialog.helpers({
 	containers: function(){
 		return getContainers(this.charId);
 	},
-	containerIndex: function(){
-		var containers = getContainers(this.charId);
-		var containerIds = _.pluck(containers, "_id");
-		return _.indexOf(containerIds, this.container);
-	},
 	equipmentSlots: function(){
 		return equipmentSlots;
 	},
@@ -79,8 +74,9 @@ Template.itemDialog.events({
 	"core-select #containerDropDown": function(event){
 		var detail = event.originalEvent.detail;
 		if(!detail.isSelected) return;
-		var containerId = detail.item.getAttribute("containerId");
-		Items.update(Template.currentData().itemId, {$set: {container: containerId}});
+		var containerId = detail.item.getAttribute("name");
+		var item = Items.findOne(Template.currentData().itemId);
+		item.moveToContainer(containerId);
 	},
 	"core-select #slotDropDown": function(event){
 		var detail = event.originalEvent.detail;
diff --git a/rpg-docs/client/views/character/journal/classDialog/classDialog.html b/rpg-docs/client/views/character/journal/classDialog/classDialog.html
index ee2b6d68..307ee1b1 100644
--- a/rpg-docs/client/views/character/journal/classDialog/classDialog.html
+++ b/rpg-docs/client/views/character/journal/classDialog/classDialog.html
@@ -6,7 +6,7 @@
 			<!--Level-->
 			<paper-input id="levelValueInput" label="Level" floatinglabel value={{level}}></paper-input>
 			<!--Effects-->
-			{{> effectsEditList sourceId=_id charId=charId type="class"}}
+			{{> effectsEditList parentId=_id parentCollection="Classes" charId=charId type="class"}}
 		{{/baseDialog}}
 	{{/with}}
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
index 4565800e..f3ada17b 100644
--- a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
+++ b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
@@ -1,6 +1,6 @@
 <template name="raceDialog">
 	{{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true"}}
 		<paper-input id="raceInput" label="Race" floatinglabel value={{race}}></paper-input>
-		{{> effectsEditList sourceId=_id charId=charId type="racial"}}
+		{{> effectsEditList parentId=_id parentCollection="Characters" charId=charId type="racial"}}
 	{{/baseDialog}}
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
index 2b532073..1008a367 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
@@ -8,7 +8,7 @@
 			<!--List dropdown-->
 			<paper-dropdown-menu id="listDropdown" label="Spell List">
 				<paper-dropdown layered class="dropdown">
-					<core-menu class="menu"  selected={{listId}}>
+					<core-menu class="menu"  selected={{parent.id}}>
 						{{#each spellLists}}
 						<paper-item name={{_id}} class="containerMenuItem">{{name}}</paper-item>
 						{{/each}}
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
index a57487fa..ef46a8ca 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
@@ -69,8 +69,8 @@ Template.spellDialog.events({
 		var detail = event.originalEvent.detail;
 		if(!detail.isSelected) return;
 		var value = detail.item.getAttribute("name");
-		if (value == this.listId) return;
-		Spells.update(this._id, {$set: {listId: value}});
+		if (value == this.parent.id) return;
+		Spells.update(this._id, {$set: {"parent.id": value}});
 	},
 	"core-select #levelDropdown": function(event){
 		var detail = event.originalEvent.detail;
diff --git a/rpg-docs/client/views/character/spells/spells.js b/rpg-docs/client/views/character/spells/spells.js
index a9e712b2..d635bbc8 100644
--- a/rpg-docs/client/views/character/spells/spells.js
+++ b/rpg-docs/client/views/character/spells/spells.js
@@ -16,22 +16,23 @@ Template.spells.helpers({
 		return SpellLists.find({charId: this._id}, {sort: {color: 1, name: 1}});
 	},
 	spellCount: function(list, charId){
+		if(!list || !list.settings) return;
 		if(list.settings.showUnprepared){
-			return Spells.find( {charId: charId, listId: list._id, level: this.level}, 
+			return Spells.find( {charId: charId, "parent.id": list._id, level: this.level}, 
 							   {fields: {_id: 1, level: 1}} ).count() > 0;
 		} else{
-			return Spells.find( {charId: charId, listId: list._id, level: this.level, prepared: {$in: ["prepared", "always"]} }, 
+			return Spells.find( {charId: charId, "parent.id": list._id, level: this.level, prepared: {$in: ["prepared", "always"]} }, 
 							   {fields: {_id: 1, level: 1}} ).count() > 0;
 		}
 	},
 	spells: function(listId, charId){
-		return Spells.find( {charId: charId, listId: listId, level: this.level}, {sort: {color: 1, name: 1}} );
+		return Spells.find( {charId: charId, "parent.id": listId, level: this.level}, {sort: {color: 1, name: 1}} );
 	},
 	levels: function(){
 		return spellLevels;
 	},
 	numPrepared: function(){
-		return Spells.find({charId: Template.parentData()._id, listId: this._id, prepared: "prepared"}).count();
+		return Spells.find({charId: Template.parentData()._id, "parent.id": this._id, prepared: "prepared"}).count();
 	},
 	order: function(){
 		return _.indexOf(_.keys(colorOptions), this.color);
@@ -168,17 +169,20 @@ Template.spells.events({
 	},
 	"tap #addSpell": function(event){
 		var charId = this.charId;
-		var listId = this.listId;
+		var listId = SpellLists.findOne({charId: this._id})._id;
 		Spells.insert({
 			name: "New Spell", 
 			charId: this._id,
-			listId: SpellLists.findOne({charId: this._id})._id,
+			parent: {
+				id: listId,
+				collection: "SpellLists"
+			},
 			prepared: "prepared"
 		}, function(error, id){
 			if(!error){
 				GlobalUI.setDetail({
 					template: "spellDialog",
-					data:     {spellId: id, charId: charId, listId: listId},
+					data:     {spellId: id, charId: charId},
 					heroId:   id
 				});
 			}
diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
index 590ded00..cbeaea6a 100644
--- a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
+++ b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
@@ -152,7 +152,7 @@ Template.skillDialog.helpers({
 		return Characters.findOne(this.charId, {fields:{_id: 1}});
 	},
 	sourceName: function(){
-		var id = this.sourceId;
+		var id = this.parent.id;
 		if(!id) return;
 		switch(this.type){
 			case "feature":
diff --git a/rpg-docs/lib/functions/parenting.js b/rpg-docs/lib/functions/parenting.js
index 38af32e2..1cec4733 100644
--- a/rpg-docs/lib/functions/parenting.js
+++ b/rpg-docs/lib/functions/parenting.js
@@ -14,7 +14,7 @@ var joinWithDefaultKeys = function(keys){
 		'restoredBy'
 	];
 	return _.union(keys, defaultKeys);
-}
+};
 
 var limitModifierToKeys = function(modifier, keys){
 	if(!modifier) return;
@@ -24,7 +24,23 @@ var limitModifierToKeys = function(modifier, keys){
 	if(_.isEmpty(modifier.$set))   delete modifier.$set;
 	if(_.isEmpty(modifier.$unset)) delete modifier.$unset;
 	return modifier;
-}
+};
+
+var getParent = function(doc){
+	if(!doc || !doc.parent) return;
+	var parentCol = Meteor.isClient? 
+		window[doc.parent.collection] : global[doc.parent.collection];
+	if (parentCol)
+		return parentCol.findOne(doc.parent.id, {removed: true});
+};
+
+var inheritParentProperties = function(doc, collection){
+	var parent = getParent(doc);
+	if(!parent) throw new Meteor.Error('Parenting Error',
+									   'Document\'s parent does not exist');
+	var handMeDowns = _.pick(parent, collection.inheritedKeys);
+	collection.update(doc._id, {$set: handMeDowns});
+};
 
 var childCollections = [];
 
@@ -34,25 +50,23 @@ makeChild = function(collection, inheritedKeys){
 	collection.helpers({
 		//returns the parent even if it's removed
 		getParent: function(){
-			var parentCol = Meteor.isClient? 
-				window[this.parent.collection] : global[this.parent.collection];
-			if (parentCol)
-				return parentCol.findOne(this.parent.id, {removed: true});
+			return getParent(this);
 		},
 		getParentCollection: function(){
 			return Meteor.isClient? 
 				window[this.parent.collection] : global[this.parent.collection];
 		}
 	});
+	
+	//when created, inherit parent properties
+	collection.after.insert(function(userId, doc){
+		inheritParentProperties(doc, collection);
+	});
 
 	//when we change parents, inherit its properties
 	collection.after.update(function (userId, doc, fieldNames, modifier, options) {
 		if(modifier && modifier.$set && modifier.$set.parent){
-			var parent = doc.getParent();
-			if(!parent) throw new Meteor.Error('Parenting Error',
-											   'Document\'s parent does not exist');
-			var handMeDowns = _.pick(parent, collection.inheritedKeys);
-			collection.update(doc._id, {$set: handMeDowns});
+			inheritParentProperties(doc, collection);
 		}
 	});