Full review (do not merge)

It does look this way...