weird situation where I needed an overridable options override, sure there is a better solution but this works well
various changes