Refactored such that all model shapes have only one property that define their size.  This is so that we don't have multiple size updates each time something's size changes.