Full review (do not merge)

looks good!