Full review (do not merge)

I am fine with this, I mean those XXX comments :-)