Also enables rebuilding with newer models and adding new features without blowing things up.

All the effort and skill is in 1) and 2) now.