Finally done with Q2 in Java. Nice. Just need to doc :)