diff --git a/Modulefile b/Modulefile
index d31593d..a5393a3 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-java'
-version '0.0.1'
+version '1.0.0'
 source 'git://github.com/puppetlabs/puppetlabs-java'
 author 'puppetlabs'
 license 'Apache'
diff --git a/README.markdown b/README.markdown
index 34b71b7..42a42b7 100644
--- a/README.markdown
+++ b/README.markdown
@@ -4,3 +4,13 @@ Manage the Java runtime for use with other application software.
 
 Currently this simply deploys the package on Enterprise Linux based systems.
 
+The Java runtime this module is designed to configure are the RPM's provided by Oracle and obtained by extracting them from the "bin" installers.
+
+For example:
+
+    ./jdk-6u25-linux-x64-rpm.bin -x
+
+Please download the installer from:
+
+ * [Java Downloads](http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u25-download-346242.html)
+
diff --git a/manifests/init.pp b/manifests/init.pp
index 7169a3c..721f0ed 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,14 +12,27 @@
 #
 # [Remember: No empty lines between comments and class definition]
 class java(
+  $jre = false,
+  $jdk = true,
   $version='1.6.0_25-fcs'
 ) {
 
+  $jre_real     = $jre
+  $jdk_real     = $jdk
   $version_real = $version
 
-  class { 'java::jre_package':
-    version => $version_real,
-    stage   => 'runtime',
+  if $jre_real {
+    class { 'java::jre_package':
+      version => $version_real,
+      stage   => 'runtime',
+    }
+  }
+
+  if $jdk_real {
+    class { 'java::jdk_package':
+      version => $version_real,
+      stage   => 'runtime',
+    }
   }
 
 }
diff --git a/manifests/jdk_package.pp b/manifests/jdk_package.pp
new file mode 100644
index 0000000..18863ba
--- /dev/null
+++ b/manifests/jdk_package.pp
@@ -0,0 +1,28 @@
+# Class: java:jdk_package
+#
+#   This class installs the Java JDK package
+#   produced from ./jdk-6u25-linux-x64-rpm.bin -x
+#
+#   This is the "Official" RPM distributed by Oracle
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class java::jdk_package (
+  $version
+) {
+
+  # JJM FIXME Validation!
+  $version_real = $version
+
+  package { 'jdk':
+    ensure => $version_real,
+    alias  => 'java',
+  }
+
+}
diff --git a/manifests/jre_package.pp b/manifests/jre_package.pp
index ee4fb4e..7e2b86d 100644
--- a/manifests/jre_package.pp
+++ b/manifests/jre_package.pp
@@ -11,11 +11,15 @@
 # Sample Usage:
 #
 class java::jre_package (
-  $version='1.6.0_25-fcs'
+  $version
 ) {
-  # statements
+
+  # JJM FIXME Validation!
+  $version_real = $version
+
   package { 'jre':
     ensure => $version_real,
     alias  => 'java',
   }
+
 }