Full review (do not merge)

I guess so.