Shopping changes, added some model functions