Shopping

includes all changes from final presentation