incorporated model changes as suggested by Jason.

@chrisndodge Kindly merge in the shopping-rewrite branch once test passes.

Thanks