Recommitting the Java version of this project. No need to work on it in a branch any further