Initial Java 8 commit (working)