Full review (do not merge)

agreed.