diff --git a/common/common-image/pom.xml b/common/common-image/pom.xml
index dc1a9fba..554f8938 100644
--- a/common/common-image/pom.xml
+++ b/common/common-image/pom.xml
@@ -1,35 +1,36 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.twelvemonkeys.common</groupId>
-        <artifactId>common</artifactId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>common-image</artifactId>
+    <parent>
+        <groupId>com.twelvemonkeys.common</groupId>
+        <artifactId>common</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>common-image</artifactId>
     <packaging>jar</packaging>
-    <name>TwelveMonkeys :: Common :: Image</name>
-    <description>
-        The TwelveMonkeys Common Image support
-    </description>
-
+    <name>TwelveMonkeys :: Common :: Image</name>
+    <description>
+        The TwelveMonkeys Common Image support
+    </description>
 
     <dependencies>
-	<dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>common-lang</artifactId>
-        </dependency>
-	<dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>common-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jmagick</groupId>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jmagick</groupId>
             <artifactId>jmagick</artifactId>
-	    <version>6.2.4</version>
-	    <optional>true</optional>
-        </dependency>
-    </dependencies>
+            <version>6.2.4</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml
index 1993037a..bef72a90 100644
--- a/common/common-io/pom.xml
+++ b/common/common-io/pom.xml
@@ -2,30 +2,31 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.twelvemonkeys.common</groupId>
-    <artifactId>common</artifactId>
-    <version>3.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>common-io</artifactId>
-  <packaging>jar</packaging>
-  <name>TwelveMonkeys :: Common :: IO</name>
-  <description>
-    The TwelveMonkeys IO support
-  </description>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.twelvemonkeys.common</groupId>
+        <artifactId>common</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>common-io</artifactId>
+    <packaging>jar</packaging>
+    <name>TwelveMonkeys :: Common :: IO</name>
+    <description>
+        The TwelveMonkeys Common IO support
+    </description>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>common-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>common-lang</artifactId>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common-lang</artifactId>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/common/pom.xml b/common/pom.xml
index 319c92a7..cc1a87ee 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -17,33 +17,34 @@
     </description>
 
     <modules>
-     <module>common-io</module>
-     <module>common-lang</module>
-     <module>common-image</module>
+        <module>common-lang</module>
+        <module>common-io</module>
+        <module>common-image</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>common-lang</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
-<dependencyManagement>
-    <dependencies>
-	<dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>common-lang</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-	<dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>common-lang</artifactId>
-            <version>${project.version}</version>
-	    <classifier>tests</classifier>
-	    <scope>test</scope>
-        </dependency>
-	<dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>common-io</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</dependencyManagement>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>common-lang</artifactId>
+                <version>${project.version}</version>
+                <classifier>tests</classifier>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>common-io</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -58,6 +59,5 @@
             <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index e8ea26a3..f0037883 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
         <module>common</module>
         <module>servlet</module>
         <module>imageio</module>
-        <!--<module>sandbox</module>-->
+        <module>sandbox</module>
     </modules>
 
     <developers>
@@ -40,17 +40,15 @@
     </contributors>
 
     <build>
-	<finalName>twelvemonkeys-${project.artifactId}-${project.version}</finalName>
-        <pluginManagement>
-            <plugins>
-              <plugin>
+	    <finalName>twelvemonkeys-${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Title>twelvemonkeys-${project.artifactId}</Implementation-Title>
                             <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
@@ -58,6 +56,15 @@
                     </archive>
                 </configuration>
             </plugin>
+        </plugins>
+        
+        <pluginManagement>
+            <plugins>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <configuration>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
new file mode 100644
index 00000000..f2be3108
--- /dev/null
+++ b/sandbox/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.twelvemonkeys.sandbox</groupId>
+    <artifactId>sandbox</artifactId>
+    <version>3.0-SNAPSHOT</version>
+    <name>TwelveMonkeys :: Sandbox</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        The TwelveMonkeys Sandbox. Experimental stuff, in progress, not for production use.
+    </description>
+
+    <parent>
+        <groupId>com.twelvemonkeys</groupId>
+        <artifactId>twelvemonkeys</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>sandbox-common</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-image</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.twelvemonkeys.common</groupId>
+            <artifactId>common-image</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.3.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock-cglib</artifactId>
+            <version>1.0.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                  <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/sandbox/sandbox-common/pom.xml b/sandbox/sandbox-common/pom.xml
new file mode 100644
index 00000000..28e295ee
--- /dev/null
+++ b/sandbox/sandbox-common/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.twelvemonkeys.sandbox</groupId>
+        <artifactId>sandbox</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>sandbox-common</artifactId>
+    <packaging>jar</packaging>
+    <name>TwelveMonkeys :: Sandbox :: Common</name>
+    <description>
+        The TwelveMonkeys Sandbox Common. Experimental stuff.
+    </description>
+
+</project>
diff --git a/servlet/pom.xml b/servlet/pom.xml
index dd981f87..e2ef0db8 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -87,6 +87,12 @@
             <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.8.0</version>
+        </dependency>
     </dependencies>
 
     <build>