Tiny point: Instead of TODO, make this JAVA8, so we can easily find it when we make the switch.