this is the most intrusive change I think.  I don't think the ordering here actually mattered before, but with new code we want access to the model, etc, for options.