added updateStock and updatePrice back
got set delivery date working
lost
fixed merge problems