completed first version of builder state save, for #1575