Re-work the promotion ladder lookup a little
Re-work the configuration system