diff --git a/jni.c b/jni.c
index 77eb11b1..7472731e 100644
--- a/jni.c
+++ b/jni.c
@@ -1,47 +1,26 @@
 #include <jni.h>
 #include "crypto_box_curve25519xsalsa20poly1305.h"
 
-JNIEXPORT jobject JNICALL 
-Java_to_yp_cr_nacl_crypto_box_keypair(JNIEnv * env, jobject  obj)
+// Lto/yp/cr/NaCl;.moose ()I
+JNIEXPORT jint JNICALL Java_to_yp_cr_NaCl_moose
+  (JNIEnv *env, jobject obj)
+{
+  return 1;
+}
+
+// Lto/yp/cr/NaCl$CryptoBoxKeypair;.method ([B[B)I
+JNIEXPORT jint JNICALL Java_to_yp_cr_NaCl_00024CryptoBoxKeypair_method
+  (JNIEnv *env, jobject obj, jbyteArray jsk, jbyteArray jpk)
 {
   unsigned char pk[crypto_box_curve25519xsalsa20poly1305_ref_PUBLICKEYBYTES];
   unsigned char sk[crypto_box_curve25519xsalsa20poly1305_ref_PUBLICKEYBYTES];
 
-  if (crypto_box_curve25519xsalsa20poly1305_ref_keypair(pk,sk)) return NULL;
+  if (crypto_box_curve25519xsalsa20poly1305_ref_keypair(pk,sk)) return 1;
 
-  jclass mapClass = (*env)->FindClass(env, "java/util/HashMap");
-  if(mapClass == NULL)
-    {
-      return NULL;
-    }
-
-  jsize map_len = 1;
-  
-  jmethodID init = (*env)->GetMethodID(env, mapClass, "<init>", "(I)V");
-  jobject hashMap = (*env)->NewObject(env, mapClass, init, map_len);
-  
-  jmethodID put = (*env)->GetMethodID(env, mapClass, "put",
-				      "(ILjava/lang/Object;)Ljava/lang/Object;");
-
-  jbyteArray jpk = (*env)->NewByteArray(env, crypto_box_curve25519xsalsa20poly1305_ref_PUBLICKEYBYTES);
-  jbyteArray jsk = (*env)->NewByteArray(env, crypto_box_curve25519xsalsa20poly1305_ref_SECRETKEYBYTES);
-
-  /* Get java side versions of pk and sk */
+  /* Set java side versions of pk and sk */
   (*env)->SetByteArrayRegion(env, jpk, 0, crypto_box_curve25519xsalsa20poly1305_ref_PUBLICKEYBYTES, pk);
   (*env)->SetByteArrayRegion(env, jsk, 0, crypto_box_curve25519xsalsa20poly1305_ref_SECRETKEYBYTES, sk);
 
-  /* Store in hash map */
-  jobject pkkey = (*env)->NewStringUTF(env,"public_key");
-  (*env)->CallObjectMethod(env, hashMap, put, pkkey, jpk);
-  jobject skkey= (*env)->NewStringUTF(env,"secret_key");
-  (*env)->CallObjectMethod(env, hashMap, put, skkey, jsk);
-
-  /* get rid of local reference counts for things we have put in the hash map */
-  (*env)->DeleteLocalRef(env, pkkey);
-  (*env)->DeleteLocalRef(env, skkey);
-  (*env)->DeleteLocalRef(env, jpk);
-  (*env)->DeleteLocalRef(env, jsk);
-
-  return hashMap;
+  return 0;
 }