diff --git a/core/pom.xml b/core/pom.xml
index a000e66048..e8ea2dc74e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -114,6 +114,11 @@
             <artifactId>gson</artifactId>
             <version>1.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.common</groupId>
+            <artifactId>google-guava</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/core/src/test/java/org/jclouds/servers/Instance.java b/core/src/test/java/org/jclouds/servers/Instance.java
new file mode 100644
index 0000000000..4deb034802
--- /dev/null
+++ b/core/src/test/java/org/jclouds/servers/Instance.java
@@ -0,0 +1,12 @@
+package org.jclouds.servers;
+
+import com.google.common.base.Service;
+
+/**
+ * @author Ivan Meredith
+ */
+public interface Instance extends Service {
+   String getId();
+
+   String getTag();
+}
diff --git a/core/src/test/java/org/jclouds/servers/Platform.java b/core/src/test/java/org/jclouds/servers/Platform.java
new file mode 100644
index 0000000000..9234ad3323
--- /dev/null
+++ b/core/src/test/java/org/jclouds/servers/Platform.java
@@ -0,0 +1,19 @@
+package org.jclouds.servers;
+
+import java.util.SortedSet;
+import java.util.concurrent.Future;
+
+/**
+ * @author Ivan Meredith
+ */
+public interface Platform {
+   public String getId();
+
+   public Future<Instance> createInstance();
+
+   public Instance createInstanceAndWait();
+
+   public Instance getInstance(String id);
+
+   public SortedSet<Instance> listInstances();
+}
diff --git a/core/src/test/java/org/jclouds/servers/Server.java b/core/src/test/java/org/jclouds/servers/Server.java
new file mode 100644
index 0000000000..6c519af38a
--- /dev/null
+++ b/core/src/test/java/org/jclouds/servers/Server.java
@@ -0,0 +1,27 @@
+package org.jclouds.servers;
+
+import com.google.common.base.Service;
+
+import java.util.SortedSet;
+import java.util.concurrent.Future;
+
+/**
+ * @author Ivan Meredith
+ */
+public interface Server extends Service {
+   public String getId();
+
+   public State rebootAndWait();
+
+   public Future<State> reboot();
+
+   public Boolean supportsPlatforms();
+
+   public Platform createPlatform(String id/*, Archive archive  , mount? */);
+
+   public Platform getPlatform(String id);
+
+   public SortedSet<Platform> listPlatforms();
+
+   public SortedSet<Instance> listInstances(/* platform("mybilling-1.0.1").tags("production"  */);
+}
diff --git a/core/src/test/java/org/jclouds/servers/ServerService.java b/core/src/test/java/org/jclouds/servers/ServerService.java
new file mode 100644
index 0000000000..c62f10a8db
--- /dev/null
+++ b/core/src/test/java/org/jclouds/servers/ServerService.java
@@ -0,0 +1,19 @@
+package org.jclouds.servers;
+
+import java.util.SortedSet;
+import java.util.concurrent.Future;
+
+/**
+ * TODO: better name?
+ *
+ * @author Ivan Meredith
+ */
+public interface ServerService {
+   public Server createServerAndWait(String name, String profile, String image);
+
+   public Future<Server> createServer(String name, String profile, String image);
+
+   public SortedSet<Server> listServers();
+
+   public Server getServer(String id);
+}