More adjustments to the model to accomodate upgrade.  Includes the before/after concepts as integral to every objects ordering.