Java8 compliance (partial)

- let me reiterate, I'M NOT FINISHED