made progress with builder save state, for #1575