Began the move to using JNI