Java rewrite engine4

Put your name in the TODOs please.