Reorganized some of the code to handle our "dual" model strategy; separate customer and shopping model(s).