Preparing for a java8 solution
java8: preparatory commit, still working on both java versions