diff --git a/rpg-docs/Routes/Routes.js b/rpg-docs/Routes/Routes.js
index d041cd27..4bbd07d1 100644
--- a/rpg-docs/Routes/Routes.js
+++ b/rpg-docs/Routes/Routes.js
@@ -2,9 +2,12 @@ Router.map( function () {
 	this.route('home', 
 			   {
 		path: '/',
+		waitOn: function(){
+			return Meteor.subscribe("characterList", Meteor.userId());
+		},
 		data: { 
 			characters: function(){
-				return Characters.find({owner: Meteor.userId()}) 
+				return Characters.find() 
 			}
 		}
 	});
@@ -12,6 +15,9 @@ Router.map( function () {
 	this.route('character', {
 		path: '/character/:_id',
 		notFoundTemplate: 'characterNotFound',
+		waitOn: function(){
+			return Meteor.subscribe("singleCharacter", this.params._id, Meteor.userId());
+		},
 		data: function() {
 			var data = Characters.findOne({_id: this.params._id});
 			return data;
diff --git a/rpg-docs/server/publications/characterList.js b/rpg-docs/server/publications/characterList.js
new file mode 100644
index 00000000..7e3a62cc
--- /dev/null
+++ b/rpg-docs/server/publications/characterList.js
@@ -0,0 +1,4 @@
+Meteor.publish("characterList",function(userId){
+	//TODO also return characters this user can view
+	return Characters.find({owner: userId});
+});
\ No newline at end of file
diff --git a/rpg-docs/server/publications/singleCharacter.js b/rpg-docs/server/publications/singleCharacter.js
new file mode 100644
index 00000000..01b90f21
--- /dev/null
+++ b/rpg-docs/server/publications/singleCharacter.js
@@ -0,0 +1,4 @@
+Meteor.publish("singleCharacter", function(characterId, userId){
+	//TODO check if this characer can be viewed by this user
+	return Characters.find({_id: characterId});
+});
\ No newline at end of file