Full review (do not merge)

Leftover.