#27 First pass on Java 8