decouple the builder classes from the model.  Builder objects should be
easier to reuse now.