diff --git a/build.xml b/build.xml
index a2945b1e..3a608ffc 100644
--- a/build.xml
+++ b/build.xml
@@ -21,7 +21,7 @@
 
 		<jar destfile="${build.dir}/WhiteRabbit.jar">
 			<manifest>
-				<attribute name="Main-Class" value="org.ohdsi.whiteRabbit.WhiteRabbitMain"/>
+				<attribute name="Main-Class" value="org.ohdsi.utilities.WhiteRabbitLauncher"/>
 				<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.30-${build.dir}.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc4.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc41.jar"/>
 			</manifest>
 			<fileset dir="${build.dir}"/>
@@ -29,7 +29,7 @@
 		</jar>
 		<jar destfile="${build.dir}/RabbitInAHat.jar">
 			<manifest>
-				<attribute name="Main-Class" value="org.ohdsi.rabbitInAHat.RabbitInAHatMain"/>
+				<attribute name="Main-Class" value="org.ohdsi.utilities.RabbitInAHatLauncher"/>
 				<attribute name="Class-Path" value=". WhiteRabbit_lib/ojdbc5.jar WhiteRabbit_lib/ojdbc6.jar WhiteRabbit_lib/sqljdbc4.jar WhiteRabbit_lib/mysql-connector-java-5.1.30-${build.dir}.jar WhiteRabbit_lib/dom4j-1.6.1.jar WhiteRabbit_lib/poi-3.9-20121203.jar WhiteRabbit_lib/poi-excelant-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-3.9-20121203.jar WhiteRabbit_lib/poi-ooxml-schemas-3.9-20121203.jar WhiteRabbit_lib/stax-api-1.0.1.jar WhiteRabbit_lib/xmlbeans-2.3.0.jar WhiteRabbit_lib/jtds-1.2.7.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc4.jar WhiteRabbit_lib/postgresql-9.3-1101.jdbc41.jar WhiteRabbit_lib/json-io-3.0.1.jar"/>
 			</manifest>
 			<fileset dir="${build.dir}"/>
diff --git a/src/org/ohdsi/utilities/RabbitInAHatLauncher.java b/src/org/ohdsi/utilities/RabbitInAHatLauncher.java
new file mode 100644
index 00000000..75e39681
--- /dev/null
+++ b/src/org/ohdsi/utilities/RabbitInAHatLauncher.java
@@ -0,0 +1,25 @@
+package org.ohdsi.utilities;
+
+import org.ohdsi.rabbitInAHat.RabbitInAHatMain;
+
+/* Adapted from code found on:
+ * http://silentdevelopment.blogspot.com/2010/03/how-to-set-or-increase-xmx-heap-memory.html
+ */
+public class RabbitInAHatLauncher {
+	private final static int	MIN_HEAP	= 1500;
+
+	public static void main(String[] args) throws Exception {
+
+		float heapSizeMegs = (Runtime.getRuntime().maxMemory() / 1024) / 1024;
+
+		if (heapSizeMegs > MIN_HEAP) {
+			System.out.println("Launching with current VM");
+			RabbitInAHatMain.main(args);
+		} else {
+			System.out.println("Starting new VM");
+			String pathToJar = RabbitInAHatMain.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
+			ProcessBuilder pb = new ProcessBuilder("java", "-Xmx" + MIN_HEAP + "m", "-classpath", pathToJar, "org.ohdsi.rabbitInAHat.RabbitInAHatMain");
+			pb.start();
+		}
+	}
+}
diff --git a/src/org/ohdsi/utilities/WhiteRabbitLauncher.java b/src/org/ohdsi/utilities/WhiteRabbitLauncher.java
new file mode 100644
index 00000000..340dfb12
--- /dev/null
+++ b/src/org/ohdsi/utilities/WhiteRabbitLauncher.java
@@ -0,0 +1,25 @@
+package org.ohdsi.utilities;
+
+import org.ohdsi.whiteRabbit.WhiteRabbitMain;
+
+/* Adapted from code found on:
+ * http://silentdevelopment.blogspot.com/2010/03/how-to-set-or-increase-xmx-heap-memory.html
+ */
+public class WhiteRabbitLauncher {
+	private final static int	MIN_HEAP	= 1500;
+
+	public static void main(String[] args) throws Exception {
+
+		float heapSizeMegs = (Runtime.getRuntime().maxMemory() / 1024) / 1024;
+
+		if (heapSizeMegs > MIN_HEAP) {
+			System.out.println("Launching with current VM");
+			WhiteRabbitMain.main(args);
+		} else {
+			System.out.println("Starting new VM");
+			String pathToJar = WhiteRabbitMain.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
+			ProcessBuilder pb = new ProcessBuilder("java", "-Xmx" + MIN_HEAP + "m", "-classpath", pathToJar, "org.ohdsi.whiteRabbit.WhiteRabbitMain");
+			pb.start();
+		}
+	}
+}