diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java
index 9900861b93cc..853b678a2ebe 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Option.java
@@ -27,7 +27,7 @@
 /**
  * Base class for Resource Manager operation options
  */
-public class Option implements Serializable {
+class Option implements Serializable {
 
   private static final long serialVersionUID = 2655177550880762967L;
 
@@ -70,4 +70,3 @@ public String toString() {
         .toString();
   }
 }
-
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index b9abdabc9f87..a08d7e3714be 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -21,8 +21,10 @@
 /**
  * A Google Cloud Resource Manager project object.
  *
- * This class' member variables are immutable.  Methods that change or update the underlying Project
- * information return a new Project instance.
+ * A Project is a high-level Google Cloud Platform entity. It is a container for ACLs, APIs,
+ * AppEngine Apps, VMs, and other Google Cloud Platform resources. This class' member variables are
+ * immutable.  Methods that change or update the underlying Project information return a new Project
+ * instance.
  */
 public class Project {
 
@@ -69,7 +71,7 @@ public ResourceManager resourceManager() {
    * @throws ResourceManagerException upon failure
    */
   public Project reload() {
-    return new Project(resourceManager, resourceManager.get(info.id()));
+    return Project.load(resourceManager, info.projectId());
   }
 
   /**
@@ -89,13 +91,13 @@ public Project reload() {
    * completes, the project is not retrievable by the {@link ResourceManager#get} and
    * {@link ResourceManager#list} methods. The caller must have modify permissions for this project.
    *
-   * @see
-   *     <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/delete">
-   *     Cloud Resource Manager delete</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/delete">Cloud
+   * Resource Manager delete</a>
    * @throws ResourceManagerException upon failure
    */
   public void delete() {
-    resourceManager.delete(info.id());
+    resourceManager.delete(info.projectId());
   }
 
   /**
@@ -106,13 +108,13 @@ public void delete() {
    * state of {@link ProjectInfo.State#DELETE_IN_PROGRESS}, the project cannot be restored. The
    * caller must have modify permissions for this project.
    *
-   * @see <a href=
-   *     "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/undelete">
-   *     Cloud Resource Manager undelete</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/undelete">Cloud
+   * Resource Manager undelete</a>
    * @throws ResourceManagerException upon failure (including when the project can't be restored)
    */
   public void undelete() {
-    resourceManager.undelete(info.id());
+    resourceManager.undelete(info.projectId());
   }
 
   /**
@@ -120,9 +122,9 @@ public void undelete() {
    *
    * The caller must have modify permissions for this project.
    *
-   * @see
-   *     <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/update">
-   *     Cloud Resource Manager update</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/update">Cloud
+   * Resource Manager update</a>
    * @return the ProjectInfo representing the new project metadata
    * @throws ResourceManagerException upon failure
    */
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
index 4e45e1274dbf..7b48e595ae0d 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
@@ -14,11 +14,14 @@
 
 package com.google.gcloud.resourcemanager;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.client.util.Data;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 
+import org.joda.time.DateTime;
 import org.joda.time.format.ISODateTimeFormat;
 
 import java.io.Serializable;
@@ -28,26 +31,23 @@
 
 /**
  * A Google Cloud Resource Manager project metadata object.
+ * 
+ * A Project is a high-level Google Cloud Platform entity. It is a container for ACLs, APIs,
+ * AppEngine Apps, VMs, and other Google Cloud Platform resources.
  */
 public class ProjectInfo implements Serializable {
 
   private static final long serialVersionUID = 9148970963697734236L;
   private final String name;
-  private final String id;
+  private final String projectId;
   private final Map<String, String> labels;
-  private final Long number;
+  private final Long projectNumber;
   private final State state;
   private final Long createTimeMillis;
+  private final ResourceId parent;
 
   /**
-   * The project lifecycle state.
-   *
-   * <ul>
-   * <li>LIFECYCLE_STATE_UNSPECIFIED:
-   * <li>ACTIVE:
-   * <li>DELETE_REQUESTED:
-   * <li>DELETE_IN_PROGRESS:
-   * <ul>
+   * The project lifecycle states.
    */
   public enum State {
     /**
@@ -72,16 +72,71 @@ public enum State {
     DELETE_IN_PROGRESS
   }
 
+  static class ResourceId implements Serializable {
+
+    private static final long serialVersionUID = -325199985993344726L;
+
+    private final String id;
+    private final String type;
+
+    ResourceId(String id, String type) {
+      this.id = checkNotNull(id);
+      this.type = checkNotNull(type);
+    }
+
+    String id() {
+      return id;
+    }
+
+    String type() {
+      return type;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj instanceof ResourceId && Objects.equals(toPb(), ((ResourceId) obj).toPb());
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(id, type);
+    }
+
+    com.google.api.services.cloudresourcemanager.model.ResourceId toPb() {
+      com.google.api.services.cloudresourcemanager.model.ResourceId resourceIdPb =
+          new com.google.api.services.cloudresourcemanager.model.ResourceId();
+      resourceIdPb.setId(id);
+      resourceIdPb.setType(type.toString().toLowerCase());
+      return resourceIdPb;
+    }
+
+    static ResourceId fromPb(
+        com.google.api.services.cloudresourcemanager.model.ResourceId resourceIdPb) {
+      return new ResourceId(resourceIdPb.getId(), resourceIdPb.getType());
+    }
+  }
+
   public static class Builder {
+
     private String name;
-    private String id;
-    private Map<String, String> labels;
-    private Long number;
+    private String projectId;
+    private Map<String, String> labels = new HashMap<>();
+    private Long projectNumber;
     private State state;
     private Long createTimeMillis;
+    private ResourceId parent;
 
-    Builder() {
-      labels = new HashMap<>();
+    private Builder() {
+    }
+
+    Builder(ProjectInfo info) {
+      this.name = info.name;
+      this.projectId = info.projectId;
+      this.labels = Maps.newHashMap(checkNotNull(info.labels));
+      this.projectNumber = info.projectNumber;
+      this.state = info.state;
+      this.createTimeMillis = info.createTimeMillis;
+      this.parent = info.parent;
     }
 
     /**
@@ -92,7 +147,7 @@ public static class Builder {
      * field can be changed after project creation.
      */
     public Builder name(String name) {
-      this.name = name;
+      this.name = firstNonNull(name, Data.<String>nullOf(String.class));
       return this;
     }
 
@@ -103,8 +158,8 @@ public Builder name(String name) {
      * Trailing hyphens are prohibited. This field cannot be changed after the server creates the
      * project.
      */
-    public Builder id(String id) {
-      this.id = id;
+    public Builder projectId(String projectId) {
+      this.projectId = projectId;
       return this;
     }
 
@@ -148,8 +203,8 @@ public Builder labels(Map<String, String> labels) {
       return this;
     }
 
-    Builder number(Long number) {
-      this.number = number;
+    Builder projectNumber(Long projectNumber) {
+      this.projectNumber = projectNumber;
       return this;
     }
 
@@ -163,6 +218,11 @@ Builder createTimeMillis(Long createTimeMillis) {
       return this;
     }
 
+    Builder parent(ResourceId parent) {
+      this.parent = parent;
+      return this;
+    }
+
     public ProjectInfo build() {
       return new ProjectInfo(this);
     }
@@ -170,11 +230,12 @@ public ProjectInfo build() {
 
   ProjectInfo(Builder builder) {
     this.name = builder.name;
-    this.id = checkNotNull(builder.id);
+    this.projectId = checkNotNull(builder.projectId);
     this.labels = ImmutableMap.copyOf(builder.labels);
-    this.number = builder.number;
+    this.projectNumber = builder.projectNumber;
     this.state = builder.state;
     this.createTimeMillis = builder.createTimeMillis;
+    this.parent = builder.parent;
   }
 
   /**
@@ -182,8 +243,8 @@ public ProjectInfo build() {
    *
    * This field cannot be changed after the server creates the project.
    */
-  public String id() {
-    return id;
+  public String projectId() {
+    return projectId;
   }
 
   /**
@@ -192,7 +253,7 @@ public String id() {
    * This field is optional, can remain unset, and can be changed after project creation.
    */
   public String name() {
-    return name;
+    return Data.isNull(name) ? null : name;
   }
 
   /**
@@ -200,8 +261,8 @@ public String name() {
    *
    * This field is set by the server and is read-only.
    */
-  public Long number() {
-    return number;
+  public Long projectNumber() {
+    return projectNumber;
   }
 
   /**
@@ -221,6 +282,10 @@ public State state() {
     return state;
   }
 
+  ResourceId parent() {
+    return parent;
+  }
+
   /**
    * Get the project's creation time (in milliseconds).
    *
@@ -237,45 +302,54 @@ public boolean equals(Object obj) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, id, labels, number, state, createTimeMillis);
+    return Objects.hash(name, projectId, labels, projectNumber, state, createTimeMillis, parent);
   }
 
   public static Builder builder(String id) {
-    return new Builder().id(id);
+    return new Builder().projectId(id);
   }
 
   public Builder toBuilder() {
-    return new Builder()
-        .name(name)
-        .id(id)
-        .labels(labels)
-        .number(number)
-        .state(state)
-        .createTimeMillis(createTimeMillis);
+    return new Builder(this);
   }
 
   com.google.api.services.cloudresourcemanager.model.Project toPb() {
     com.google.api.services.cloudresourcemanager.model.Project projectPb =
         new com.google.api.services.cloudresourcemanager.model.Project();
     projectPb.setName(name);
-    projectPb.setProjectId(id);
+    projectPb.setProjectId(projectId);
     projectPb.setLabels(labels);
-    projectPb.setProjectNumber(number);
+    projectPb.setProjectNumber(projectNumber);
     if (state != null) {
       projectPb.setLifecycleState(state.toString());
     }
     if (createTimeMillis != null) {
       projectPb.setCreateTime(ISODateTimeFormat.dateTime().print(createTimeMillis));
     }
+    if (parent != null) {
+      projectPb.setParent(parent.toPb());
+    }
     return projectPb;
   }
 
   static ProjectInfo fromPb(com.google.api.services.cloudresourcemanager.model.Project projectPb) {
     ProjectInfo.Builder builder =
-        ProjectInfo.builder(projectPb.getProjectId()).name(projectPb.getName());
+        ProjectInfo.builder(projectPb.getProjectId()).projectNumber(projectPb.getProjectNumber());
+    if (projectPb.getName() != null) {
+      builder.name(projectPb.getName());
+    }
     if (projectPb.getLabels() != null) {
       builder.labels(projectPb.getLabels());
     }
+    if (projectPb.getLifecycleState() != null) {
+      builder.state(State.valueOf(projectPb.getLifecycleState()));
+    }
+    if (projectPb.getCreateTime() != null) {
+      builder.createTimeMillis(DateTime.parse(projectPb.getCreateTime()).getMillis());
+    }
+    if (projectPb.getParent() != null) {
+      builder.parent(ResourceId.fromPb(projectPb.getParent()));
+    }
     return builder.build();
   }
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
index 46183bfc8188..8d57ec2e3610 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -41,10 +41,10 @@ public interface ResourceManager extends Service<ResourceManagerOptions> {
    * even if not specified.
    */
   enum ProjectField {
-    ID("projectId"),
+    PROJECT_ID("projectId"),
     NAME("name"),
     LABELS("labels"),
-    NUMBER("projectNumber"),
+    PROJECT_NUMBER("projectNumber"),
     STATE("lifecycleState"),
     CREATE_TIME("createTime");
 
@@ -60,7 +60,7 @@ public String selector() {
 
     static String selector(ProjectField... fields) {
       HashSet<String> fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
-      fieldStrings.add(ID.selector());
+      fieldStrings.add(PROJECT_ID.selector());
       for (ProjectField field : fields) {
         fieldStrings.add(field.selector());
       }
@@ -68,6 +68,9 @@ static String selector(ProjectField... fields) {
     }
   }
 
+  /**
+   * Class for specifying project get options.
+   */
   public class ProjectGetOption extends Option {
 
     private static final long serialVersionUID = 270185129961146874L;
@@ -80,7 +83,7 @@ private ProjectGetOption(ResourceManagerRpc.Option option, Object value) {
      * Returns an option to specify the project's fields to be returned by the RPC call.
      *
      * If this option is not provided all project fields are returned.
-     * {@code ProjectListOption.fields} can be used to specify only the fields of interest. Project
+     * {@code ProjectGetOption.fields} can be used to specify only the fields of interest. Project
      * ID is always returned, even if not specified. {@link ProjectField} provides a list of fields
      * that can be used.
      */
@@ -106,11 +109,16 @@ private ProjectListOption(ResourceManagerRpc.Option option, Object value) {
      * Filter rules are case insensitive. The fields eligible for filtering are:
      * <ul>
      * <li>name
-     * <li>id
+     * <li>project ID
      * <li>labels.key, where key is the name of a label
      * </ul>
      *
-     * Some examples of using labels as filters:
+     * You can specify multiple filters by adding a space between each filter. Multiple filters
+     * are composed using "and".
+     *
+     *
+     *
+     * Some examples of filters:
      * <ul>
      * <li> name:*  The project has a name.
      * <li> name:Howl   The project's name is Howl or howl.
@@ -121,8 +129,6 @@ private ProjectListOption(ResourceManagerRpc.Option option, Object value) {
      * <li> labels.color:red label.size:big  The project's label color has the value red and its
      *     label size has the value big.
      * </ul>
-     *
-     * Optional.
      */
     public static ProjectListOption filter(String filter) {
       return new ProjectListOption(ResourceManagerRpc.Option.FILTER, filter);
@@ -150,10 +156,9 @@ public static ProjectListOption fields(ProjectField... fields) {
    * grant permission to others to read or update the project. Several APIs are activated
    * automatically for the project, including Google Cloud Storage.
    *
-   * @see
-   *     <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/create">
-   *     Cloud Resource Manager create</a>
-   *
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/create">Cloud
+   * Resource Manager create</a>
    * @return ProjectInfo object representing the new project's metadata. The returned object will
    *     include the following read-only fields supplied by the server: project number, lifecycle
    *     state, and creation time.
@@ -178,9 +183,9 @@ public static ProjectListOption fields(ProjectField... fields) {
    * completes, the project is not retrievable by the {@link ResourceManager#get} and
    * {@link ResourceManager#list} methods. The caller must have modify permissions for this project.
    *
-   * @see
-   *     <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/delete">
-   *     Cloud Resource Manager delete</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/delete">Cloud
+   * Resource Manager delete</a>
    * @throws ResourceManagerException upon failure
    */
   void delete(String projectId);
@@ -190,8 +195,9 @@ public static ProjectListOption fields(ProjectField... fields) {
    *
    * The caller must have read permissions for this project.
    *
-   * @see <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/get">
-   *     Cloud Resource Manager get</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/get">Cloud
+   * Resource Manager get</a>
    * @throws ResourceManagerException upon failure
    */
   ProjectInfo get(String projectId, ProjectGetOption... options);
@@ -204,8 +210,9 @@ public static ProjectListOption fields(ProjectField... fields) {
    * page tokens. Note that pagination is currently not implemented by the Cloud Resource Manager
    * API.
    *
-   * @see <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/list">
-   *     Cloud Resource Manager list</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/list">Cloud
+   * Resource Manager list</a>
    * @return {@code Page<ProjectInfo>}, a page of projects.
    * @throws ResourceManagerException upon failure
    */
@@ -216,9 +223,9 @@ public static ProjectListOption fields(ProjectField... fields) {
    *
    * The caller must have modify permissions for this project.
    *
-   * @see
-   *     <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/update">
-   *     Cloud Resource Manager update</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/update">Cloud
+   * Resource Manager update</a>
    * @return the ProjectInfo representing the new project metadata
    * @throws ResourceManagerException upon failure
    */
@@ -232,9 +239,9 @@ public static ProjectListOption fields(ProjectField... fields) {
    * state of {@link ProjectInfo.State#DELETE_IN_PROGRESS}, the project cannot be restored. The
    * caller must have modify permissions for this project.
    *
-   * @see <a href=
-   *     "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/undelete">
-   *     Cloud Resource Manager undelete</a>
+   * @see <a
+   * href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/undelete">Cloud
+   * Resource Manager undelete</a>
    * @throws ResourceManagerException
    */
   void undelete(String projectId);
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
index 8287ed167557..22b5e8bfed7c 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
@@ -17,6 +17,7 @@
 package com.google.gcloud.resourcemanager;
 
 import com.google.gcloud.BaseServiceException;
+import com.google.gcloud.RetryHelper;
 import com.google.gcloud.RetryHelper.RetryHelperException;
 import com.google.gcloud.RetryHelper.RetryInterruptedException;
 
@@ -44,7 +45,12 @@ public ResourceManagerException(int code, String message, boolean retryable) {
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
   static ResourceManagerException translateAndThrow(RetryHelperException ex) {
+    if (ex.getCause() instanceof ResourceManagerException) {
+      throw (ResourceManagerException) ex.getCause();
+    }
+    if (ex instanceof RetryHelper.RetryInterruptedException) {
+      RetryHelper.RetryInterruptedException.propagate();
+    }
     throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage(), false);
-    // TODO(ajaykannan): Fix me!
   }
 }
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
new file mode 100644
index 000000000000..45f8f9de75e9
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
@@ -0,0 +1,89 @@
+package com.google.gcloud.spi;
+
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
+import com.google.api.client.http.HttpRequestInitializer;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.json.jackson.JacksonFactory;
+import com.google.api.services.cloudresourcemanager.Cloudresourcemanager;
+import com.google.api.services.cloudresourcemanager.model.Project;
+import com.google.common.collect.ImmutableSet;
+import com.google.gcloud.resourcemanager.ResourceManagerException;
+import com.google.gcloud.resourcemanager.ResourceManagerOptions;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
+public class DefaultResourceManagerRpc implements ResourceManagerRpc {
+
+  private static final Set<Integer> RETRYABLE_CODES = ImmutableSet.of(503, 500, 429, 417);
+
+  private final ResourceManagerOptions options;
+  private final Cloudresourcemanager resourceManager;
+
+  public DefaultResourceManagerRpc(ResourceManagerOptions options) {
+    HttpTransport transport = options.httpTransportFactory().create();
+    HttpRequestInitializer initializer = options.httpRequestInitializer();
+    this.options = options;
+    resourceManager =
+        new Cloudresourcemanager.Builder(transport, new JacksonFactory(), initializer)
+            .setRootUrl(options.host())
+            .setApplicationName(options.applicationName())
+            .build();
+  }
+
+  private static ResourceManagerException translate(IOException exception) {
+    ResourceManagerException translated;
+    if (exception instanceof GoogleJsonResponseException) {
+      translated = translate(((GoogleJsonResponseException) exception).getDetails());
+    } else {
+      translated = new ResourceManagerException(0, exception.getMessage(), false);
+    }
+    translated.initCause(exception);
+    return translated;
+  }
+
+  private static ResourceManagerException translate(GoogleJsonError exception) {
+    boolean retryable =
+        RETRYABLE_CODES.contains(exception.getCode())
+        || "InternalError".equals(exception.getMessage());
+    return new ResourceManagerException(exception.getCode(), exception.getMessage(), retryable);
+  }
+
+  @Override
+  public Project create(Project project) throws ResourceManagerException {
+    // TODO(ajaykannan): fix me!
+    return null;
+  }
+
+  @Override
+  public void delete(String projectId) throws ResourceManagerException {
+    // TODO(ajaykannan): fix me!
+  }
+
+  @Override
+  public Project get(String projectId) throws ResourceManagerException {
+    // TODO(ajaykannan): fix me!
+    return null;
+  }
+
+  @Override
+  public Tuple<String, Iterable<Project>> list(Map<Option, ?> options)
+      throws ResourceManagerException {
+    // TODO(ajaykannan): fix me!
+    return null;
+  }
+
+  @Override
+  public void undelete(String projectId) throws ResourceManagerException {
+    // TODO(ajaykannan): fix me!
+  }
+
+  @Override
+  public Project replace(Project project) throws ResourceManagerException {
+    // TODO(ajaykannan): fix me!
+    return null;
+  }
+}
+
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
index e11962d94273..297331fdd2bf 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectInfoTest.java
@@ -28,74 +28,78 @@
 
 public class ProjectInfoTest {
 
-  private static final String ID = "project-id";
+  private static final String PROJECT_ID = "project-id";
   private static final String NAME = "myProj";
   private static final Map<String, String> LABELS = ImmutableMap.of("k1", "v1", "k2", "v2");
-  private static final Long NUMBER = 123L;
+  private static final Long PROJECT_NUMBER = 123L;
   private static final Long CREATE_TIME_MILLIS = 123456789L;
   private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED;
-  private static final ProjectInfo FULL_PROJECT_INFO =
-      ProjectInfo.builder(ID)
-          .name(NAME)
-          .labels(LABELS)
-          .number(NUMBER)
-          .createTimeMillis(CREATE_TIME_MILLIS)
-          .state(STATE)
-          .build();
-  private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder(ID).build();
+  private static final ProjectInfo.ResourceId PARENT =
+      new ProjectInfo.ResourceId("id", "organization");
+  private static final ProjectInfo PROJECT_INFO = ProjectInfo.builder(PROJECT_ID)
+      .name(NAME)
+      .labels(LABELS)
+      .projectNumber(PROJECT_NUMBER)
+      .createTimeMillis(CREATE_TIME_MILLIS)
+      .state(STATE)
+      .parent(PARENT)
+      .build();
+  private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder(PROJECT_ID).build();
 
   @Test
   public void testBuilder() {
-    assertEquals(ID, FULL_PROJECT_INFO.id());
-    assertEquals(NAME, FULL_PROJECT_INFO.name());
-    assertEquals(LABELS, FULL_PROJECT_INFO.labels());
-    assertEquals(NUMBER, FULL_PROJECT_INFO.number());
-    assertEquals(CREATE_TIME_MILLIS, FULL_PROJECT_INFO.createTimeMillis());
-    assertEquals(STATE, FULL_PROJECT_INFO.state());
+    assertEquals(PROJECT_ID, PROJECT_INFO.projectId());
+    assertEquals(NAME, PROJECT_INFO.name());
+    assertEquals(LABELS, PROJECT_INFO.labels());
+    assertEquals(PROJECT_NUMBER, PROJECT_INFO.projectNumber());
+    assertEquals(CREATE_TIME_MILLIS, PROJECT_INFO.createTimeMillis());
+    assertEquals(STATE, PROJECT_INFO.state());
 
-    assertEquals(ID, PARTIAL_PROJECT_INFO.id());
+    assertEquals(PROJECT_ID, PARTIAL_PROJECT_INFO.projectId());
     assertEquals(null, PARTIAL_PROJECT_INFO.name());
     assertTrue(PARTIAL_PROJECT_INFO.labels().isEmpty());
-    assertEquals(null, PARTIAL_PROJECT_INFO.number());
+    assertEquals(null, PARTIAL_PROJECT_INFO.projectNumber());
     assertEquals(null, PARTIAL_PROJECT_INFO.createTimeMillis());
     assertEquals(null, PARTIAL_PROJECT_INFO.state());
   }
 
   @Test
   public void testToBuilder() {
-    compareProjects(FULL_PROJECT_INFO, FULL_PROJECT_INFO.toBuilder().build());
+    compareProjects(PROJECT_INFO, PROJECT_INFO.toBuilder().build());
     compareProjects(PARTIAL_PROJECT_INFO, PARTIAL_PROJECT_INFO.toBuilder().build());
   }
 
   @Test
   public void testToAndFromPb() {
-    compareProjects(FULL_PROJECT_INFO, ProjectInfo.fromPb(FULL_PROJECT_INFO.toPb()));
+    compareProjects(PROJECT_INFO, ProjectInfo.fromPb(PROJECT_INFO.toPb()));
     compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.fromPb(PARTIAL_PROJECT_INFO.toPb()));
   }
 
   @Test
   public void testEquals() {
     compareProjects(
-        FULL_PROJECT_INFO,
-        ProjectInfo.builder(ID)
+        PROJECT_INFO,
+        ProjectInfo.builder(PROJECT_ID)
             .name(NAME)
             .labels(LABELS)
-            .number(NUMBER)
+            .projectNumber(PROJECT_NUMBER)
             .createTimeMillis(CREATE_TIME_MILLIS)
             .state(STATE)
+            .parent(PARENT)
             .build());
-    compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.builder(ID).build());
-    assertNotEquals(FULL_PROJECT_INFO, PARTIAL_PROJECT_INFO);
+    compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.builder(PROJECT_ID).build());
+    assertNotEquals(PROJECT_INFO, PARTIAL_PROJECT_INFO);
   }
 
   private void compareProjects(ProjectInfo expected, ProjectInfo value) {
     assertEquals(expected, value);
-    assertEquals(expected.id(), value.id());
+    assertEquals(expected.projectId(), value.projectId());
     assertEquals(expected.name(), value.name());
     assertEquals(expected.labels(), value.labels());
-    assertEquals(expected.number(), value.number());
+    assertEquals(expected.projectNumber(), value.projectNumber());
     assertEquals(expected.createTimeMillis(), value.createTimeMillis());
     assertEquals(expected.state(), value.state());
+    assertEquals(expected.parent(), value.parent());
   }
 }
 
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
index ddb543752ac7..223dd5b14289 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -33,20 +33,19 @@
 import java.util.Map;
 
 public class ProjectTest {
-  private static final String ID = "project-id";
+  private static final String PROJECT_ID = "project-id";
   private static final String NAME = "myProj";
   private static final Map<String, String> LABELS = ImmutableMap.of("k1", "v1", "k2", "v2");
-  private static final Long NUMBER = 123L;
+  private static final Long PROJECT_NUMBER = 123L;
   private static final Long CREATE_TIME_MILLIS = 123456789L;
   private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED;
-  private static final ProjectInfo PROJECT_INFO =
-      ProjectInfo.builder(ID)
-          .name(NAME)
-          .labels(LABELS)
-          .number(NUMBER)
-          .createTimeMillis(CREATE_TIME_MILLIS)
-          .state(STATE)
-          .build();
+  private static final ProjectInfo PROJECT_INFO = ProjectInfo.builder(PROJECT_ID)
+      .name(NAME)
+      .labels(LABELS)
+      .projectNumber(PROJECT_NUMBER)
+      .createTimeMillis(CREATE_TIME_MILLIS)
+      .state(STATE)
+      .build();
 
   private ResourceManager resourceManager;
   private Project project;
@@ -64,27 +63,22 @@ public void tearDown() throws Exception {
 
   @Test
   public void testLoad() {
-    expect(resourceManager.get(PROJECT_INFO.id())).andReturn(PROJECT_INFO);
+    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
     replay(resourceManager);
-    Project loadedProject = Project.load(resourceManager, PROJECT_INFO.id());
+    Project loadedProject = Project.load(resourceManager, PROJECT_INFO.projectId());
     assertEquals(PROJECT_INFO, loadedProject.info());
   }
 
   @Test
   public void testReload() {
     ProjectInfo newInfo = PROJECT_INFO.toBuilder().addLabel("k3", "v3").build();
-    expect(resourceManager.get(PROJECT_INFO.id())).andReturn(newInfo);
+    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(newInfo);
     replay(resourceManager);
     Project newProject = project.reload();
     assertSame(resourceManager, newProject.resourceManager());
     assertEquals(newInfo, newProject.info());
   }
 
-  @Test
-  public void testPolicy() {
-    replay(resourceManager);
-  }
-
   @Test
   public void testInfo() {
     replay(resourceManager);
@@ -99,7 +93,7 @@ public void testResourceManager() {
 
   @Test
   public void testDelete() {
-    resourceManager.delete(PROJECT_INFO.id());
+    resourceManager.delete(PROJECT_INFO.projectId());
     expectLastCall();
     replay(resourceManager);
     project.delete();
@@ -107,7 +101,7 @@ public void testDelete() {
 
   @Test
   public void testUndelete() {
-    resourceManager.undelete(PROJECT_INFO.id());
+    resourceManager.undelete(PROJECT_INFO.projectId());
     expectLastCall();
     replay(resourceManager);
     project.undelete();
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
index 5b981ce4c77a..dd8fb8014bf0 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
@@ -37,14 +37,13 @@
 public class SerializationTest {
 
   private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder("id1").build();
-  private static final ProjectInfo FULL_PROJECT_INFO =
-      ProjectInfo.builder("id")
-          .name("name")
-          .labels(ImmutableMap.of("key", "value"))
-          .number(123L)
-          .state(ProjectInfo.State.ACTIVE)
-          .createTimeMillis(1234L)
-          .build();
+  private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.builder("id")
+      .name("name")
+      .labels(ImmutableMap.of("key", "value"))
+      .projectNumber(123L)
+      .state(ProjectInfo.State.ACTIVE)
+      .createTimeMillis(1234L)
+      .build();
   private static final PageImpl<ProjectInfo> PAGE_RESULT =
       new PageImpl<>(null, "c", Collections.singletonList(PARTIAL_PROJECT_INFO));
 
@@ -53,12 +52,11 @@ public void testServiceOptions() throws Exception {
     ResourceManagerOptions options = ResourceManagerOptions.builder().build();
     ResourceManagerOptions serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
-    options =
-        options.toBuilder()
-            .projectId("some-unnecessary-project-ID")
-            .retryParams(RetryParams.defaultInstance())
-            .authCredentials(AuthCredentials.noCredentials())
-            .build();
+    options = options.toBuilder()
+        .projectId("some-unnecessary-project-ID")
+        .retryParams(RetryParams.defaultInstance())
+        .authCredentials(AuthCredentials.noCredentials())
+        .build();
     serializedCopy = serializeAndDeserialize(options);
     assertEquals(options, serializedCopy);
   }