I think this looks about right.  I wonder if we will need to be able to set the overrides one-by-one, instead of all at once ... but I think we can just add that later if it actually turns out to be necessary.