Full review (do not merge)

Hmm do we need that?