Prod overrides in place and (mostly) working