Full review (do not merge)

Not following. You want some better defaults?