OK I've done a very alpha cut of the "with standalone elimination" stuff. As you can see from this to-do chart, I still need to make it Serializable, and there are lots of things I haven't tested yet. You might want to wait until this afternoon to allow it to bake.