Moved finder stuff into Java.