Full review (do not merge)

Commented intentionally?