diff --git a/src/main/java/cactusServer/resources/CharactersRest.java b/src/main/java/cactusServer/resources/CharactersRest.java
index de4d5f7..9e87709 100644
--- a/src/main/java/cactusServer/resources/CharactersRest.java
+++ b/src/main/java/cactusServer/resources/CharactersRest.java
@@ -22,7 +22,7 @@
 
 @Path("/instances/{instanceId}/characters")
 public class CharactersRest {
-	
+
 	@Path("/{characterId}")
 	@GET
 	@Produces(MediaType.APPLICATION_JSON)
@@ -36,7 +36,13 @@
 		}
 		return null;
 	}
-	
+
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public HashMap<String, Character> getCharacters(@PathParam("instanceId") String instanceId) {
+		return Instances.getInstance().getInstance(instanceId).getCharacters();
+	}
+
 	@POST
 	@Produces(MediaType.APPLICATION_JSON)
 	public HashMap<String, Character> createCharacter(@PathParam("instanceId") String instanceId,
@@ -44,7 +50,8 @@
 			@FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle,
 			@FormParam("modelID") int modelID) {
 		Instance instance = Instances.getInstance().getInstance(instanceId);
-		HashMap<String, Character> idMap = instance.createCharacter(instanceId, accountURI, name, position, angle, modelID);
+		HashMap<String, Character> idMap = instance.createCharacter(instanceId, accountURI, name, position, angle,
+				modelID);
 		HashMap<String, Character> uriMap = new HashMap<>();
 		for (String id : idMap.keySet()) {
 			String uri = (InstancesRest.INSTANCES_URI + "/" + instanceId + "/characters/") + id;
@@ -52,12 +59,13 @@
 		}
 		return uriMap;
 	}
-	
+
 	@Path("/{characterId}")
 	@PUT
 	@Produces(MediaType.APPLICATION_JSON)
-	public Character updateCharacter(@FormParam("characterId") String characterId, 
-			@FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle, @FormParam("modelID") String modelID) {
+	public Character updateCharacter(@FormParam("characterId") String characterId,
+			@FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle,
+			@FormParam("modelID") String modelID) {
 		Character character = updateCharacter(characterId, position, angle, modelID);
 		if (character != null) {
 			throw new WebApplicationException(200);
@@ -65,7 +73,5 @@
 			throw new WebApplicationException(400);
 		}
 	}
-	
-
 
 }
diff --git a/src/main/java/cactusServer/resources/ObjectsRest.java b/src/main/java/cactusServer/resources/ObjectsRest.java
index 65cdd9f..b64726d 100644
--- a/src/main/java/cactusServer/resources/ObjectsRest.java
+++ b/src/main/java/cactusServer/resources/ObjectsRest.java
@@ -37,6 +37,12 @@
 		return null;
 	}
 
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public HashMap<String, Object> getObjects(@PathParam("instanceId") String instanceId) {
+		return Instances.getInstance().getInstance(instanceId).getObjects();
+	}
+
 	// @Path("/{instanceId}/objects")
 	@POST
 	@Produces(MediaType.APPLICATION_JSON)
@@ -45,7 +51,8 @@
 			@FormParam("angularVelocity") AngularVelocity3D angularVelocity, @FormParam("angle") Quaternion3D angle,
 			@FormParam("attribute") Attribute attribute, @FormParam("model") String model) {
 		Instance instance = Instances.getInstance().getInstance(instanceId);
-		HashMap<String, Object> idMap = instance.createObject(position, velocity, angularVelocity, angle, attribute, model);
+		HashMap<String, Object> idMap = instance.createObject(position, velocity, angularVelocity, angle, attribute,
+				model);
 		HashMap<String, Object> uriMap = new HashMap<>();
 		for (String id : idMap.keySet()) {
 			String uri = (InstancesRest.INSTANCES_URI + "/" + instanceId + "/objects/") + id;
@@ -53,15 +60,15 @@
 		}
 		return uriMap;
 	}
-//	// @Path("/{instance-id}/objects/{object-id}")
-//	@Path("/{object-id}")
-//	@PUT
-//	@Produces(MediaType.APPLICATION_JSON)
-//	public Object updateObject(@FormParam("objectId") String objectId,
-//			@FormParam("position") Position3D position,
-//			@FormParam("velocity") Velocity3D velocity,
-//			@FormParam("angularVelocity") AngularVelocity3D angularVelocity,
-//			@FormParam("angle") Quaternion3D angle) {
-//
-//	}
+	// // @Path("/{instance-id}/objects/{object-id}")
+	// @Path("/{object-id}")
+	// @PUT
+	// @Produces(MediaType.APPLICATION_JSON)
+	// public Object updateObject(@FormParam("objectId") String objectId,
+	// @FormParam("position") Position3D position,
+	// @FormParam("velocity") Velocity3D velocity,
+	// @FormParam("angularVelocity") AngularVelocity3D angularVelocity,
+	// @FormParam("angle") Quaternion3D angle) {
+	//
+	// }
 }
diff --git a/src/main/java/cactusServer/resources/PlayersRest.java b/src/main/java/cactusServer/resources/PlayersRest.java
index 0cce697..ba9b4ad 100644
--- a/src/main/java/cactusServer/resources/PlayersRest.java
+++ b/src/main/java/cactusServer/resources/PlayersRest.java
@@ -46,6 +46,11 @@
 		}
 		return null;
 	}
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public HashMap<String, Player> getPlayers(){
+		return Instances.getInstance().getPlayers();
+	}
 	
 	@Path("/{playerId}")
 	@PUT